Refactoring streams, will be an ongoing process.

* [Memory Leak] Fix memory leak in Client::Handle_OP_MoveMultipleItems

* Update client_packet.cpp

.gitignore

@@ -68,3 +68,4 @@ compile_flags.txt
 
 # CMake Files
 cmake-build-relwithdebinfo/*
+skill-caps.diff

CHANGELOG.md

@@ -1,3 +1,68 @@
+## [22.61.0] 1/6/2025
+
+### Bots
+
+* Fix AA ranks to account for level ([#4567](https://github.com/EQEmu/Server/pull/4567)) @nytmyr 2024-12-07
+
+### Code
+
+* Convert Event Parses to Single Line ([#4569](https://github.com/EQEmu/Server/pull/4569)) @Kinglykrab 2024-12-12
+* Fix GM Flag Spell Restriction Bypasses ([#4571](https://github.com/EQEmu/Server/pull/4571)) @Kinglykrab 2025-01-06
+* Remove Unused Group Methods ([#4559](https://github.com/EQEmu/Server/pull/4559)) @Kinglykrab 2024-12-12
+
+### Commands
+
+* Add #find bot Subcommand ([#4563](https://github.com/EQEmu/Server/pull/4563)) @Kinglykrab 2024-12-12
+* Add #find ldon_theme Subcommand ([#4564](https://github.com/EQEmu/Server/pull/4564)) @Kinglykrab 2024-12-12
+* Fix #copycharacter ([#4582](https://github.com/EQEmu/Server/pull/4582)) @Akkadius 2025-01-06
+
+### Databuckets
+
+* Improved Reliability and Performance of Databuckets ([#4562](https://github.com/EQEmu/Server/pull/4562)) @Akkadius 2024-12-12
+
+### Feature
+
+* Enable bazaar window 'Find Trader' functionality ([#4560](https://github.com/EQEmu/Server/pull/4560)) @neckkola 2024-12-12
+
+### Filesystem
+
+* Path Manager Improvements ([#4557](https://github.com/EQEmu/Server/pull/4557)) @Akkadius 2025-01-06
+
+### Fixes
+
+* Allow Items in ROF2 to Stack to 32,767 ([#4556](https://github.com/EQEmu/Server/pull/4556)) @Kinglykrab 2024-12-12
+* Fix EVENT_COMBAT on NPC Death ([#4558](https://github.com/EQEmu/Server/pull/4558)) @Kinglykrab 2024-11-28
+* Guild Membership Update Fix ([#4581](https://github.com/EQEmu/Server/pull/4581)) @neckkola 2025-01-06
+* Guild creation to propagate across zones ([#4575](https://github.com/EQEmu/Server/pull/4575)) @neckkola 2025-01-06
+* Repair a EQEMUConfig Memory Leak ([#4584](https://github.com/EQEmu/Server/pull/4584)) @neckkola 2025-01-06
+* Repair a LoadNPCEmote MemoryLeak ([#4586](https://github.com/EQEmu/Server/pull/4586)) @neckkola 2025-01-06
+* Repair a memory leak in GuildsList ([#4585](https://github.com/EQEmu/Server/pull/4585)) @neckkola 2025-01-06
+* Resolve a client crash when logging in or zoning ([#4572](https://github.com/EQEmu/Server/pull/4572)) @neckkola 2024-12-14
+
+### Groups
+
+* Fix AmIMainAssist incorrectly checking for MainTankName ([#4565](https://github.com/EQEmu/Server/pull/4565)) @nytmyr 2024-12-04
+
+### Inventory
+
+* Add GetInventorySlots() Method ([#4566](https://github.com/EQEmu/Server/pull/4566)) @Kinglykrab 2025-01-06
+
+### Logs
+
+* Improve Crash log defaults ([#4579](https://github.com/EQEmu/Server/pull/4579)) @Akkadius 2025-01-06
+
+### Maps
+
+* Fix broken Map MMFS implementation ([#4576](https://github.com/EQEmu/Server/pull/4576)) @Akkadius 2025-01-06
+
+### Network
+
+* Prune / disconnect TCP connections gracefully ([#4574](https://github.com/EQEmu/Server/pull/4574)) @Akkadius 2025-01-06
+
+### Rules
+
+* Add rules for requiring custom files from client ([#4561](https://github.com/EQEmu/Server/pull/4561)) @knervous 2024-12-12
+
 ## [22.60.0] 11/25/2024
 
 ### Bazaar

CMakeLists.txt

@@ -37,6 +37,9 @@ IF(EQEMU_ADD_PROFILER)
 	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
 ENDIF(EQEMU_ADD_PROFILER)
 
+IF(USE_MAP_MMFS)
+	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
+ENDIF (USE_MAP_MMFS)
 
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)

client_files/export/main.cpp

@@ -36,12 +36,14 @@
 #include "../../common/file.h"
 #include "../../common/events/player_event_logs.h"
 #include "../../common/skill_caps.h"
+#include "../../common/evolving_items.h"
 
-EQEmuLogSys         LogSys;
-WorldContentService content_service;
-ZoneStore           zone_store;
-PathManager         path;
-PlayerEventLogs     player_event_logs;
+EQEmuLogSys          LogSys;
+WorldContentService  content_service;
+ZoneStore            zone_store;
+PathManager          path;
+PlayerEventLogs      player_event_logs;
+EvolvingItemsManager evolving_items_manager;
 
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);

client_files/import/main.cpp

@@ -30,12 +30,14 @@
 #include "../../common/repositories/base_data_repository.h"
 #include "../../common/file.h"
 #include "../../common/events/player_event_logs.h"
+#include "../../common/evolving_items.h"
 
-EQEmuLogSys         LogSys;
-WorldContentService content_service;
-ZoneStore           zone_store;
-PathManager         path;
-PlayerEventLogs     player_event_logs;
+EQEmuLogSys          LogSys;
+WorldContentService  content_service;
+ZoneStore            zone_store;
+PathManager          path;
+PlayerEventLogs      player_event_logs;
+EvolvingItemsManager evolving_items_manager;
 
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);

common/CMakeLists.txt

@@ -39,6 +39,7 @@ SET(common_sources
     event_sub.cpp
     events/player_event_logs.cpp
     events/player_event_discord_formatter.cpp
+    evolving_items.cpp
     expedition_lockout_timer.cpp
     extprofile.cpp
     discord/discord_manager.cpp
@@ -97,6 +98,7 @@ SET(common_sources
     json/json.hpp
     json/jsoncpp.cpp
     zone_store.cpp
+    memory/ksm.hpp
     net/console_server.cpp
     net/console_server_connection.cpp
     net/crc32.cpp
@@ -172,6 +174,7 @@ SET(repositories
     repositories/base/base_character_currency_repository.h
     repositories/base/base_character_data_repository.h
     repositories/base/base_character_disciplines_repository.h
+    repositories/base/base_character_evolving_items_repository.h
     repositories/base/base_character_expedition_lockouts_repository.h
     repositories/base/base_character_exp_modifiers_repository.h
     repositories/base/base_character_inspect_messages_repository.h
@@ -240,6 +243,7 @@ SET(repositories
     repositories/base/base_inventory_snapshots_repository.h
     repositories/base/base_ip_exemptions_repository.h
     repositories/base/base_items_repository.h
+    repositories/base/base_items_evolving_details_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
@@ -355,6 +359,7 @@ SET(repositories
     repositories/character_currency_repository.h
     repositories/character_data_repository.h
     repositories/character_disciplines_repository.h
+    repositories/character_evolving_items_repository.h
     repositories/character_expedition_lockouts_repository.h
     repositories/character_exp_modifiers_repository.h
     repositories/character_inspect_messages_repository.h
@@ -423,6 +428,7 @@ SET(repositories
     repositories/inventory_snapshots_repository.h
     repositories/ip_exemptions_repository.h
     repositories/items_repository.h
+    repositories/items_evolving_details_repository.h
     repositories/ldon_trap_entries_repository.h
     repositories/ldon_trap_templates_repository.h
     repositories/level_exp_mods_repository.h
@@ -555,6 +561,7 @@ SET(common_headers
     events/player_event_discord_formatter.h
     events/player_events.h
     event_sub.h
+    evolving_items.h
     expedition_lockout_timer.h
     extprofile.h
     faction.h

common/bazaar.cpp

@@ -31,6 +31,7 @@ Bazaar::GetSearchResults(
 		char_zone_instance_id
 	);
 
+	bool        convert = false;
 	std::string search_criteria_trader("TRUE ");
 
 	if (search.search_scope == NonRoFBazaarSearchScope) {
@@ -51,8 +52,24 @@ Bazaar::GetSearchResults(
 		);
 	}
 	else if (search.trader_id > 0) {
-		search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
+		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
+			if (search.trader_id >= TraderRepository::TRADER_CONVERT_ID) {
+				convert = true;
+				search_criteria_trader.append(fmt::format(
+					" AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
+					Zones::BAZAAR,
+					search.trader_id - TraderRepository::TRADER_CONVERT_ID)
+				);
+			}
+			else {
+				search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
+			}
+		}
+		else {
+			search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
+		}
 	}
+
 	if (search.min_cost != 0) {
 		search_criteria_trader.append(fmt::format(" AND trader.item_cost >= {}", search.min_cost * 1000));
 	}
@@ -355,6 +372,12 @@ Bazaar::GetSearchResults(
 		}
 
 		LogTradingDetail("Found item [{}] meeting search criteria.", r.item_name);
+		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
+			if (convert || (r.trader_zone_id == Zones::BAZAAR && r.trader_zone_instance_id != char_zone_instance_id)) {
+				r.trader_id = TraderRepository::TRADER_CONVERT_ID + r.trader_zone_instance_id;
+			}
+		}
+
 		all_entries.push_back(r);
 	}
 

common/crash.cpp

@@ -294,6 +294,8 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}
 
+	LogSys.CloseFileLogs();
+
 	exit(1);
 }
 

common/database.cpp

@@ -50,6 +50,7 @@
 #include "../common/repositories/raid_members_repository.h"
 #include "../common/repositories/reports_repository.h"
 #include "../common/repositories/variables_repository.h"
+#include "../common/repositories/character_pet_name_repository.h"
 #include "../common/events/player_event_logs.h"
 
 // Disgrace: for windows compile
@@ -313,6 +314,12 @@ bool Database::ReserveName(uint32 account_id, const std::string& name)
 		return false;
 	}
 
+	const auto& p = CharacterPetNameRepository::GetWhere(*this, where_filter);
+	if (!p.empty()) {
+		LogInfo("Account [{}] requested name [{}] but name is already taken by an Pet", account_id, name);
+		return false;
+	}
+
 	auto e = CharacterDataRepository::NewEntity();
 
 	e.account_id = account_id;
@@ -1860,7 +1867,35 @@ bool Database::CopyCharacter(
 
 	const int64 new_character_id = (CharacterDataRepository::GetMaxId(*this) + 1);
 
-	std::vector<std::string> tables_to_zero_id = { "keyring", "data_buckets", "character_instance_safereturns" };
+	// validate destination name doesn't exist already
+	const auto& destination_characters = CharacterDataRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`name` = '{}' AND `deleted_at` IS NULL LIMIT 1",
+			Strings::Escape(destination_character_name)
+		)
+	);
+	if (!destination_characters.empty()) {
+		LogError("Character [{}] already exists", destination_character_name);
+		return false;
+	}
+
+	std::vector<std::string> tables_to_zero_id = {
+		"keyring",
+		"data_buckets",
+		"character_instance_safereturns",
+		"character_expedition_lockouts",
+		"character_instance_lockouts",
+		"character_parcels",
+		"character_tribute",
+		"player_titlesets",
+	};
+
+	std::vector<std::string> ignore_tables = {
+		"guilds",
+	};
+
+	size_t total_rows_copied = 0;
 
 	TransactionBegin();
 
@@ -1868,6 +1903,10 @@ bool Database::CopyCharacter(
 		const std::string& table_name               = t.first;
 		const std::string& character_id_column_name = t.second;
 
+		if (Strings::Contains(ignore_tables, table_name)) {
+			continue;
+		}
+
 		auto results = QueryDatabase(
 			fmt::format(
 				"SHOW COLUMNS FROM {}",
@@ -1918,6 +1957,10 @@ bool Database::CopyCharacter(
 					value = std::to_string(destination_account_id);
 				}
 
+				if (!Strings::IsNumber(value)) {
+					value = Strings::Escape(value);
+				}
+
 				new_values.emplace_back(value);
 			}
 
@@ -1950,6 +1993,11 @@ bool Database::CopyCharacter(
 				)
 			);
 
+			size_t rows_copied = insert_rows.size(); // Rows copied for this table
+			total_rows_copied += rows_copied; // Increment grand total
+
+			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
+
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
@@ -1959,6 +2007,13 @@ bool Database::CopyCharacter(
 
 	TransactionCommit();
 
+	LogInfo(
+		"Character [{}] copied to [{}] total rows [{}]",
+		source_character_name,
+		destination_character_name,
+		Strings::Commify(total_rows_copied)
+	);
+
 	return true;
 }
 

common/database/database_update.cpp

@@ -169,7 +169,10 @@ bool DatabaseUpdate::UpdateManifest(
 		LogSys.EnableMySQLErrorLogs();
 		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 
-		if (!missing_migrations.empty()) {
+		if (!missing_migrations.empty() && m_skip_backup) {
+			LogInfo("Skipping database backup");
+		}
+		else if (!missing_migrations.empty()) {
 			LogInfo("Automatically backing up database before applying updates");
 			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 			auto s = DatabaseDumpService();
@@ -271,6 +274,13 @@ DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
 	return this;
 }
 
+DatabaseUpdate *DatabaseUpdate::SetSkipBackup(bool skip)
+{
+	m_skip_backup = skip;
+
+	return this;
+}
+
 bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 {
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));

common/database/database_update.h

@@ -29,12 +29,15 @@ public:
 
 	DatabaseUpdate *SetDatabase(Database *db);
 	DatabaseUpdate *SetContentDatabase(Database *db);
+	DatabaseUpdate *SetSkipBackup(bool skip);
 	bool HasPendingUpdates();
 private:
+	bool m_skip_backup = false;
 	Database *m_database;
 	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
+
 };
 
 #endif //EQEMU_DATABASE_UPDATE_H

common/database/database_update_manifest.cpp

@@ -5782,7 +5782,557 @@ CREATE INDEX idx_bot_expires ON data_buckets (bot_id, expires);
 ALTER TABLE `trader`
 	ADD COLUMN `char_zone_instance_id` INT NULL DEFAULT '0' AFTER `char_zone_id`;
 )"
-	}
+	},
+	ManifestEntry{
+		.version = 9287,
+		.description = "2024_11_26_bazaar_find_trader.sql",
+		.check       = "SHOW COLUMNS FROM `npc_types` LIKE 'walkspeed'",
+		.condition   = "missing",
+		.match       = "float",
+		.sql         = R"(
+ALTER TABLE `npc_types` MODIFY COLUMN `walkspeed` float NOT NULL DEFAULT 0;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9288,
+		.description = "2024_11_10_zone_player_partitioning.sql",
+		.check = "SHOW CREATE TABLE `zone`",
+		.condition = "missing",
+		.match = "shard_at_player_count",
+		.sql = R"(
+ALTER TABLE `zone`
+ADD COLUMN `shard_at_player_count` int(11) NULL DEFAULT 0 AFTER `seconds_before_idle`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version     = 9289,
+		.description = "2025_01_19_evolving_items__character_evolving_items",
+		.check       = "SHOW TABLES LIKE 'character_evolving_items'",
+		.condition   = "empty",
+		.match       = "",
+		.sql         = R"(
+CREATE TABLE `character_evolving_items` (
+	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`character_id` INT(10) UNSIGNED NULL DEFAULT '0',
+	`item_id` INT(10) UNSIGNED NULL DEFAULT '0',
+	`activated` TINYINT(1) UNSIGNED NULL DEFAULT '0',
+	`equipped` TINYINT(3) UNSIGNED NULL DEFAULT '0',
+	`current_amount` BIGINT(20) NULL DEFAULT '0',
+	`progression` DOUBLE(22,0) NULL DEFAULT '0',
+	`final_item_id` INT(10) UNSIGNED NULL DEFAULT '0',
+	`deleted_at` DATETIME NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB
+AUTO_INCREMENT=1
+;
+)"
+	},
+	ManifestEntry{
+		.version     = 9290,
+		.description = "2025_01_19_evolving_items__items_evolving_details",
+		.check       = "SHOW TABLES LIKE 'items_evolving_details'",
+		.condition   = "empty",
+		.match       = "",
+		.sql         = R"(
+CREATE TABLE `items_evolving_details` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `item_evo_id` int(10) unsigned DEFAULT 0 COMMENT 'items.evoid',
+  `item_evolve_level` int(10) unsigned DEFAULT 0 COMMENT 'items.evolvinglevel',
+  `item_id` int(10) unsigned DEFAULT 0 COMMENT 'items.id',
+  `type` int(10) unsigned DEFAULT 0,
+  `sub_type` int(10) unsigned DEFAULT 0,
+  `required_amount` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+INSERT INTO `items_evolving_details` VALUES
+(1,1000,1,86900,99,1,0),
+(2,1000,2,86901,99,1,0),
+(3,1000,3,86902,99,1,0),
+(4,1000,4,86903,99,1,0),
+(5,1000,5,86904,99,1,0),
+(6,1001,1,86910,99,1,0),
+(7,1001,2,86911,99,1,0),
+(8,1001,3,86912,99,1,0),
+(9,1001,4,86913,99,1,0),
+(10,1001,5,86914,99,1,0),
+(11,1001,6,86915,99,1,0),
+(12,1001,7,86916,99,1,0),
+(13,1002,1,86920,99,1,0),
+(14,1002,2,86921,99,1,0),
+(15,1002,3,86922,99,1,0),
+(16,1002,4,86923,99,1,0),
+(17,1002,5,86924,99,1,0),
+(18,1002,6,86925,99,1,0),
+(19,1002,7,86926,99,1,0),
+(20,1003,1,86930,99,1,0),
+(21,1003,2,86931,99,1,0),
+(22,1003,3,86932,99,1,0),
+(23,1003,4,86933,99,1,0),
+(24,1003,5,86934,99,1,0),
+(25,1003,6,86935,99,1,0),
+(26,1004,1,86940,99,1,0),
+(27,1004,2,86941,99,1,0),
+(28,1004,3,86942,99,1,0),
+(29,1004,4,86943,99,1,0),
+(30,1004,5,86944,99,1,0),
+(31,1004,6,86945,99,1,0),
+(32,1005,1,86950,99,1,0),
+(33,1005,2,86951,99,1,0),
+(34,1005,3,86952,99,1,0),
+(35,1005,4,86953,99,1,0),
+(36,1005,5,86954,99,1,0),
+(37,1005,6,86955,99,1,0),
+(38,1005,7,86956,99,1,0),
+(39,1006,1,86960,99,1,0),
+(40,1006,2,86961,99,1,0),
+(41,1006,3,86962,99,1,0),
+(42,1006,4,86963,99,1,0),
+(43,1006,5,86964,99,1,0),
+(44,1006,6,86965,99,1,0),
+(45,1006,7,86966,99,1,0),
+(46,1007,1,86970,99,1,0),
+(47,1007,2,86971,99,1,0),
+(48,1007,3,86972,99,1,0),
+(49,1007,4,86973,99,1,0),
+(50,1007,5,86974,99,1,0),
+(51,1007,6,86975,99,1,0),
+(52,1007,7,86976,99,1,0),
+(53,1008,1,86980,99,1,0),
+(54,1008,2,86981,99,1,0),
+(55,1008,3,86982,99,1,0),
+(56,1008,4,86983,99,1,0),
+(57,1008,5,86984,99,1,0),
+(58,1009,1,86990,99,1,0),
+(59,1009,2,86991,99,1,0),
+(60,1009,3,86992,99,1,0),
+(61,1009,4,86993,99,1,0),
+(62,1009,5,86994,99,1,0),
+(63,1009,6,86995,99,1,0),
+(64,1009,7,86996,99,1,0),
+(65,1009,8,86997,99,1,0),
+(66,1009,9,86998,99,1,0),
+(67,1009,10,86999,99,1,0),
+(68,1010,1,90001,99,1,0),
+(69,1010,2,90002,99,1,0),
+(70,1010,3,90003,99,1,0),
+(71,1010,6,90006,99,1,0),
+(72,1010,7,90007,99,1,0),
+(73,1010,8,90008,99,1,0),
+(74,1010,10,90010,99,1,0),
+(75,1050,1,89270,99,1,0),
+(76,1050,2,89271,99,1,0),
+(77,1050,3,89272,99,1,0),
+(78,1050,4,89273,99,1,0),
+(79,1050,5,89274,99,1,0),
+(80,1050,6,89275,99,1,0),
+(81,1051,1,89280,99,1,0),
+(82,1051,2,89281,99,1,0),
+(83,1051,3,89282,99,1,0),
+(84,1051,4,89283,99,1,0),
+(85,1051,5,89284,99,1,0),
+(86,1052,1,89290,99,1,0),
+(87,1052,2,89291,99,1,0),
+(88,1052,3,89292,99,1,0),
+(89,1052,4,89293,99,1,0),
+(90,1052,5,89294,99,1,0),
+(91,1052,6,89295,99,1,0),
+(92,1052,7,89296,99,1,0),
+(93,1053,1,89300,99,1,0),
+(94,1053,2,89301,99,1,0),
+(95,1053,3,89302,99,1,0),
+(96,1053,4,89303,99,1,0),
+(97,1053,5,89304,99,1,0),
+(98,1053,6,89305,99,1,0),
+(99,1053,7,89306,99,1,0),
+(100,1053,8,89307,99,1,0),
+(101,1053,9,89308,99,1,0),
+(102,1054,1,89310,99,1,0),
+(103,1054,2,89311,99,1,0),
+(104,1054,3,89312,99,1,0),
+(105,1054,4,89313,99,1,0),
+(106,1054,5,89314,99,1,0),
+(107,1054,6,89315,99,1,0),
+(108,1055,1,89320,99,1,0),
+(109,1055,2,89321,99,1,0),
+(110,1055,3,89322,99,1,0),
+(111,1055,4,89323,99,1,0),
+(112,1055,5,89324,99,1,0),
+(113,1055,6,89325,99,1,0),
+(114,1055,7,89326,99,1,0),
+(115,1056,1,89330,99,1,0),
+(116,1056,2,89331,99,1,0),
+(117,1056,3,89332,99,1,0),
+(118,1056,4,89333,99,1,0),
+(119,1056,5,89334,99,1,0),
+(120,1057,1,89340,99,1,0),
+(121,1057,2,89341,99,1,0),
+(122,1057,3,89342,99,1,0),
+(123,1057,4,89343,99,1,0),
+(124,1057,5,89344,99,1,0),
+(125,1057,6,89345,99,1,0),
+(126,1057,7,89346,99,1,0),
+(127,1057,8,89347,99,1,0),
+(128,1058,1,89350,99,1,0),
+(129,1058,2,89351,99,1,0),
+(130,1058,3,89352,99,1,0),
+(131,1058,4,89353,99,1,0),
+(132,1058,5,89354,99,1,0),
+(133,1058,6,89355,99,1,0),
+(134,1058,7,89356,99,1,0),
+(135,1059,1,89360,99,1,0),
+(136,1059,2,89361,99,1,0),
+(137,1059,3,89362,99,1,0),
+(138,1060,1,89490,99,1,0),
+(139,1060,2,89491,99,1,0),
+(140,1060,3,89492,99,1,0),
+(141,1061,1,89500,99,1,0),
+(142,1061,2,89501,99,1,0),
+(143,1061,3,89502,99,1,0),
+(144,1062,1,89510,99,1,0),
+(145,1062,2,89511,99,1,0),
+(146,1062,3,89512,99,1,0),
+(147,1063,1,89520,99,1,0),
+(148,1063,2,89521,99,1,0),
+(149,1063,3,89522,99,1,0),
+(150,1064,1,89530,99,1,0),
+(151,1064,2,89531,99,1,0),
+(152,1064,3,89532,99,1,0),
+(153,1065,1,89540,99,1,0),
+(154,1065,2,89541,99,1,0),
+(155,1065,3,89542,99,1,0),
+(156,1066,1,89550,3,274,500),
+(157,1066,2,89551,3,274,1000),
+(158,1066,3,89552,3,274,2000),
+(159,1067,1,89560,99,1,0),
+(160,1067,2,89561,99,1,0),
+(161,1067,3,89562,99,1,0),
+(162,1069,1,85571,99,1,0),
+(163,1069,2,85572,99,1,0),
+(164,1069,3,85573,99,1,0),
+(165,1200,1,95001,99,1,0),
+(166,1200,2,95002,99,1,0),
+(167,1200,3,95003,99,1,0),
+(168,1200,4,95004,99,1,0),
+(169,1200,5,95005,99,1,0),
+(170,1200,6,95006,99,1,0),
+(171,1200,7,95007,99,1,0),
+(172,1201,1,95008,99,1,0),
+(173,1201,2,95009,99,1,0),
+(174,1201,3,95010,99,1,0),
+(175,1201,4,95011,99,1,0),
+(176,1201,5,95012,99,1,0),
+(177,1201,6,95013,99,1,0),
+(178,1201,7,95014,99,1,0),
+(179,1202,1,95015,99,1,0),
+(180,1202,2,95016,99,1,0),
+(181,1202,3,95017,99,1,0),
+(182,1202,4,95018,99,1,0),
+(183,1202,5,95019,99,1,0),
+(184,1202,6,95020,99,1,0),
+(185,1202,7,95021,99,1,0),
+(186,1203,1,95022,99,1,0),
+(187,1203,2,95023,99,1,0),
+(188,1203,3,95024,99,1,0),
+(189,1203,4,95025,99,1,0),
+(190,1203,5,95026,99,1,0),
+(191,1203,6,95027,99,1,0),
+(192,1203,7,95028,99,1,0),
+(193,1204,1,95029,99,1,0),
+(194,1204,2,95030,99,1,0),
+(195,1204,3,95031,99,1,0),
+(196,1204,4,95032,99,1,0),
+(197,1204,5,95033,99,1,0),
+(198,1204,6,95034,99,1,0),
+(199,1204,7,95035,99,1,0),
+(200,1205,1,95036,99,1,0),
+(201,1205,2,95037,99,1,0),
+(202,1205,3,95038,99,1,0),
+(203,1205,4,95039,99,1,0),
+(204,1205,5,95040,99,1,0),
+(205,1205,6,95041,99,1,0),
+(206,1205,7,95042,99,1,0),
+(207,1206,1,95043,99,1,0),
+(208,1206,2,95044,99,1,0),
+(209,1206,3,95045,99,1,0),
+(210,1206,4,95046,99,1,0),
+(211,1206,5,95047,99,1,0),
+(212,1206,6,95048,99,1,0),
+(213,1206,7,95049,99,1,0),
+(214,1207,1,95050,99,1,0),
+(215,1207,2,95051,99,1,0),
+(216,1207,3,95052,99,1,0),
+(217,1207,4,95053,99,1,0),
+(218,1207,5,95054,99,1,0),
+(219,1207,6,95055,99,1,0),
+(220,1207,7,95056,99,1,0),
+(221,1208,1,95057,99,1,0),
+(222,1208,2,95058,99,1,0),
+(223,1208,3,95059,99,1,0),
+(224,1208,4,95060,99,1,0),
+(225,1208,5,95061,99,1,0),
+(226,1208,6,95062,99,1,0),
+(227,1208,7,95063,99,1,0),
+(228,1209,1,95064,99,1,0),
+(229,1209,2,95065,99,1,0),
+(230,1209,3,95066,99,1,0),
+(231,1209,4,95067,99,1,0),
+(232,1209,5,95068,99,1,0),
+(233,1209,6,95069,99,1,0),
+(234,1209,7,95070,99,1,0),
+(235,1210,1,95071,99,1,0),
+(236,1210,2,95072,99,1,0),
+(237,1210,3,95073,99,1,0),
+(238,1210,4,95074,99,1,0),
+(239,1210,5,95075,99,1,0),
+(240,1210,6,95076,99,1,0),
+(241,1210,7,95077,99,1,0),
+(242,1211,1,85612,1,1,100000),
+(243,1211,2,85613,1,1,200000),
+(244,1211,3,85614,1,1,300000),
+(245,1214,1,80035,99,1,0),
+(246,1301,1,102700,99,1,0),
+(247,1301,4,102703,99,1,0),
+(248,1302,1,102704,99,1,0),
+(249,1302,2,102705,99,1,0),
+(250,1303,1,102706,99,1,0),
+(251,1303,2,102707,99,1,0),
+(252,1303,3,102708,99,1,0),
+(253,1304,1,102709,99,1,0),
+(254,1304,5,102713,99,1,0),
+(255,1305,1,102714,99,1,0),
+(256,1306,1,102716,99,1,0),
+(257,1306,5,102720,99,1,0),
+(258,1307,1,102721,99,1,0),
+(259,1307,3,102723,99,1,0),
+(260,1308,1,102724,99,1,0),
+(261,1309,1,102727,99,1,0),
+(262,1309,2,102728,99,1,0),
+(263,1310,1,102729,99,1,0),
+(264,1310,3,102731,99,1,0),
+(265,1311,1,102732,99,1,0),
+(266,1311,4,102735,99,1,0),
+(267,1312,1,102736,99,1,0),
+(268,1312,3,102738,99,1,0),
+(269,1313,1,102739,99,1,0),
+(270,1314,1,102743,99,1,0),
+(271,1314,2,102744,99,1,0),
+(272,1314,3,102745,99,1,0),
+(273,1315,1,102746,99,1,0),
+(274,1315,2,102747,99,1,0),
+(275,1316,1,102748,99,1,0),
+(276,1316,5,102752,99,1,0),
+(277,1317,1,102753,99,1,0),
+(278,1318,1,102756,99,1,0),
+(279,1319,1,102759,99,1,0),
+(280,1319,3,102761,99,1,0),
+(281,1320,1,102762,99,1,0),
+(282,1321,1,102765,99,1,0),
+(283,1321,2,102766,99,1,0),
+(284,1321,3,102767,99,1,0),
+(285,1322,1,102768,99,1,0),
+(286,1322,2,102769,99,1,0),
+(287,1322,3,102770,99,1,0),
+(288,1323,1,102771,99,1,0),
+(289,1324,1,102774,99,1,0),
+(290,1400,1,102800,99,1,0),
+(291,1401,1,102807,99,1,0),
+(292,1401,7,102813,99,1,0),
+(293,1402,1,102814,99,1,0),
+(294,1402,7,102820,99,1,0),
+(295,1403,1,102821,99,1,0),
+(296,1404,1,102828,99,1,0),
+(297,1405,1,102835,99,1,0),
+(298,1406,1,102842,99,1,0),
+(299,1408,1,109310,99,1,0),
+(300,1408,5,109314,99,1,0),
+(301,1409,1,109315,99,1,0),
+(302,1409,5,109319,99,1,0),
+(303,1410,1,109320,99,1,0),
+(304,1410,5,109324,99,1,0),
+(305,1411,1,109325,99,1,0),
+(306,1411,5,109329,99,1,0),
+(307,1412,1,109330,99,1,0),
+(308,1412,5,109334,99,1,0),
+(309,1413,1,109335,99,1,0),
+(310,1413,5,109339,99,1,0),
+(311,1414,1,109340,99,1,0),
+(312,1414,5,109344,99,1,0),
+(313,1415,1,109345,99,1,0),
+(314,1415,5,109349,99,1,0),
+(315,1416,1,109350,99,1,0),
+(316,1416,2,109351,99,1,0),
+(317,1416,5,109354,99,1,0),
+(318,1417,1,109355,99,1,0),
+(319,1417,5,109359,99,1,0),
+(320,1418,1,109360,99,1,0),
+(321,1418,5,109364,99,1,0),
+(322,1419,1,109365,99,1,0),
+(323,1419,3,109367,99,1,0),
+(324,1419,5,109369,99,1,0),
+(325,1420,1,109370,99,1,0),
+(326,1420,5,109374,99,1,0),
+(327,1421,1,109375,99,1,0),
+(328,1421,5,109379,99,1,0),
+(329,1422,1,109380,99,1,0),
+(330,1422,5,109384,99,1,0),
+(331,1423,1,109385,99,1,0),
+(332,1423,2,109386,99,1,0),
+(333,1423,5,109389,99,1,0),
+(334,1436,1,120378,99,1,0),
+(335,1436,2,120379,99,1,0),
+(336,1436,3,120380,99,1,0),
+(337,1436,4,120381,99,1,0),
+(338,1436,5,120382,99,1,0),
+(339,1436,6,120383,99,1,0),
+(340,1436,7,120384,99,1,0),
+(341,1436,8,120385,99,1,0),
+(342,1436,9,120386,99,1,0),
+(343,1436,10,120387,99,1,0),
+(344,1436,11,120388,99,1,0),
+(345,1436,12,120389,99,1,0),
+(346,1436,13,120390,99,1,0),
+(347,1436,14,120391,99,1,0),
+(348,1436,15,120392,99,1,0),
+(349,1436,16,120393,99,1,0),
+(350,1436,17,120394,99,1,0),
+(351,1436,18,120395,99,1,0),
+(352,1436,19,120396,99,1,0),
+(353,1436,20,120397,99,1,0),
+(354,1440,1,56992,99,1,0),
+(355,1440,2,56993,99,1,0),
+(356,1440,3,56994,99,1,0),
+(357,1440,4,56995,99,1,0),
+(358,1440,5,56996,99,1,0),
+(359,1441,1,132787,99,1,0),
+(360,1441,2,132788,99,1,0),
+(361,1441,3,132789,99,1,0),
+(362,1441,4,132790,99,1,0),
+(363,1441,5,132791,99,1,0),
+(364,1441,6,132792,99,1,0),
+(365,1441,7,132793,99,1,0),
+(366,1441,8,132794,99,1,0),
+(367,1441,9,132795,99,1,0),
+(368,1441,10,132796,99,1,0),
+(369,1441,11,132797,99,1,0),
+(370,1441,13,132799,99,1,0),
+(371,1441,14,132800,99,1,0),
+(372,1441,15,132801,99,1,0),
+(373,1441,16,132802,99,1,0),
+(374,1441,17,132803,99,1,0),
+(375,1441,18,132804,99,1,0),
+(376,1441,19,132805,99,1,0),
+(377,1441,20,132806,99,1,0),
+(378,1442,1,133137,99,1,0),
+(379,1442,2,133138,99,1,0),
+(380,1442,3,133139,99,1,0),
+(381,1442,4,133140,99,1,0),
+(382,1442,10,133146,99,1,0),
+(383,1442,11,133147,99,1,0),
+(384,1442,12,133148,99,1,0),
+(385,1442,13,133149,99,1,0),
+(386,1442,14,133150,99,1,0),
+(387,1442,15,133151,99,1,0),
+(388,1442,16,133152,99,1,0),
+(389,1442,17,133153,99,1,0),
+(390,1442,18,133154,99,1,0),
+(391,1442,19,133155,99,1,0),
+(392,1442,20,133156,99,1,0),
+(393,1443,1,133406,99,1,0),
+(394,1443,2,133407,99,1,0),
+(395,1443,3,133408,99,1,0),
+(396,1443,4,133409,99,1,0),
+(397,1443,5,133410,99,1,0),
+(398,1443,6,133411,99,1,0),
+(399,1443,7,133412,99,1,0),
+(400,1443,8,133413,99,1,0),
+(401,1443,9,133414,99,1,0),
+(402,1443,10,133415,99,1,0),
+(403,1443,11,133416,99,1,0),
+(404,1443,12,133417,99,1,0),
+(405,1443,13,133418,99,1,0),
+(406,1443,14,133419,99,1,0),
+(407,1443,15,133420,99,1,0),
+(408,1443,16,133421,99,1,0),
+(409,1443,17,133422,99,1,0),
+(410,1443,18,133423,99,1,0),
+(411,1443,19,133424,99,1,0),
+(412,1443,20,133425,99,1,0),
+(413,1444,1,94938,99,1,0),
+(414,1444,2,94939,99,1,0),
+(415,1444,3,94940,99,1,0),
+(416,1444,4,94941,99,1,0),
+(417,1444,5,94942,99,1,0),
+(418,1444,6,94943,99,1,0),
+(419,1444,7,94944,99,1,0),
+(420,1444,8,94945,99,1,0),
+(421,1444,9,94946,99,1,0),
+(422,1444,10,94947,99,1,0),
+(423,1444,11,94948,99,1,0),
+(424,1444,12,94949,99,1,0),
+(425,1444,13,94950,99,1,0),
+(426,1444,14,94951,99,1,0),
+(427,1444,15,94952,99,1,0),
+(428,1444,16,94953,99,1,0),
+(429,1444,17,94954,99,1,0),
+(430,1444,18,94955,99,1,0),
+(431,1444,19,94956,99,1,0),
+(432,1444,20,94957,99,1,0),
+(433,1445,1,98858,99,1,0),
+(434,1445,2,98859,99,1,0),
+(435,1445,3,98860,99,1,0),
+(436,1445,4,98861,99,1,0),
+(437,1445,5,98862,99,1,0);
+
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9291,
+		.description = "2025_01_21_add_remove_zone_fields",
+		.check = "SHOW COLUMNS FROM `zone` LIKE 'client_update_range'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE zone DROP COLUMN IF EXISTS npc_update_range;
+ALTER TABLE zone DROP COLUMN IF EXISTS max_movement_update_range;
+ALTER TABLE `zone` ADD COLUMN `client_update_range` int(11) NOT NULL DEFAULT 600 AFTER `npc_max_aggro_dist`;
+)",
+		.content_schema_update = true,
+	},
+	ManifestEntry{
+		.version = 9292,
+		.description = "2025_01_21_data_buckets_account_id",
+		.check       = "SHOW COLUMNS FROM `data_buckets` LIKE 'account_id'",
+		.condition   = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `data_buckets`
+ADD COLUMN `account_id` bigint(11) NULL DEFAULT 0 AFTER `expires`,
+DROP INDEX `keys`,
+ADD UNIQUE INDEX `keys` (`key`, `character_id`, `npc_id`, `bot_id`, `account_id`) USING BTREE;
+
+-- Add the INDEX for character_id and key
+ALTER TABLE `data_buckets` ADD KEY `idx_account_id_key` (`account_id`, `key`);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9293,
+		.description = "2025_01_10_create_pet_names_table.sql",
+		.check = "SHOW TABLES LIKE 'character_pet_name'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+CREATE TABLE `character_pet_name` (
+    `character_id` INT(11) NOT NULL PRIMARY KEY,
+    `name` VARCHAR(64) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+)",
+	},
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
 //		.version = 9228,

common/database_instances.cpp

@@ -114,7 +114,9 @@ bool Database::CheckInstanceExpired(uint16 instance_id)
 	timeval tv{};
 	gettimeofday(&tv, nullptr);
 
-	return (i.start_time + i.duration) <= tv.tv_sec;
+	// Use uint64_t for the addition to prevent overflow
+	uint64_t expiration_time = static_cast<uint64_t>(i.start_time) + static_cast<uint64_t>(i.duration);
+	return expiration_time <= tv.tv_sec;
 }
 
 bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration)
@@ -469,15 +471,13 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 
 void Database::DeleteInstance(uint16 instance_id)
 {
+	// I'm not sure why this isn't in here but we should add it in a later change and make sure it's tested
+	// InstanceListRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
-
 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
-
 	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
-
 	DynamicZoneMembersRepository::DeleteByInstance(*this, instance_id);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
-
 	CharacterCorpsesRepository::BuryInstance(*this, instance_id);
 }
 

common/database_schema.h

@@ -51,6 +51,7 @@ namespace DatabaseSchema {
 			{"character_enabledtasks",         "charid"},
 			{"character_expedition_lockouts",  "character_id"},
 			{"character_exp_modifiers",        "character_id"},
+			{"character_evolving_items",       "character_id"},
 			{"character_inspect_messages",     "id"},
 			{"character_instance_safereturns", "character_id"},
 			{"character_item_recast",          "id"},
@@ -63,6 +64,7 @@ namespace DatabaseSchema {
 			{"character_pet_buffs",            "char_id"},
 			{"character_pet_info",             "char_id"},
 			{"character_pet_inventory",        "char_id"},
+			{"character_pet_name",             "character_id"},
 			{"character_peqzone_flags",        "id"},
 			{"character_potionbelt",           "id"},
 			{"character_skills",               "id"},
@@ -124,6 +126,7 @@ namespace DatabaseSchema {
 			"character_enabledtasks",
 			"character_expedition_lockouts",
 			"character_exp_modifiers",
+			"character_evolving_items",
 			"character_inspect_messages",
 			"character_instance_safereturns",
 			"character_item_recast",
@@ -212,6 +215,7 @@ namespace DatabaseSchema {
 			"ground_spawns",
 			"horses",
 			"items",
+			"items_evolving_details",
 			"ldon_trap_entries",
 			"ldon_trap_templates",
 			"lootdrop",

common/emu_oplist.h

@@ -35,7 +35,7 @@ N(OP_AltCurrencyMerchantRequest),
 N(OP_AltCurrencyPurchase),
 N(OP_AltCurrencyReclaim),
 N(OP_AltCurrencySell),
-N(OP_AltCurrencySellSelection), 		// Used by eqstr_us.txt 8066, 8068, 8069 		
+N(OP_AltCurrencySellSelection), 		// Used by eqstr_us.txt 8066, 8068, 8069
 N(OP_Animation),
 N(OP_AnnoyingZoneUnknown),
 N(OP_ApplyPoison),
@@ -77,6 +77,7 @@ N(OP_CashReward),
 N(OP_CastSpell),
 N(OP_ChangeSize),
 N(OP_ChannelMessage),
+N(OP_ChangePetName),
 N(OP_CharacterCreate),
 N(OP_CharacterCreateRequest),
 N(OP_CharInventory),
@@ -162,6 +163,7 @@ N(OP_EnduranceUpdate),
 N(OP_EnterChat),
 N(OP_EnterWorld),
 N(OP_EnvDamage),
+N(OP_EvolveItem),
 N(OP_ExpansionInfo),
 N(OP_ExpUpdate),
 N(OP_FaceChange),
@@ -283,12 +285,15 @@ N(OP_InspectMessageUpdate),
 N(OP_InspectRequest),
 N(OP_InstillDoubt),
 N(OP_InterruptCast),
+N(OP_InvokeChangePetName),
+N(OP_InvokeChangePetNameImmediate),
 N(OP_ItemLinkClick),
 N(OP_ItemLinkResponse),
 N(OP_ItemLinkText),
 N(OP_ItemName),
 N(OP_ItemPacket),
 N(OP_ItemPreview),
+N(OP_ItemPreviewRequest),
 N(OP_ItemRecastDelay),
 N(OP_ItemVerifyReply),
 N(OP_ItemVerifyRequest),
@@ -400,6 +405,8 @@ N(OP_PetitionSearchText),
 N(OP_PetitionUnCheckout),
 N(OP_PetitionUpdate),
 N(OP_PickPocket),
+N(OP_PickZone),
+N(OP_PickZoneWindow),
 N(OP_PlayerProfile),
 N(OP_PlayerStateAdd),
 N(OP_PlayerStateRemove),
@@ -514,7 +521,7 @@ N(OP_ShopPlayerSell),
 N(OP_ShopSendParcel),
 N(OP_ShopDeleteParcel),
 N(OP_ShopRespondParcel),
-N(OP_ShopRetrieveParcel), 
+N(OP_ShopRetrieveParcel),
 N(OP_ShopParcelIcon),
 N(OP_ShopRequest),
 N(OP_SimpleMessage),

common/eq_constants.h

@@ -1114,4 +1114,5 @@ enum ExpSource
 namespace DoorType {
 	constexpr uint32 BuyerStall = 155;
 }
+
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_limits.cpp

@@ -47,6 +47,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		ClientUnknown::constants::EXPANSION_BIT,
 		ClientUnknown::constants::EXPANSIONS_MASK,
 		ClientUnknown::INULL,
+		ClientUnknown::INULL,
 		ClientUnknown::INULL
 	),
 	/*[ClientVersion::Client62] =*/
@@ -55,6 +56,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		Client62::constants::EXPANSION_BIT,
 		Client62::constants::EXPANSIONS_MASK,
 		Client62::INULL,
+		Client62::INULL,
 		Client62::INULL
 	),
 	/*[ClientVersion::Titanium] =*/
@@ -63,7 +65,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		Titanium::constants::EXPANSION_BIT,
 		Titanium::constants::EXPANSIONS_MASK,
 		Titanium::constants::CHARACTER_CREATION_LIMIT,
-		Titanium::constants::SAY_LINK_BODY_SIZE
+		Titanium::constants::SAY_LINK_BODY_SIZE,
+		Titanium::INULL
 	),
 	/*[ClientVersion::SoF] =*/
 	EQ::constants::LookupEntry(
@@ -71,7 +74,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		SoF::constants::EXPANSION_BIT,
 		SoF::constants::EXPANSIONS_MASK,
 		SoF::constants::CHARACTER_CREATION_LIMIT,
-		SoF::constants::SAY_LINK_BODY_SIZE
+		SoF::constants::SAY_LINK_BODY_SIZE,
+		SoF::INULL
 	),
 	/*[ClientVersion::SoD] =*/
 	EQ::constants::LookupEntry(
@@ -79,7 +83,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		SoD::constants::EXPANSION_BIT,
 		SoD::constants::EXPANSIONS_MASK,
 		SoD::constants::CHARACTER_CREATION_LIMIT,
-		SoD::constants::SAY_LINK_BODY_SIZE
+		SoD::constants::SAY_LINK_BODY_SIZE,
+		SoD::INULL
 	),
 	/*[ClientVersion::UF] =*/
 	EQ::constants::LookupEntry(
@@ -87,7 +92,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		UF::constants::EXPANSION_BIT,
 		UF::constants::EXPANSIONS_MASK,
 		UF::constants::CHARACTER_CREATION_LIMIT,
-		UF::constants::SAY_LINK_BODY_SIZE
+		UF::constants::SAY_LINK_BODY_SIZE,
+		UF::INULL
 	),
 	/*[ClientVersion::RoF] =*/
 	EQ::constants::LookupEntry(
@@ -95,7 +101,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		RoF::constants::EXPANSION_BIT,
 		RoF::constants::EXPANSIONS_MASK,
 		RoF::constants::CHARACTER_CREATION_LIMIT,
-		RoF::constants::SAY_LINK_BODY_SIZE
+		RoF::constants::SAY_LINK_BODY_SIZE,
+		RoF::INULL
 	),
 	/*[ClientVersion::RoF2] =*/
 	EQ::constants::LookupEntry(
@@ -103,7 +110,8 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		RoF2::constants::EXPANSION_BIT,
 		RoF2::constants::EXPANSIONS_MASK,
 		RoF2::constants::CHARACTER_CREATION_LIMIT,
-		RoF2::constants::SAY_LINK_BODY_SIZE
+		RoF2::constants::SAY_LINK_BODY_SIZE,
+		RoF2::constants::MAX_BAZAAR_TRADERS
 	)
 };
 

common/eq_limits.h

@@ -42,6 +42,7 @@ namespace EQ
 			uint32 ExpansionsMask;
 			int16 CharacterCreationLimit;
 			size_t SayLinkBodySize;
+			uint32 BazaarTraderLimit;
 			
 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
@@ -49,13 +50,15 @@ namespace EQ
 				uint32 ExpansionBit,
 				uint32 ExpansionsMask,
 				int16 CharacterCreationLimit,
-				size_t SayLinkBodySize
+				size_t SayLinkBodySize,
+				uint32 BazaarTraderLimit
 			) :
 				Expansion(Expansion),
 				ExpansionBit(ExpansionBit),
 				ExpansionsMask(ExpansionsMask),
 				CharacterCreationLimit(CharacterCreationLimit),
-				SayLinkBodySize(SayLinkBodySize)
+				SayLinkBodySize(SayLinkBodySize),
+				BazaarTraderLimit(BazaarTraderLimit)
 			{ }
 		};
 

common/eq_packet_structs.h

@@ -5819,6 +5819,21 @@ struct ChangeSize_Struct
 /*16*/
 };
 
+struct ChangePetName_Struct {
+/*00*/ char new_pet_name[64];
+/*40*/ char pet_owner_name[64];
+/*80*/ int  response_code;
+};
+
+enum ChangePetNameResponse : int {
+	Denied      = 0,        // 5167 You have requested an invalid name or a Customer Service Representative has denied your name request.  Please try another name.
+	Accepted    = 1,        // 5976 Your request for a name change was successful.
+	Timeout     = -3,        // 5979 You must wait longer before submitting another name request. Please try again in a few minutes.
+	NotEligible = -4,    // 5980 Your character is not eligible for a name change.
+	Pending     = -5,        // 5193 You already have a name change pending.  Please wait until it is fully processed before attempting another name change.
+	Unhandled   = -1
+};
+
 // New OpCode/Struct for SoD+
 struct GroupMakeLeader_Struct
 {
@@ -6440,6 +6455,90 @@ struct BuylineItemDetails_Struct {
 	uint32      item_quantity;
 };
 
+struct PickZoneEntry_Struct {
+	int16 zone_id;
+	int16 unknown;
+	int32 player_count;
+	int32 instance_id;
+};
+
+struct PickZoneWindow_Struct {
+	char                 padding000[64];
+	int64                session_id;
+	int8                 option_count;
+	char                 padding073[23];
+	PickZoneEntry_Struct entries[10];
+};
+
+struct PickZone_Struct {
+	int64 session_id;
+	int32 selection_id;
+};
+
+struct EvolveItemToggle {
+	uint32 action;
+	uint32 unknown_004;
+	uint64 unique_id;
+	uint32 percentage;
+	uint32 activated;
+};
+
+struct EvolveXPWindowReceive {
+	uint32 action;
+	uint32 unknown_004;
+	uint64 item1_unique_id;
+	uint64 item2_unique_id;
+};
+
+struct EvolveItemMessaging {
+	uint32 action;
+	char   serialized_data[];
+};
+
+struct EvolveXPWindowSend {
+	/*000*/    uint32   action;
+	/*004*/    uint64   item1_unique_id;
+	/*012*/    uint64   item2_unique_id;
+	/*020*/    uint32   compatibility;
+	/*024*/    uint32   max_transfer_level;
+	/*028*/    uint8    item1_present;
+	/*029*/ uint8       item2_present;
+	/*030*/ std::string serialize_item_1;
+	/*034*/ std::string serialize_item_2;
+
+	template<class Archive>
+	void serialize(Archive &archive)
+	{
+		archive(
+			CEREAL_NVP(action),
+			CEREAL_NVP(item1_unique_id),
+			CEREAL_NVP(item2_unique_id),
+			CEREAL_NVP(compatibility),
+			CEREAL_NVP(max_transfer_level),
+			CEREAL_NVP(item1_present),
+			CEREAL_NVP(item2_present),
+			CEREAL_NVP(serialize_item_1),
+			CEREAL_NVP(serialize_item_2)
+		);
+	}
+};
+
+struct EvolveTransfer {
+	uint32 item_from_id;
+	uint32 item_from_current_amount;
+	uint32 item_to_id;
+	uint32 item_to_current_amount;
+	uint32 compatibility;
+	uint32 max_transfer_level;
+};
+
+struct EvolveGetNextItem {
+	uint32 new_item_id;
+	uint64 new_current_amount;
+	uint64 from_current_amount;
+	uint32 max_transfer_level;
+};
+
 // Restore structure packing to default
 #pragma pack()
 

common/eqemu_config.h

@@ -137,9 +137,9 @@ class EQEmuConfig
 		{
 
 		}
-		virtual ~EQEmuConfig() {}
 
 	public:
+		virtual ~EQEmuConfig() {}
 
 		// Produce a const singleton
 		static const EQEmuConfig *get()

common/eqemu_logsys.cpp

@@ -25,6 +25,8 @@
 #include "repositories/discord_webhooks_repository.h"
 #include "repositories/logsys_categories_repository.h"
 #include "termcolor/rang.hpp"
+#include "path_manager.h"
+#include "file.h"
 
 #include <iostream>
 #include <string>
@@ -85,6 +87,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	 * Set Defaults
 	 */
 	log_settings[Logs::Crash].log_to_console                = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Crash].log_to_file                   = static_cast<uint8>(Logs::General);
 	log_settings[Logs::MySQLError].log_to_console           = static_cast<uint8>(Logs::General);
 	log_settings[Logs::NPCScaling].log_to_gmsay             = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay              = static_cast<uint8>(Logs::General);
@@ -532,6 +535,11 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
 	EQEmuLogSys::CloseFileLogs();
 
+	if (!File::Exists(path.GetLogPath())) {
+		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
+		File::Makedir(path.GetLogPath());
+	}
+
 	/**
 	 * When loading settings, we must have been given a reason in category based logging to output to a file in order to even create or open one...
 	 */

common/eqemu_logsys.h

@@ -142,6 +142,9 @@ namespace Logs {
 		EqTime,
 		Corpses,
 		XTargets,
+		EvolveItem,
+		PositionUpdate,
+		KSM,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -242,7 +245,10 @@ namespace Logs {
 		"Zoning",
 		"EqTime",
 		"Corpses",
-		"XTargets"
+		"XTargets",
+		"EvolveItem",
+		"PositionUpdate",
+		"KSM" // Kernel Samepage Merging
 	};
 }
 

common/eqemu_logsys_log_aliases.h

@@ -131,6 +131,16 @@
         OutF(LogSys, Logs::Detail, Logs::Error, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogEvolveItem(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::EvolveItem))\
+        OutF(LogSys, Logs::General, Logs::EvolveItem, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogEvolveItemDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::EvolveItem))\
+        OutF(LogSys, Logs::Detail, Logs::EvolveItem, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogGuilds(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::Guilds))\
         OutF(LogSys, Logs::General, Logs::Guilds, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -844,6 +854,26 @@
         OutF(LogSys, Logs::Detail, Logs::XTargets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogPositionUpdate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::PositionUpdate))\
+        OutF(LogSys, Logs::General, Logs::PositionUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPositionUpdateDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::PositionUpdate))\
+        OutF(LogSys, Logs::Detail, Logs::PositionUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__); \
+} while (0)
+
+#define LogKSM(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::KSM))\
+        OutF(LogSys, Logs::General, Logs::KSM, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogKSMDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::KSM))\
+        OutF(LogSys, Logs::Detail, Logs::KSM, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.IsLogEnabled(debug_level, log_category))\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\

common/events/player_event_logs.cpp

@@ -707,6 +707,7 @@ void PlayerEventLogs::SetSettingsDefaults()
 	m_settings[PlayerEvent::PARCEL_RETRIEVE].event_enabled           = 1;
 	m_settings[PlayerEvent::PARCEL_DELETE].event_enabled             = 1;
 	m_settings[PlayerEvent::BARTER_TRANSACTION].event_enabled        = 1;
+	m_settings[PlayerEvent::EVOLVE_ITEM].event_enabled               = 1;
 
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;

common/events/player_events.h

@@ -62,6 +62,7 @@ namespace PlayerEvent {
 		PARCEL_RETRIEVE,
 		PARCEL_DELETE,
 		BARTER_TRANSACTION,
+		EVOLVE_ITEM,
 		MAX // dont remove
 	};
 
@@ -124,7 +125,8 @@ namespace PlayerEvent {
 		"Parcel Item Sent",
 		"Parcel Item Retrieved",
 		"Parcel Prune Routine",
-		"Barter Transaction"
+		"Barter Transaction",
+		"Evolve Item Update"
 	};
 
 	// Generic struct used by all events
@@ -1115,6 +1117,29 @@ namespace PlayerEvent {
 			);
 		}
 	};
+
+	struct EvolveItem {
+		std::string status;
+		uint32      item_id;
+		uint64      unique_id;
+		std::string item_name;
+		uint32      level;
+		double      progression;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(status),
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(unique_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(level),
+				CEREAL_NVP(progression)
+			);
+		}
+	};
 }
 
 #endif //EQEMU_PLAYER_EVENTS_H

common/evolving_items.cpp

@@ -0,0 +1,303 @@
+#include "evolving_items.h"
+#include "item_instance.h"
+#include "events/player_event_logs.h"
+#include "repositories/character_evolving_items_repository.h"
+
+EvolvingItemsManager::EvolvingItemsManager()
+{
+	m_db         = nullptr;
+	m_content_db = nullptr;
+}
+
+void EvolvingItemsManager::LoadEvolvingItems() const
+{
+	auto const &results = ItemsEvolvingDetailsRepository::All(*m_content_db);
+
+	if (results.empty()) {
+		return;
+	}
+
+	std::ranges::transform(
+		results.begin(),
+		results.end(),
+		std::inserter(
+			evolving_items_manager.GetEvolvingItemsCache(),
+			evolving_items_manager.GetEvolvingItemsCache().end()
+		),
+		[](const ItemsEvolvingDetailsRepository::ItemsEvolvingDetails &x) {
+			return std::make_pair(x.item_id, x);
+		}
+	);
+}
+
+void EvolvingItemsManager::SetDatabase(Database *db)
+{
+	m_db = db;
+}
+
+void EvolvingItemsManager::SetContentDatabase(Database *db)
+{
+	m_content_db = db;
+}
+
+double EvolvingItemsManager::CalculateProgression(const uint64 current_amount, const uint32 item_id)
+{
+	if (!evolving_items_manager.GetEvolvingItemsCache().contains(item_id)) {
+		return 0;
+	}
+
+	return evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount > 0
+		? static_cast<double>(current_amount)
+		  / static_cast<double>(evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount) * 100
+		: 0;
+}
+
+void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_id, const EQ::ItemInstance &inst) const
+{
+	inst.SetEvolveEquipped(false);
+	if (inst.IsEvolving() && slot_id <= EQ::invslot::EQUIPMENT_END && slot_id >= EQ::invslot::EQUIPMENT_BEGIN) {
+		inst.SetEvolveEquipped(true);
+	}
+
+	if (!inst.IsEvolving()) {
+		return;
+	}
+
+	if (!inst.GetEvolveUniqueID()) {
+		auto e = CharacterEvolvingItemsRepository::NewEntity();
+
+		e.character_id  = char_id;
+		e.item_id       = inst.GetID();
+		e.equipped      = inst.GetEvolveEquipped();
+		e.final_item_id = evolving_items_manager.GetFinalItemID(inst);
+
+		auto r = CharacterEvolvingItemsRepository::InsertOne(*m_db, e);
+		e.id   = r.id;
+
+		inst.SetEvolveUniqueID(e.id);
+		inst.SetEvolveCharID(e.character_id);
+		inst.SetEvolveItemID(e.item_id);
+		inst.SetEvolveFinalItemID(e.final_item_id);
+
+		return;
+	}
+
+	CharacterEvolvingItemsRepository::SetEquipped(*m_db, inst.GetEvolveUniqueID(), inst.GetEvolveEquipped());
+}
+
+uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const
+{
+	const auto start_iterator = std::ranges::find_if(
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
+		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
+			return a.second.item_evo_id == inst.GetEvolveLoreID();
+		}
+	);
+
+	if (start_iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
+		return 0;
+	}
+
+	const auto final_id = std::ranges::max_element(
+		start_iterator,
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
+		[&](
+		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a,
+		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &b
+	) {
+			return a.second.item_evo_id == b.second.item_evo_id &&
+			       a.second.item_evolve_level < b.second.item_evolve_level;
+		}
+	);
+
+	return final_id->first;
+}
+
+uint32 EvolvingItemsManager::GetNextEvolveItemID(const EQ::ItemInstance &inst) const
+{
+	int8 const current_level = inst.GetEvolveLvl();
+
+	const auto iterator = std::ranges::find_if(
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
+		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
+			return a.second.item_evo_id == inst.GetEvolveLoreID() &&
+			       a.second.item_evolve_level == current_level + 1;
+		}
+	);
+
+	if (iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
+		return 0;
+	}
+
+	return iterator->first;
+}
+
+ItemsEvolvingDetailsRepository::ItemsEvolvingDetails EvolvingItemsManager::GetEvolveItemDetails(const uint64 unique_id)
+{
+	if (GetEvolvingItemsCache().contains(unique_id)) {
+		return GetEvolvingItemsCache().at(unique_id);
+	}
+
+	return ItemsEvolvingDetailsRepository::NewEntity();
+}
+
+std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> EvolvingItemsManager::GetEvolveIDItems(
+	const uint32 evolve_id
+)
+{
+	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> e{};
+
+	for (auto const &[key, value]: GetEvolvingItemsCache()) {
+		if (value.item_evo_id == evolve_id) {
+			e.push_back(value);
+		}
+	}
+
+	std::ranges::sort(
+		e.begin(),
+		e.end(),
+		[&](
+		ItemsEvolvingDetailsRepository::ItemsEvolvingDetails const &a,
+		ItemsEvolvingDetailsRepository::ItemsEvolvingDetails const &b
+	) {
+			return a.item_evolve_level < b.item_evolve_level;
+		}
+	);
+
+	return e;
+}
+
+uint64 EvolvingItemsManager::GetTotalEarnedXP(const EQ::ItemInstance &inst)
+{
+	if (!inst) {
+		return 0;
+	}
+
+	uint64 xp                 = inst.GetEvolveCurrentAmount();
+	auto evolve_id_item_cache = GetEvolveIDItems(inst.GetEvolveLoreID());
+	auto current_level        = inst.GetEvolveLvl();
+
+	for (auto const &i: evolve_id_item_cache) {
+		if (i.item_evolve_level < current_level) {
+			xp += i.required_amount;
+		}
+	}
+
+	return xp;
+}
+
+EvolveGetNextItem EvolvingItemsManager::GetNextItemByXP(const EQ::ItemInstance &inst_in, const int64 in_xp)
+{
+	EvolveGetNextItem ets{};
+	const auto        evolve_items   = GetEvolveIDItems(inst_in.GetEvolveLoreID());
+	uint32            max_transfer_level = 0;
+	int64             xp                  = in_xp;
+
+	for (auto const &e: evolve_items) {
+		if (e.item_evolve_level < inst_in.GetEvolveLvl()) {
+			continue;
+		}
+
+		int64 have = 0;
+		if (e.item_evolve_level == inst_in.GetEvolveLvl()) {
+			have = inst_in.GetEvolveCurrentAmount();
+		}
+
+		const auto required = e.required_amount;
+		const int64 need    = required - have;
+		const int64 balance = xp - need;
+
+		if (balance <= 0) {
+			ets.new_current_amount  = have + xp;
+			ets.new_item_id         = e.item_id;
+			ets.from_current_amount = 0;
+			ets.max_transfer_level  = max_transfer_level;
+			return ets;
+		}
+
+		xp = balance;
+		max_transfer_level += 1;
+
+		ets.new_current_amount  = required;
+		ets.new_item_id         = e.item_id;
+		ets.from_current_amount = balance - required;
+		ets.max_transfer_level  = max_transfer_level;
+	}
+
+	return ets;
+}
+
+EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
+	const EQ::ItemInstance &inst_from,
+	const EQ::ItemInstance &inst_to
+)
+{
+	EvolveTransfer ets{};
+
+	auto evolving_details_inst_from = evolving_items_manager.GetEvolveItemDetails(inst_from.GetID());
+	auto evolving_details_inst_to   = evolving_items_manager.GetEvolveItemDetails(inst_to.GetID());
+
+	if (!evolving_details_inst_from.id || !evolving_details_inst_to.id) {
+		return ets;
+	}
+
+	if (evolving_details_inst_from.type == evolving_details_inst_to.type) {
+		uint32 compatibility = 0;
+		uint64 xp            = 0;
+		if (evolving_details_inst_from.sub_type == evolving_details_inst_to.sub_type) {
+			compatibility = 100;
+		}
+		else {
+			compatibility = 30;
+		}
+
+		xp           = evolving_items_manager.GetTotalEarnedXP(inst_from) * compatibility / 100;
+		auto results = evolving_items_manager.GetNextItemByXP(inst_to, xp);
+
+		ets.item_from_id             = evolving_items_manager.GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
+		ets.item_from_current_amount = results.from_current_amount;
+		ets.item_to_id               = results.new_item_id;
+		ets.item_to_current_amount   = results.new_current_amount;
+		ets.compatibility            = compatibility;
+		ets.max_transfer_level       = results.max_transfer_level;
+	}
+
+	return ets;
+}
+
+uint32 EvolvingItemsManager::GetFirstItemInLoreGroup(const uint32 lore_id)
+{
+	for (auto const &[key, value]: GetEvolvingItemsCache()) {
+		if (value.item_evo_id == lore_id && value.item_evolve_level == 1) {
+			return key;
+		}
+	}
+
+	return 0;
+}
+
+uint32 EvolvingItemsManager::GetFirstItemInLoreGroupByItemID(const uint32 item_id)
+{
+	for (auto const &[key, value]: GetEvolvingItemsCache()) {
+		if (value.item_id == item_id) {
+			for (auto const &[key2, value2]: GetEvolvingItemsCache()) {
+				if (value2.item_evo_id == value.item_evo_id && value2.item_evolve_level == 1) {
+					return key;
+				}
+			}
+		}
+	}
+
+	return 0;
+}
+
+void EvolvingItemsManager::LoadPlayerEvent(const EQ::ItemInstance &inst, PlayerEvent::EvolveItem &e)
+{
+	e.item_id     = inst.GetID();
+	e.item_name   = inst.GetItem() ? inst.GetItem()->Name : std::string();
+	e.level       = inst.GetEvolveLvl();
+	e.progression = inst.GetEvolveProgression();
+	e.unique_id   = inst.GetEvolveUniqueID();
+}

common/evolving_items.h

@@ -0,0 +1,67 @@
+#ifndef EVOLVING_H
+#define EVOLVING_H
+
+#include "shareddb.h"
+#include "events/player_events.h"
+#include "repositories/items_evolving_details_repository.h"
+
+namespace EQ {
+	class ItemInstance;
+}
+
+namespace EvolvingItems {
+	namespace Actions {
+		constexpr int8 UPDATE_ITEMS            = 0;
+		constexpr int8 TRANSFER_WINDOW_OPEN    = 1;
+		constexpr int8 TRANSFER_WINDOW_DETAILS = 2;
+		constexpr int8 TRANSFER_XP             = 3;
+		constexpr int8 FINAL_RESULT            = 4;
+	}
+
+	namespace Types {
+		constexpr int8 AMOUNT_OF_EXP     = 1;
+		constexpr int8 NUMBER_OF_KILLS   = 2;
+		constexpr int8 SPECIFIC_MOB_RACE = 3;
+		constexpr int8 SPECIFIC_ZONE_ID  = 4;
+	}
+
+	namespace SubTypes {
+		constexpr int8 ALL_EXP   = 0;
+		constexpr int8 SOLO_EXP  = 1;
+		constexpr int8 GROUP_EXP = 2;
+		constexpr int8 RAID_EXP  = 3;
+	}
+}
+
+class EvolvingItemsManager
+{
+public:
+	EvolvingItemsManager();
+	void SetDatabase(Database *db);
+	void SetContentDatabase(Database *db);
+
+	void LoadEvolvingItems() const;
+	void DoLootChecks(uint32 char_id, uint16 slot_id, const EQ::ItemInstance &inst) const;
+	uint32 GetFinalItemID(const EQ::ItemInstance &inst) const;
+	uint32 GetNextEvolveItemID(const EQ::ItemInstance &inst) const;
+	uint32 GetFirstItemInLoreGroup(uint32 lore_id);
+	uint32 GetFirstItemInLoreGroupByItemID(uint32 item_id);
+	uint64 GetTotalEarnedXP(const EQ::ItemInstance &inst);
+	static double CalculateProgression(uint64 current_amount, uint32 item_id);
+	static void LoadPlayerEvent(const EQ::ItemInstance &inst, PlayerEvent::EvolveItem &e);
+
+	ItemsEvolvingDetailsRepository::ItemsEvolvingDetails GetEvolveItemDetails(uint64 id);
+	EvolveTransfer DetermineTransferResults(const EQ::ItemInstance& inst_from, const EQ::ItemInstance& inst_to);
+	EvolveGetNextItem GetNextItemByXP(const EQ::ItemInstance &inst_in, int64 in_xp);
+	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails>& GetEvolvingItemsCache() { return evolving_items_cache; }
+	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> GetEvolveIDItems(uint32 evolve_id);
+
+private:
+	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> evolving_items_cache;
+	Database *                                                             m_db;
+	Database *                                                             m_content_db;
+};
+
+extern EvolvingItemsManager evolving_items_manager;
+
+#endif //EVOLVING_H

common/inventory_profile.cpp

@@ -344,6 +344,8 @@ bool EQ::InventoryProfile::SwapItem(
 			fail_state = swapNotAllowed;
 			return false;
 		}
+
+		source_item_instance->SetEvolveEquipped(false);
 		if ((destination_slot >= invslot::EQUIPMENT_BEGIN && destination_slot <= invslot::EQUIPMENT_END)) {
 			auto source_item = source_item_instance->GetItem();
 			if (!source_item) {
@@ -362,6 +364,9 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapLevel;
 				return false;
 			}
+			if (source_item_instance->IsEvolving() > 0) {
+				source_item_instance->SetEvolveEquipped(true);
+			}
 		}
 	}
 
@@ -370,6 +375,8 @@ bool EQ::InventoryProfile::SwapItem(
 			fail_state = swapNotAllowed;
 			return false;
 		}
+
+		destination_item_instance->SetEvolveEquipped(false);
 		if ((source_slot >= invslot::EQUIPMENT_BEGIN && source_slot <= invslot::EQUIPMENT_END)) {
 			auto destination_item = destination_item_instance->GetItem();
 			if (!destination_item) {
@@ -388,6 +395,9 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapLevel;
 				return false;
 			}
+			if (destination_item_instance->IsEvolving()) {
+				destination_item_instance->SetEvolveEquipped(true);
+			}
 		}
 	}
 
@@ -612,9 +622,9 @@ bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
 	return has_equipped;
 }
 
-int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
+uint32 EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 quantity = 0;
 	ItemInstance* item = nullptr;
 
 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -643,9 +653,9 @@ bool EQ::InventoryProfile::HasItemEquippedByID(uint32 item_id)
 	return has_equipped;
 }
 
-int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
+uint32 EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 quantity = 0;
 	ItemInstance* item = nullptr;
 
 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -1402,6 +1412,8 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	int16 result = INVALID_INDEX;
 	int16 parentSlot = INVALID_INDEX;
 
+	inst->SetEvolveEquipped(false);
+
 	if (slot_id == invslot::slotCursor) {
 		// Replace current item on cursor, if exists
 		m_cursor.pop(); // no memory delete, clients of this function know what they are doing
@@ -1410,6 +1422,9 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	}
 	else if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) {
 		if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) != 0) {
+			if (inst->IsEvolving()) {
+				inst->SetEvolveEquipped(true);
+			}
 			m_worn[slot_id] = inst;
 			result = slot_id;
 		}
@@ -1807,4 +1822,183 @@ int16 EQ::InventoryProfile::FindFirstFreeSlotThatFitsItem(const EQ::ItemData *it
 		}
 	}
 	return 0;
-}
+}
+
+//This function has the same flaw as noted above
+// Helper functions for evolving items
+int16 EQ::InventoryProfile::HasEvolvingItem(uint64 evolve_unique_id, uint8 quantity, uint8 where)
+{
+	int16 slot_id = INVALID_INDEX;
+
+	// Altered by Father Nitwit to support a specification of
+	// where to search, with a default value to maintain compatibility
+
+	// Check each inventory bucket
+	if (where & invWhereWorn) {
+		slot_id = _HasEvolvingItem(m_worn, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	if (where & invWherePersonal) {
+		slot_id = _HasEvolvingItem(m_inv, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	if (where & invWhereBank) {
+		slot_id = _HasEvolvingItem(m_bank, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	if (where & invWhereSharedBank) {
+		slot_id = _HasEvolvingItem(m_shbank, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	if (where & invWhereTrading) {
+		slot_id = _HasEvolvingItem(m_trade, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	// Behavioral change - Limbo is no longer checked due to improper handling of return value
+	if (where & invWhereCursor) {
+		// Check cursor queue
+		slot_id = _HasEvolvingItem(m_cursor, evolve_unique_id, quantity);
+		if (slot_id != INVALID_INDEX) {
+			return slot_id;
+		}
+	}
+
+	return slot_id;
+}
+
+// Internal Method: Checks an inventory bucket for a particular evolving item unique id
+int16 EQ::InventoryProfile::_HasEvolvingItem(
+	std::map<int16, ItemInstance *> &bucket, uint64 evolve_unique_id, uint8 quantity)
+{
+	uint32 quantity_found = 0;
+
+	for (auto const &[key, value]: bucket) {
+		if (!value) {
+			continue;
+		}
+
+		if (key <= EQ::invslot::POSSESSIONS_END && key >= EQ::invslot::POSSESSIONS_BEGIN) {
+			if (((uint64) 1 << key & m_lookup->PossessionsBitmask) == 0) {
+				continue;
+			}
+		}
+		else if (key <= EQ::invslot::BANK_END && key >= EQ::invslot::BANK_BEGIN) {
+			if (key - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) {
+				continue;
+			}
+		}
+
+
+		if (value->GetEvolveUniqueID() == evolve_unique_id) {
+			quantity_found += value->GetCharges() <= 0 ? 1 : value->GetCharges();
+			if (quantity_found >= quantity) {
+				return key;
+			}
+		}
+
+		for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
+			if (value->GetAugmentEvolveUniqueID(index) == evolve_unique_id && quantity <= 1) {
+				return invslot::SLOT_AUGMENT_GENERIC_RETURN;
+			}
+		}
+
+		if (!value->IsClassBag()) {
+			continue;
+		}
+
+		for (auto const &[bag_key, bag_value]: *value->GetContents()) {
+			if (!bag_value) {
+				continue;
+			}
+
+			if (bag_value->GetEvolveUniqueID() == evolve_unique_id) {
+				quantity_found += bag_value->GetCharges() <= 0 ? 1 : bag_value->GetCharges();
+				if (quantity_found >= quantity) {
+					return CalcSlotId(key, bag_key);
+				}
+			}
+
+			for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
+				if (bag_value->GetAugmentEvolveUniqueID(index) == evolve_unique_id && quantity <= 1) {
+					return invslot::SLOT_AUGMENT_GENERIC_RETURN;
+				}
+			}
+		}
+	}
+
+	return INVALID_INDEX;
+}
+
+// Internal Method: Checks an inventory queue type bucket for a particular item
+int16 EQ::InventoryProfile::_HasEvolvingItem(ItemInstQueue &iqueue, uint64 evolve_unique_id, uint8 quantity)
+{
+	// The downfall of this (these) queue procedure is that callers presume that when an item is
+	// found, it is presented as being available on the cursor. In cases of a parity check, this
+	// is sufficient. However, in cases where referential criteria is considered, this can lead
+	// to unintended results. Funtionality should be observed when referencing the return value
+	// of this query
+
+	uint32 quantity_found = 0;
+
+	for (auto const &inst: iqueue) {
+		if (!inst) {
+			continue;
+		}
+
+		if (inst->GetEvolveUniqueID() == evolve_unique_id) {
+			quantity_found += inst->GetCharges() <= 0 ? 1 : inst->GetCharges();
+			if (quantity_found >= quantity) {
+				return invslot::slotCursor;
+			}
+		}
+
+		for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
+			if (inst->GetAugmentEvolveUniqueID(index) == evolve_unique_id && quantity <= 1) {
+				return invslot::SLOT_AUGMENT_GENERIC_RETURN;
+			}
+		}
+
+		if (!inst->IsClassBag()) {
+			continue;
+		}
+
+		for (auto const &[bag_key, bag_value]: *inst->GetContents()) {
+			if (!bag_value) {
+				continue;
+			}
+
+			if (bag_value->GetEvolveUniqueID() == evolve_unique_id) {
+				quantity_found += bag_value->GetCharges() <= 0 ? 1 : bag_value->GetCharges();
+				if (quantity_found >= quantity) {
+					return CalcSlotId(invslot::slotCursor, bag_key);
+				}
+			}
+
+			for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
+				if (bag_value->GetAugmentEvolveUniqueID(index) == evolve_unique_id && quantity <= 1) {
+					return invslot::SLOT_AUGMENT_GENERIC_RETURN;
+				}
+			}
+		}
+
+		// We only check the visible cursor due to lack of queue processing ability (client allows duplicate in limbo)
+		break;
+	}
+
+	return INVALID_INDEX;
+}

common/inventory_profile.h

@@ -57,6 +57,8 @@ public:
 
 	inline std::list<EQ::ItemInstance*>::const_iterator cbegin() { return m_list.cbegin(); }
 	inline std::list<EQ::ItemInstance*>::const_iterator cend() { return m_list.cend(); }
+	inline std::list<EQ::ItemInstance*>::iterator begin() { return m_list.begin(); }
+	inline std::list<EQ::ItemInstance*>::iterator end() { return m_list.end(); }
 
 	inline int size() { return static_cast<int>(m_list.size()); } // TODO: change to size_t
 	inline bool empty() { return m_list.empty(); }
@@ -147,13 +149,13 @@ namespace EQ
 		bool HasItemEquippedByID(uint32 item_id);
 
 		// Check how many of a specific item the player has equipped by Item ID
-		int CountItemEquippedByID(uint32 item_id);
+		uint32 CountItemEquippedByID(uint32 item_id);
 
 		// Check if player has a specific augment equipped by Item ID
 		bool HasAugmentEquippedByID(uint32 item_id);
 
 		// Check how many of a specific augment the player has equipped by Item ID
-		int CountAugmentEquippedByID(uint32 item_id);
+		uint32 CountAugmentEquippedByID(uint32 item_id);
 
 		// Get a list of augments from a specific slot ID
 		std::vector<uint32> GetAugmentIDsBySlotID(int16 slot_id);
@@ -211,6 +213,13 @@ namespace EQ
 		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, bool value);
 		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
 		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
+
+		std::map<int16, ItemInstance*>& GetWorn() { return m_worn; }
+		std::map<int16, ItemInstance*>& GetPersonal() { return m_inv; }
+		int16 HasEvolvingItem(uint64 evolve_unique_id, uint8 quantity, uint8 where);
+
+		inline int16 PushItem(int16 slot_id, ItemInstance* inst) { return _PutItem(slot_id, inst); }
+
 	protected:
 		///////////////////////////////
 		// Protected Methods
@@ -233,6 +242,8 @@ namespace EQ
 		int16 _HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity);
 		int16 _HasItemByLoreGroup(std::map<int16, ItemInstance*>& bucket, uint32 loregroup);
 		int16 _HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup);
+		int16 _HasEvolvingItem(std::map<int16, ItemInstance*>& bucket, uint64 evolve_unique_id, uint8 quantity);
+		int16 _HasEvolvingItem(ItemInstQueue& iqueue, uint64 evolve_unique_id, uint8 quantity);
 
 
 		// Player inventory

common/item_instance.cpp

@@ -25,6 +25,7 @@
 #include "rulesys.h"
 #include "shareddb.h"
 #include "strings.h"
+#include "evolving_items.h"
 
 //#include "../common/light_source.h"
 
@@ -76,6 +77,10 @@ EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
 		m_color = m_item->Color;
 	}
 
+	if (IsEvolving()) {
+		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
+	}
+
 	m_SerialNumber  = GetNextItemInstSerialNumber();
 }
 
@@ -95,6 +100,10 @@ EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges
 		m_color = 0;
 	}
 
+	if (IsEvolving()) {
+		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
+	}
+
 	m_SerialNumber  = GetNextItemInstSerialNumber();
 }
 
@@ -146,7 +155,6 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 
 	m_exp       = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
-	m_activated = copy.m_activated;
 
 	if (copy.m_scaledItem) {
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
@@ -154,12 +162,7 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 		m_scaledItem = nullptr;
 	}
 
-	if (copy.m_evolveInfo) {
-		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
-	} else {
-		m_evolveInfo = nullptr;
-	}
-
+	m_evolving_details    = copy.m_evolving_details;
 	m_scaling             = copy.m_scaling;
 	m_ornamenticon        = copy.m_ornamenticon;
 	m_ornamentidfile      = copy.m_ornamentidfile;
@@ -174,7 +177,6 @@ EQ::ItemInstance::~ItemInstance()
 	Clear();
 	safe_delete(m_item);
 	safe_delete(m_scaledItem);
-	safe_delete(m_evolveInfo);
 }
 
 // Query item type
@@ -1030,29 +1032,6 @@ void EQ::ItemInstance::ScaleItem() {
 	m_scaledItem->CharmFileID = 0;	// this stops the client from trying to scale the item itself.
 }
 
-bool EQ::ItemInstance::EvolveOnAllKills() const {
-	return (m_evolveInfo && m_evolveInfo->AllKills);
-}
-
-int8 EQ::ItemInstance::GetMaxEvolveLvl() const {
-	if (m_evolveInfo)
-		return m_evolveInfo->MaxLvl;
-	else
-		return 0;
-}
-
-uint32 EQ::ItemInstance::GetKillsNeeded(uint8 currentlevel) {
-	uint32 kills = -1;	// default to -1 (max uint32 value) because this value is usually divided by, so we don't want to ever return zero.
-	if (m_evolveInfo)
-		if (currentlevel != m_evolveInfo->MaxLvl)
-			kills = m_evolveInfo->LvlKills[currentlevel - 1];
-
-	if (kills == 0)
-		kills = -1;
-
-	return kills;
-}
-
 void EQ::ItemInstance::SetTimer(std::string name, uint32 time) {
 	Timer t(time);
 	t.Start(time, false);
@@ -1951,28 +1930,54 @@ void EQ::ItemInstance::ClearGUIDMap()
 {
 	guids.clear();
 }
-//
-// class EvolveInfo
-//
-EvolveInfo::EvolveInfo() {
-	// nothing here yet
+
+bool EQ::ItemInstance::TransferOwnership(Database &db, const uint32 to_char_id) const
+{
+	if (!to_char_id || !IsEvolving()) {
+		return false;
+	}
+
+	SetEvolveCharID(to_char_id);
+	CharacterEvolvingItemsRepository::UpdateCharID(db, GetEvolveUniqueID(), to_char_id);
+	return true;
 }
 
-EvolveInfo::EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10) {
-	FirstItem = first;
-	MaxLvl = max;
-	AllKills = allkills;
-	LvlKills[0] = L2;
-	LvlKills[1] = L3;
-	LvlKills[2] = L4;
-	LvlKills[3] = L5;
-	LvlKills[4] = L6;
-	LvlKills[5] = L7;
-	LvlKills[6] = L8;
-	LvlKills[7] = L9;
-	LvlKills[8] = L10;
+uint32 EQ::ItemInstance::GetAugmentEvolveUniqueID(uint8 augment_index) const
+{
+	if (!m_item || !m_item->IsClassCommon()) {
+		return 0;
+	}
+
+	const auto item = GetItem(augment_index);
+	if (item) {
+		return item->GetEvolveUniqueID();
+	}
+
+	return 0;
 }
 
-EvolveInfo::~EvolveInfo() {
-
+void EQ::ItemInstance::SetTimer(std::string name, uint32 time) const{
+	Timer t(time);
+	t.Start(time, false);
+	m_timers[name] = t;
+}
+
+void EQ::ItemInstance::SetEvolveEquipped(const bool in) const
+{
+	if (!IsEvolving()) {
+		return;
+	}
+
+	m_evolving_details.equipped = in;
+	if (in && !GetTimers().contains("evolve")) {
+		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
+		return;
+	}
+
+	if (in) {
+		GetTimers().at("evolve").SetTimer(RuleI(EvolvingItems, DelayUponEquipping));
+		return;
+	}
+
+	GetTimers().at("evolve").Disable();
 }

common/item_instance.h

@@ -23,6 +23,7 @@
 
 #ifndef COMMON_ITEM_INSTANCE_H
 #define COMMON_ITEM_INSTANCE_H
+#include "evolving_items.h"
 
 
 class ItemParse;			// Parses item packets
@@ -34,6 +35,7 @@ class EvolveInfo;			// Stores information about an evolving item family
 #include "../common/bodytypes.h"
 #include "../common/deity.h"
 #include "../common/memory_buffer.h"
+#include "../common/repositories/character_evolving_items_repository.h"
 
 #include <map>
 
@@ -205,13 +207,9 @@ namespace EQ
 		bool IsDroppable(bool recurse = true) const;
 
 		bool IsScaling() const				{ return m_scaling; }
-		bool IsEvolving() const				{ return (m_evolveLvl >= 1); }
 		uint32 GetExp() const				{ return m_exp; }
 		void SetExp(uint32 exp)				{ m_exp = exp; }
 		void AddExp(uint32 exp)				{ m_exp += exp; }
-		bool IsActivated()					{ return m_activated; }
-		void SetActivated(bool activated)	{ m_activated = activated; }
-		int8 GetEvolveLvl() const			{ return m_evolveLvl; }
 		void SetScaling(bool v)				{ m_scaling = v; }
 		uint32 GetOrnamentationIcon() const							{ return m_ornamenticon; }
 		void SetOrnamentIcon(uint32 ornament_icon)					{ m_ornamenticon = ornament_icon; }
@@ -226,9 +224,6 @@ namespace EQ
 
 		void Initialize(SharedDatabase *db = nullptr);
 		void ScaleItem();
-		bool EvolveOnAllKills() const;
-		int8 GetMaxEvolveLvl() const;
-		uint32 GetKillsNeeded(uint8 currentlevel);
 
 		std::string Serialize(int16 slot_id) const { InternalSerializedItem_Struct s; s.slot_id = slot_id; s.inst = (const void*)this; std::string ser; ser.assign((char*)&s, sizeof(InternalSerializedItem_Struct)); return ser; }
 		void Serialize(OutBuffer& ob, int16 slot_id) const { InternalSerializedItem_Struct isi; isi.slot_id = slot_id; isi.inst = (const void*)this; ob.write((const char*)&isi, sizeof(isi)); }
@@ -236,8 +231,9 @@ namespace EQ
 		inline int32 GetSerialNumber() const { return m_SerialNumber; }
 		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
 
-		std::map<std::string, ::Timer>& GetTimers() { return m_timers; }
+		std::map<std::string, ::Timer>& GetTimers() const { return m_timers; }
 		void SetTimer(std::string name, uint32 time);
+		void SetTimer(std::string name, uint32 time) const;
 		void StopTimer(std::string name);
 		void ClearTimers();
 
@@ -312,6 +308,34 @@ namespace EQ
 		static void AddGUIDToMap(uint64 existing_serial_number);
 		static void ClearGUIDMap();
 
+		// evolving items stuff
+		CharacterEvolvingItemsRepository::CharacterEvolvingItems &GetEvolvingDetails() const { return m_evolving_details; }
+
+		int8             GetEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingLevel; } return false; }
+		bool             IsEvolving() const { if (GetItem()) { return GetItem()->EvolvingItem; } return false; }
+		int8             GetMaxEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingMax; } return false; }
+		bool             GetEvolveActivated() const { return m_evolving_details.activated ? true : false; }
+		bool             GetEvolveEquipped() const { return m_evolving_details.equipped ? true : false; }
+		double           GetEvolveProgression() const { return m_evolving_details.progression; }
+		uint64           GetEvolveUniqueID() const { return m_evolving_details.id; }
+		uint32           GetEvolveCharID() const { return m_evolving_details.character_id; }
+		uint32           GetEvolveItemID() const { return m_evolving_details.item_id; }
+		uint32           GetEvolveLoreID() const { if (GetItem()) { return GetItem()->EvolvingID; } return false; }
+		uint64           GetEvolveCurrentAmount() const { return m_evolving_details.current_amount; }
+		uint32           GetEvolveFinalItemID() const { return m_evolving_details.final_item_id; }
+		uint32           GetAugmentEvolveUniqueID(uint8 augment_index) const;
+		void             SetEvolveEquipped(const bool in) const;
+		void             SetEvolveActivated(const bool in) const { m_evolving_details.activated = in; }
+		void             SetEvolveProgression(const double in) const { m_evolving_details.progression = in; }
+		void             SetEvolveUniqueID(const uint64 in) const { m_evolving_details.id = in; }
+		void             SetEvolveCharID(const uint32 in) const { m_evolving_details.character_id = in; }
+		void             SetEvolveItemID(const uint32 in) const { m_evolving_details.item_id = in; }
+		void             SetEvolveCurrentAmount(const uint64 in) const { m_evolving_details.current_amount = in; }
+		void             SetEvolveAddToCurrentAmount(const uint64 in) const { m_evolving_details.current_amount += in; }
+		void             SetEvolveFinalItemID(const uint32 in) const { m_evolving_details.final_item_id = in; }
+		bool             TransferOwnership(Database& db, const uint32 to_char_id) const;
+		void             CalculateEvolveProgression() const { m_evolving_details.progression = evolving_items_manager.CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
+
 	protected:
 		//////////////////////////
 		// Protected Members
@@ -323,48 +347,32 @@ namespace EQ
 
 		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }
 
-		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
-		const ItemData*		m_item {nullptr};		// Ptr to item data
-		int16				m_charges {0};	// # of charges for chargeable items
-		uint32				m_price {0};	// Bazaar /trader price
-		uint32				m_color {0};
-		uint32				m_merchantslot {0};
-		int16				m_currentslot {0};
-		bool				m_attuned {false};
-		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
-		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32				m_exp {0};
-		int8				m_evolveLvl {0};
-		bool				m_activated {false};
-		ItemData*			m_scaledItem {nullptr};
-		::EvolveInfo*		m_evolveInfo {nullptr};
-		bool				m_scaling {false};
-		uint32				m_ornamenticon {0};
-		uint32				m_ornamentidfile {0};
-		uint32				m_new_id_file {0};
-		uint32				m_ornament_hero_model {0};
-		uint32				m_recast_timestamp {0};
-		int                 m_task_delivered_count {0};
+		ItemInstTypes    m_use_type{ItemInstNormal};// Usage type for item
+		const ItemData * m_item{nullptr};           // Ptr to item data
+		int16            m_charges{0};              // # of charges for chargeable items
+		uint32           m_price{0};                // Bazaar /trader price
+		uint32           m_color{0};
+		uint32           m_merchantslot{0};
+		int16            m_currentslot{0};
+		bool             m_attuned{false};
+		int32            m_merchantcount{1};//number avaliable on the merchant, -1=unlimited
+		int32            m_SerialNumber{0}; // Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32           m_exp{0};
+		int8             m_evolveLvl{0};
+		ItemData *       m_scaledItem{nullptr};
+		bool             m_scaling{false};
+		uint32           m_ornamenticon{0};
+		uint32           m_ornamentidfile{0};
+		uint32           m_new_id_file{0};
+		uint32           m_ornament_hero_model{0};
+		uint32           m_recast_timestamp{0};
+		int              m_task_delivered_count{0};
+		mutable CharacterEvolvingItemsRepository::CharacterEvolvingItems  m_evolving_details{};
 
 		// Items inside of this item (augs or contents) {};
-		std::map<uint8, ItemInstance*>		m_contents {}; // Zero-based index: min=0, max=9
-		std::map<std::string, std::string>	m_custom_data {};
-		std::map<std::string, ::Timer>		m_timers {};
+		std::map<uint8, ItemInstance*>         m_contents {}; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>     m_custom_data {};
+		mutable std::map<std::string, ::Timer> m_timers {};
 	};
 }
-
-class EvolveInfo {
-public:
-	friend class EQ::ItemInstance;
-	//temporary
-	uint16				LvlKills[9];
-	uint32				FirstItem;
-	uint8				MaxLvl;
-	bool				AllKills;
-
-	EvolveInfo();
-	EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10);
-	~EvolveInfo();
-};
-
 #endif /*COMMON_ITEM_INSTANCE_H*/

common/memory/ksm.hpp

@@ -0,0 +1,220 @@
+#ifndef EQEMU_KSM_HPP
+#define EQEMU_KSM_HPP
+
+#include "../eqemu_logsys.h"
+#include <iostream>
+#include <vector>
+#include <cstring>
+#ifdef _WIN32
+#include <malloc.h>  // For _aligned_malloc, _aligned_free
+#include <windows.h>
+#else
+#include <sys/mman.h>  // For madvise
+#include <unistd.h>    // For sysconf, sbrk
+#endif
+
+
+// Page-aligned allocator for std::vector
+template <typename T>
+class PageAlignedAllocator {
+public:
+	using value_type = T;
+
+	PageAlignedAllocator() noexcept = default;
+	template <typename U>
+	PageAlignedAllocator(const PageAlignedAllocator<U>&) noexcept {}
+
+	T* allocate(std::size_t n) {
+		void* ptr = nullptr;
+		size_t size = n * sizeof(T);
+
+#ifdef _WIN32
+		// Simply allocate memory without alignment
+        ptr = malloc(size);
+        if (!ptr) throw std::bad_alloc();
+#else
+		size_t alignment = getPageSize(); // Get the system's page size
+		if (posix_memalign(&ptr, alignment, size) != 0) {
+			throw std::bad_alloc();
+		}
+#endif
+		return static_cast<T*>(ptr);
+	}
+
+	void deallocate(T* p, std::size_t) noexcept {
+		free(p);
+	}
+
+private:
+	size_t getPageSize() const
+	{
+#ifdef _WIN32
+		SYSTEM_INFO sysInfo;
+		GetSystemInfo(&sysInfo);
+		return sysInfo.dwPageSize; // Page size in bytes
+#else
+		return static_cast<size_t>(sysconf(_SC_PAGESIZE));
+#endif
+	};
+};
+
+template <typename T, typename U>
+bool operator==(const PageAlignedAllocator<T>&, const PageAlignedAllocator<U>&) noexcept {
+	return true;
+}
+
+template <typename T, typename U>
+bool operator!=(const PageAlignedAllocator<T>&, const PageAlignedAllocator<U>&) noexcept {
+	return false;
+}
+
+// Kernel Samepage Merging (KSM) functionality
+namespace KSM {
+
+#ifdef _WIN32
+	// Windows-specific placeholder functions (no-op)
+    inline void CheckPageAlignment(void* ptr) {
+    }
+
+    inline void* AllocatePageAligned(size_t size) {
+        return memset(malloc(size), 0, size);
+    }
+
+    inline void MarkMemoryForKSM(void* start, size_t size) {
+    }
+
+    inline void AlignHeapToPageBoundary() {
+    }
+
+    inline void* MarkHeapStart() {
+        return nullptr;
+    }
+
+    inline size_t MeasureHeapUsage(void* start) {
+        return 0;
+    }
+#else
+	// Linux-specific functionality
+	inline void CheckPageAlignment(void* ptr) {
+		size_t page_size = sysconf(_SC_PAGESIZE);
+		if (reinterpret_cast<uintptr_t>(ptr) % page_size == 0) {
+			LogKSMDetail("Memory is page-aligned [{}]", ptr);
+		} else {
+			LogKSMDetail("Memory is NOT page-aligned [{}]", ptr);
+		}
+	}
+
+	inline void* AllocatePageAligned(size_t size) {
+		size_t page_size = sysconf(_SC_PAGESIZE);
+		void* aligned_ptr = nullptr;
+		if (posix_memalign(&aligned_ptr, page_size, size) != 0) {
+			LogKSM("Failed to allocate page-aligned memory on Linux. page_size [{}] size [{}] bytes", page_size, size);
+		}
+		std::memset(aligned_ptr, 0, size);
+		return aligned_ptr;
+	}
+
+	inline void MarkMemoryForKSM(void* start, size_t size) {
+		if (madvise(start, size, MADV_MERGEABLE) == 0) {
+			LogKSM("Marked memory for KSM | start [{}] size [{}] bytes", start, size);
+		} else {
+			perror("madvise failed");
+		}
+	}
+
+	inline void AlignHeapToPageBoundary() {
+		size_t page_size = sysconf(_SC_PAGESIZE);
+		if (page_size == 0) {
+			LogKSM("Failed to retrieve page size SC_PAGESIZE [{}]", page_size);
+			return;
+		}
+
+		void* current_break = sbrk(0);
+		if (current_break == (void*)-1) {
+			LogKSM("Failed to retrieve the current program break");
+			return;
+		}
+
+		uintptr_t current_address = reinterpret_cast<uintptr_t>(current_break);
+		size_t misalignment = current_address % page_size;
+
+		if (misalignment != 0) {
+			size_t adjustment = page_size - misalignment;
+			if (sbrk(adjustment) == (void*)-1) {
+				LogKSM("Failed to align heap to page boundary. adjustment [{}] bytes", adjustment);
+				return;
+			}
+		}
+
+		LogKSMDetail("Heap aligned to next page boundary. Current break [{}]", sbrk(0));
+	}
+
+	inline void* MarkHeapStart() {
+		void* current_pos = sbrk(0);
+		AlignHeapToPageBoundary();
+		return current_pos;
+	}
+
+	inline size_t MeasureHeapUsage(void* start) {
+		void* current_break = sbrk(0);
+		return static_cast<char*>(current_break) - static_cast<char*>(start);
+	}
+#endif
+
+
+	inline size_t getPageSize()
+	{
+#ifdef _WIN32
+		SYSTEM_INFO sysInfo;
+		GetSystemInfo(&sysInfo);
+		return sysInfo.dwPageSize; // Page size in bytes
+#else
+		return static_cast<size_t>(sysconf(_SC_PAGESIZE)); // POSIX page size
+#endif
+	};
+
+	template <typename T>
+	inline void PageAlignVectorAligned(std::vector<T, PageAlignedAllocator<T>>& vec) {
+		if (vec.empty()) {
+			return;
+		}
+
+		size_t page_size = getPageSize();
+		void* start = vec.data();
+		size_t size = vec.size() * sizeof(T);
+
+		// Check if the memory is page-aligned
+		if (reinterpret_cast<std::uintptr_t>(start) % page_size != 0) {
+			// Allocate a new aligned vector
+			std::vector<T, PageAlignedAllocator<T>> aligned_vec(vec.get_allocator());
+			aligned_vec.reserve(vec.capacity()); // Match capacity to avoid reallocation during copy
+
+			// Copy elements from the original vector
+			aligned_vec.insert(aligned_vec.end(), vec.begin(), vec.end());
+
+			// Swap the aligned vector with the original vector
+			vec.swap(aligned_vec);
+
+			// Clear the temporary aligned vector to free its memory
+			aligned_vec.clear();
+
+			// Verify the new alignment
+			start = vec.data();
+			if (reinterpret_cast<std::uintptr_t>(start) % page_size != 0) {
+				throw std::runtime_error("Failed to align vector memory to page boundaries.");
+			}
+
+			LogKSMDetail("Vector reallocated to ensure page alignment. start [{}] size [{}] bytes", start, size);
+		} else {
+			LogKSMDetail("Vector is already page-aligned. start [{}] size [{}] bytes", start, size);
+		}
+
+#ifndef _WIN32
+		// Mark memory for KSM (only on non-Windows systems)
+		MarkMemoryForKSM(start, size);
+#endif
+	}
+
+}
+
+#endif // EQEMU_KSM_HPP

common/net/daybreak_connection.cpp

@@ -152,6 +152,9 @@ void EQ::Net::DaybreakConnectionManager::Process()
 						connection->SendKeepAlive();
 					}
 				}
+
+				connection->Process();
+				break;
 			}
 			case StatusDisconnecting:
 				connection->Process();
@@ -435,7 +438,7 @@ void EQ::Net::DaybreakConnection::ProcessPacket(Packet &p)
 			return;
 		}
 
-		if (m_encode_passes[0] == EncodeCompression || m_encode_passes[1] == EncodeCompression)
+		if (m_encode_passes[0] & EncodeCompression || m_encode_passes[1] & EncodeCompression)
 		{
 			EQ::Net::DynamicPacket temp;
 			temp.PutPacket(0, p);
@@ -492,8 +495,10 @@ void EQ::Net::DaybreakConnection::ProcessPacket(Packet &p)
 void EQ::Net::DaybreakConnection::ProcessQueue()
 {
 	for (int i = 0; i < 4; ++i) {
-		auto stream = &m_streams[i];
+		auto &stream = m_streams[i];
 		for (;;) {
+			if (stream == nullptr)
+				break;
 
 			auto iter = stream->packet_queue.find(stream->sequence_in);
 			if (iter == stream->packet_queue.end()) {
@@ -510,7 +515,11 @@ void EQ::Net::DaybreakConnection::ProcessQueue()
 
 void EQ::Net::DaybreakConnection::RemoveFromQueue(int stream, uint16_t seq)
 {
-	auto s = &m_streams[stream];
+	auto &s = m_streams[stream];
+	if (s == nullptr) {
+		return;
+	}
+
 	auto iter = s->packet_queue.find(seq);
 	if (iter != s->packet_queue.end()) {
 		auto packet = iter->second;
@@ -521,7 +530,11 @@ void EQ::Net::DaybreakConnection::RemoveFromQueue(int stream, uint16_t seq)
 
 void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Packet &p)
 {
-	auto s = &m_streams[stream];
+	auto &s = m_streams[stream];
+	if (s == nullptr) {
+		return;
+	}
+
 	auto iter = s->packet_queue.find(seq);
 	if (iter == s->packet_queue.end()) {
 		DynamicPacket *out = new DynamicPacket();
@@ -676,7 +689,10 @@ void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p)
 				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_Packet;
-				auto stream = &m_streams[stream_id];
+				auto &stream = m_streams[stream_id];
+				if (stream == nullptr) {
+					stream.reset(new DaybreakReliableStream());
+				}
 
 				auto order = CompareSequence(stream->sequence_in, sequence);
 				if (order == SequenceFuture) {
@@ -705,7 +721,10 @@ void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p)
 				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_Fragment;
-				auto stream = &m_streams[stream_id];
+				auto &stream = m_streams[stream_id];
+				if (stream == nullptr) {
+					stream.reset(new DaybreakReliableStream());
+				}
 
 				auto order = CompareSequence(stream->sequence_in, sequence);
 
@@ -1099,7 +1118,11 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 
 	auto resends = 0;
 	auto now = Clock::now();
-	auto s = &m_streams[stream];
+	auto &s = m_streams[stream];
+	if (s == nullptr) {
+		return;
+	}
+
 	for (auto &entry : s->sent_packets) {
 		auto time_since_last_send = std::chrono::duration_cast<std::chrono::milliseconds>(now - entry.second.last_sent);
 		if (entry.second.times_resent == 0) {
@@ -1161,7 +1184,11 @@ void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
 {
 
 	auto now = Clock::now();
-	auto s = &m_streams[stream];
+	auto &s = m_streams[stream];
+	if (s == nullptr) {
+		return;
+	}
+
 	auto iter = s->sent_packets.begin();
 	while (iter != s->sent_packets.end()) {
 		auto order = CompareSequence(seq, iter->first);
@@ -1185,7 +1212,11 @@ void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
 void EQ::Net::DaybreakConnection::OutOfOrderAck(int stream, uint16_t seq)
 {
 	auto now = Clock::now();
-	auto s = &m_streams[stream];
+	auto &s = m_streams[stream];
+	if (s == nullptr) {
+		return;
+	}
+
 	auto iter = s->sent_packets.find(seq);
 	if (iter != s->sent_packets.end()) {
 		uint64_t round_time = (uint64_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - iter->second.last_sent).count();
@@ -1401,7 +1432,11 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 		return;
 	}
 
-	auto stream = &m_streams[stream_id];
+	auto &stream = m_streams[stream_id];
+	if (stream == nullptr) {
+		stream.reset(new DaybreakReliableStream());
+	}
+
 	auto max_raw_size = m_max_packet_size - m_crc_bytes - DaybreakReliableHeader::size() - 1; // -1 for compress flag
 	size_t length = p.Length();
 	if (length > max_raw_size) {

common/net/daybreak_connection.h

@@ -133,6 +133,38 @@ namespace EQ
 			uint64_t bytes_before_encode;
 		};
 
+		//Refactoring this stuff
+		struct DaybreakSentPacket
+		{
+			DynamicPacket packet;
+			Timestamp last_sent;
+			Timestamp first_sent;
+			size_t times_resent;
+			size_t resend_delay;
+		};
+
+		class DaybreakReliableStream
+		{
+		public:
+			DaybreakReliableStream() {
+				sequence_in = 0;
+				sequence_out = 0;
+				fragment_current_bytes = 0;
+				fragment_total_bytes = 0;
+			}
+			//private:
+
+			uint16_t sequence_in;
+			uint16_t sequence_out;
+			std::map<uint16_t, Packet*> packet_queue;
+
+			DynamicPacket fragment_packet;
+			uint32_t fragment_current_bytes;
+			uint32_t fragment_total_bytes;
+
+			std::map<uint16_t, DaybreakSentPacket> sent_packets;
+		};
+
 		class DaybreakConnectionManager;
 		class DaybreakConnection;
 		class DaybreakConnection
@@ -181,36 +213,7 @@ namespace EQ
 			Timestamp m_close_time;
 			double m_outgoing_budget;
 
-			struct DaybreakSentPacket
-			{
-				DynamicPacket packet;
-				Timestamp last_sent;
-				Timestamp first_sent;
-				size_t times_resent;
-				size_t resend_delay;
-			};
-
-			struct DaybreakStream
-			{
-				DaybreakStream() {
-					sequence_in = 0;
-					sequence_out = 0;
-					fragment_current_bytes = 0;
-					fragment_total_bytes = 0;
-				}
-
-				uint16_t sequence_in;
-				uint16_t sequence_out;
-				std::map<uint16_t, Packet*> packet_queue;
-
-				DynamicPacket fragment_packet;
-				uint32_t fragment_current_bytes;
-				uint32_t fragment_total_bytes;
-
-				std::map<uint16_t, DaybreakSentPacket> sent_packets;
-			};
-
-			DaybreakStream m_streams[4];
+			std::unique_ptr<DaybreakReliableStream> m_streams[4];
 			std::weak_ptr<DaybreakConnection> m_self;
 
 			void Process();
@@ -272,6 +275,14 @@ namespace EQ
 				resend_timeout = 30000;
 				connection_close_time = 2000;
 				outgoing_data_rate = 0.0;
+				//this is emperically based on what the client seems to set for theirs
+				//this is the max number of packets that can be sent/recv per channel before acks come in
+				//we'll use this to preallocate some buffers
+				max_outgoing_packets_per_channel = 400;
+				max_incoming_packets_per_channel = 400;
+
+				//This is the max size of a packet that can be sent or received
+				max_total_packet_size = 1024 * 1024 * 16;
 			}
 
 			size_t max_packet_size;
@@ -295,6 +306,9 @@ namespace EQ
 			DaybreakEncodeType encode_passes[2];
 			int port;
 			double outgoing_data_rate;
+			int max_outgoing_packets_per_channel;
+			int max_incoming_packets_per_channel;
+			int max_total_packet_size;
 		};
 
 		class DaybreakConnectionManager

common/net/tcp_connection.cpp

@@ -80,6 +80,8 @@ void EQ::Net::TCPConnection::Start() {
 			}
 		}
 		else if (nread == UV_EOF) {
+			connection->Disconnect();
+
 			if (buf->base) {
 				delete[] buf->base;
 			}

common/opcode_dispatch.h

@@ -250,6 +250,7 @@ IN(OP_TraderBuy, TraderBuy_Struct);
 IN(OP_Trader, Trader_ShowItems_Struct);
 IN(OP_GMFind, GMSummon_Struct);
 IN(OP_PickPocket, PickPocket_Struct);
+IN(OP_PickZone, PickZone_Struct);
 IN(OP_Bind_Wound, BindWound_Struct);
 INr(OP_TrackTarget);
 INr(OP_Track);

common/patches/rof.cpp

@@ -5188,7 +5188,14 @@ namespace RoF
 
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
 
-		snprintf(hdr.unknown000, sizeof(hdr.unknown000), "%016d", item->ID);
+		strn0cpy(
+			hdr.unknown000,
+			fmt::format(
+				"{:016}\0",
+				packet_type == ItemPacketInvalid ? 0 : inst->GetSerialNumber()
+			).c_str(),
+			sizeof(hdr.unknown000)
+		);
 
 		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 1000) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
 		hdr.unknown004 = 0;

common/patches/rof2.cpp

@@ -433,7 +433,9 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint32, eq, i.item_icon);
 					VARSTRUCT_SKIP_TYPE(uint32, eq);
 				}
+
 				dest->QueuePacket(outapp.get());
+				safe_delete(in);
 				break;
 			}
 			default: {
@@ -468,8 +470,8 @@ namespace RoF2
 				}
 
 				auto p_size = 41 * results.size() + name_size + 14;
-				auto buffer = std::make_unique<char[]>(p_size);
-				auto bufptr = buffer.get();
+				auto buffer = new char[p_size];
+				auto bufptr = buffer;
 
 				VARSTRUCT_ENCODE_TYPE(uint32, bufptr, 0);
 				VARSTRUCT_ENCODE_TYPE(uint16, bufptr, results[0].trader_zone_id);
@@ -487,10 +489,11 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, i.item_stat);                          //itemstat
 				}
 
-				safe_delete(in->pBuffer);
+				safe_delete_array(in->pBuffer);
 				in->size    = p_size;
-				in->pBuffer = (uchar *) buffer.get();
+				in->pBuffer = (uchar*)buffer;
 				dest->QueuePacket(in);
+				safe_delete(in);
 
 				break;
 			}
@@ -500,21 +503,22 @@ namespace RoF2
 				break;
 			}
 			case WelcomeMessage: {
-				auto buffer = std::make_unique<char[]>(sizeof(structs::BazaarWelcome_Struct));
+				auto buffer = new char[sizeof(structs::BazaarWelcome_Struct)];
 				auto emu    = (BazaarWelcome_Struct *) in->pBuffer;
-				auto eq     = (structs::BazaarWelcome_Struct *) buffer.get();
+				auto eq     = (structs::BazaarWelcome_Struct *) buffer;
 
 				eq->action         = structs::RoF2BazaarTraderBuyerActions::WelcomeMessage;
 				eq->num_of_traders = emu->traders;
 				eq->num_of_items   = emu->items;
 
-				safe_delete(in->pBuffer);
+				safe_delete_array(in->pBuffer);
 				in->SetOpcode(OP_TraderShop);
 				in->size    = sizeof(structs::BazaarWelcome_Struct);
-				in->pBuffer = (uchar *) buffer.get();
+				in->pBuffer = (uchar *)buffer;
 
 				LogTrading("(RoF2) WelcomeMessage action <green>[{}]", action);
 				dest->QueuePacket(in);
+				safe_delete(in);
 
 				break;
 			}
@@ -892,7 +896,9 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint16, eq, b.buyer_zone_instance_id);
 					VARSTRUCT_ENCODE_STRING(eq, b.buyer_name.c_str());
 				}
+
 				dest->QueuePacket(outapp.get());
+				safe_delete(inapp);
 				break;
 			}
 			case Barter_RemoveFromMerchantWindow: {
@@ -963,6 +969,7 @@ namespace RoF2
 				VARSTRUCT_ENCODE_TYPE(uint32, eq, blsi.seller_quantity);
 
 				dest->QueuePacket(outapp.get());
+				safe_delete(inapp);
 				break;
 			}
 			default: {
@@ -1343,6 +1350,58 @@ namespace RoF2
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
+	ENCODE(OP_EvolveItem)
+	{
+		EQApplicationPacket *in = *p;
+		*p                      = nullptr;
+
+		auto action = *reinterpret_cast<uint32 *>(in->pBuffer);
+
+		switch (action) {
+			case EvolvingItems::Actions::TRANSFER_WINDOW_DETAILS: {
+				auto emu = reinterpret_cast<EvolveItemMessaging *>(in->pBuffer);
+
+				EvolveXPWindowSend           e{};
+				EQ::Util::MemoryStreamReader ss(emu->serialized_data, in->size - sizeof(emu->action));
+				cereal::BinaryInputArchive ar(ss);
+				ar(e);
+
+				auto item_1 = static_cast<const EQ::ItemInstance *>(reinterpret_cast<EQ::InternalSerializedItem_Struct
+					*>(e.serialize_item_1.data())->inst);
+				auto item_2 = static_cast<const EQ::ItemInstance *>(reinterpret_cast<EQ::InternalSerializedItem_Struct
+					*>(e.serialize_item_2.data())->inst);
+
+				EQ::OutBuffer ob;
+
+				SerializeItem(ob, item_1, 0, 0, ItemPacketMerchant);
+				SerializeItem(ob, item_2, 0, 0, ItemPacketMerchant);
+
+				auto out = std::make_unique<EQApplicationPacket>(
+					OP_EvolveItem,
+					sizeof(EvolveXPWindowSendDetails_Struct) + ob.size()
+				);
+				auto data = reinterpret_cast<EvolveXPWindowSendDetails_Struct *>(out->pBuffer);
+
+				data->action             = e.action;
+				data->compatibility      = e.compatibility;
+				data->max_transfer_level = e.max_transfer_level;
+				data->item1_unique_id    = e.item1_unique_id;
+				data->item2_unique_id    = e.item2_unique_id;
+				data->item1_present      = e.item1_present;
+				data->item2_present      = e.item2_present;
+
+				memcpy(data->serialize_data, ob.str().data(), ob.size());
+				dest->QueuePacket(out.get());
+				safe_delete(in);
+				break;
+			}
+			default: {
+				dest->FastQueuePacket(&in);
+				break;
+			}
+		}
+	}
+
 	ENCODE(OP_ExpansionInfo)
 	{
 		ENCODE_LENGTH_EXACT(ExpansionInfo_Struct);
@@ -1845,11 +1904,11 @@ namespace RoF2
 			}
 		}
 
-		auto outapp     = new EQApplicationPacket(OP_GuildsList);
-		outapp->size    = packet_size;
-		outapp->pBuffer = buffer;
+		safe_delete_array(in->pBuffer);
 
-		dest->FastQueuePacket(&outapp);
+		in->pBuffer = buffer;
+		in->size    = packet_size;
+		dest->FastQueuePacket(&in);
 	}
 
 	ENCODE(OP_GuildTributeDonateItem)
@@ -2046,6 +2105,33 @@ namespace RoF2
         }
     }
 
+	ENCODE(OP_ItemPreviewRequest)
+	{
+		EQApplicationPacket* in = *p;
+		*p = nullptr;
+
+		uchar* in_buf = in->pBuffer;
+
+		auto int_item = (EQ::InternalSerializedItem_Struct*) in_buf;
+
+		EQ::OutBuffer           buf;
+		EQ::OutBuffer::pos_type last_pos = buf.tellp();
+
+		SerializeItem(buf, (const EQ::ItemInstance*) int_item->inst, int_item->slot_id, 0, ItemPacketInvalid);
+		if (buf.tellp() == last_pos) {
+			LogNetcode("RoF2::ENCODE(OP_ItemPreviewRequest) Serialization failed");
+			safe_delete_array(in_buf);
+			safe_delete(in);
+			return;
+		}
+
+		in->size    = buf.size();
+		in->pBuffer = buf.detach();
+
+		safe_delete_array(in_buf);
+		dest->FastQueuePacket(&in, ack_req);
+	}
+
 	ENCODE(OP_ItemVerifyReply)
 	{
 		ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct);
@@ -6398,6 +6484,11 @@ namespace RoF2
 		hdr.scaled_value   = (inst->IsScaling() ? (inst->GetExp() / 100) : 0);
 		hdr.instance_id    = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : inst->GetSerialNumber());
 		hdr.parcel_item_id = packet_type == ItemPacketParcel ? inst->GetID() : 0;
+		if (item->EvolvingItem) {
+			hdr.instance_id    = inst->GetEvolveUniqueID() & 0xFFFFFFFF; //lower dword
+			hdr.parcel_item_id = inst->GetEvolveUniqueID() >> 32;        //upper dword
+		}
+
 		hdr.last_cast_time = inst->GetRecastTimestamp();
 		hdr.charges        = (inst->IsStackable() ? (item->MaxCharges ? 1 : 0) : ((inst->GetCharges() > 254)
 			? 0xFFFFFFFF
@@ -6411,18 +6502,15 @@ namespace RoF2
 		ob.write((const char*)&hdr, sizeof(RoF2::structs::ItemSerializationHeader));
 
 		if (item->EvolvingItem > 0) {
-			RoF2::structs::EvolvingItem evotop;
+			RoF2::structs::EvolvingItem_Struct evotop;
 
-			evotop.unknown001 = 0;
-			evotop.unknown002 = 0;
-			evotop.unknown003 = 0;
-			evotop.unknown004 = 0;
-			evotop.evoLevel = item->EvolvingLevel;
-			evotop.progress = 0;
-			evotop.Activated = 1;
-			evotop.evomaxlevel = item->EvolvingMax;
+			evotop.final_item_id    = inst->GetEvolveFinalItemID();
+			evotop.evolve_level     = item->EvolvingLevel;
+			evotop.progress         = inst->GetEvolveProgression();
+			evotop.activated        = inst->GetEvolveActivated();
+			evotop.evolve_max_level = item->EvolvingMax;
 
-			ob.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
+			ob.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem_Struct));
 		}
 
 		/**
@@ -6796,12 +6884,13 @@ namespace RoF2
 		iqbs.Heirloom = 0;
 		iqbs.Placeable = 0;
 		iqbs.unknown28 = -1;
+		iqbs.unknown29 = packet_type == ItemPacketInvalid ? 0xFF : 0;
 		iqbs.unknown30 = -1;
 		iqbs.NoZone = 0;
 		iqbs.NoGround = 0;
 		iqbs.unknown37a = 0;	// (guessed position) New to RoF2
 		iqbs.unknown38 = 0;
-		iqbs.unknown39 = 1;
+		iqbs.unknown39 = packet_type == ItemPacketInvalid ? 0 : 1;;
 
 		ob.write((const char*)&iqbs, sizeof(RoF2::structs::ItemQuaternaryBodyStruct));
 

common/patches/rof2_limits.h

@@ -272,6 +272,7 @@ namespace RoF2
 
 		const size_t SAY_LINK_BODY_SIZE = 56;
 		const uint32 MAX_GUILD_ID       = 50000;
+		const uint32 MAX_BAZAAR_TRADERS = 600;
 
 	} /*constants*/
 

common/patches/rof2_ops.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -70,6 +70,7 @@ E(OP_DzMemberListName)
 E(OP_DzMemberListStatus)
 E(OP_DzSetLeaderName)
 E(OP_Emote)
+E(OP_EvolveItem)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
 E(OP_GMLastName)
@@ -91,6 +92,7 @@ E(OP_InspectBuffs)
 E(OP_InspectRequest)
 E(OP_ItemLinkResponse)
 E(OP_ItemPacket)
+E(OP_ItemPreviewRequest)
 E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)

common/patches/rof2_structs.h

@@ -4746,16 +4746,13 @@ struct ItemSerializationHeader
     uint8          isEvolving;
 };
 
-struct EvolvingItem {
-	uint8 unknown001;
-	uint8 unknown002;
-	uint8 unknown003;
-	uint8 unknown004;
-	int32 evoLevel;
+struct EvolvingItem_Struct {
+	uint32 final_item_id;
+	int32  evolve_level;
 	double progress;
-	uint8 Activated;
-	int32 evomaxlevel;
-	uint8 unknown005[4];
+	uint8  activated;
+	int32  evolve_max_level;
+	uint8  unknown005[4];
 };
 
 struct ItemSerializationHeaderFinish
@@ -5428,6 +5425,32 @@ struct Parcel_Struct
 };
 	}; /*structs*/
 
+struct EvolveItemToggle_Struct {
+	uint32 action;
+	uint32 unknown_004;
+	uint64 unique_id;
+	uint32 percentage;
+	uint32 activated;
+};
+
+struct EvolveXPWindowReceive_Struct {
+	uint32 action;
+	uint32 unknown_004;
+	uint64 item1_unique_id;
+	uint64 item2_unique_id;
+};
+
+struct EvolveXPWindowSendDetails_Struct {
+	/*000*/	uint32 action;
+	/*004*/	uint64 item1_unique_id;
+	/*012*/	uint64 item2_unique_id;
+	/*020*/	uint32 compatibility;
+	/*024*/	uint32 max_transfer_level;
+	/*028*/	uint8  item1_present;
+	/*029*/ uint8  item2_present;
+	/*030*/ char   serialize_data[];
+};
+
 }; /*RoF2*/
 
 #endif /*COMMON_ROF2_STRUCTS_H*/

common/patches/titanium_limits.h

@@ -286,8 +286,8 @@ namespace Titanium
 
 		const size_t CHARACTER_CREATION_LIMIT = 8; // Hard-coded in client - DO NOT ALTER
 
-		const size_t SAY_LINK_BODY_SIZE = 45;
-		const uint32 MAX_GUILD_ID       = 1500;
+		const size_t SAY_LINK_BODY_SIZE       = 45;
+		const uint32 MAX_GUILD_ID             = 1500;
 
 	} /*constants*/
 

common/path_manager.cpp

@@ -5,31 +5,19 @@
 #include "strings.h"
 
 #include <filesystem>
+
 namespace fs = std::filesystem;
 
-inline std::string striptrailingslash(const std::string &file_path)
-{
-	if (file_path.back() == '/' || file_path.back() == '\\') {
-		return file_path.substr(0, file_path.length() - 1);
-	}
-
-	return file_path;
-}
-
 void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();
 
-	if (!m_server_path.empty()) {
-		std::filesystem::current_path(m_server_path);
-	}
-
 	if (m_server_path.empty()) {
 		LogInfo("Failed to load server path");
 		return;
 	}
 
-	LogInfo("server [{}]", m_server_path);
+	std::filesystem::current_path(m_server_path);
 
 	if (!EQEmuConfig::LoadConfig()) {
 		LogError("Failed to load eqemu config");
@@ -38,66 +26,64 @@ void PathManager::LoadPaths()
 
 	const auto c = EQEmuConfig::get();
 
-	// maps
-	if (File::Exists(fs::path{m_server_path + "/" + c->MapDir}.string())) {
-		m_maps_path = fs::relative(fs::path{m_server_path + "/" + c->MapDir}).string();
-	}
-	else if (File::Exists(fs::path{m_server_path + "/maps"}.string())) {
-		m_maps_path = fs::relative(fs::path{m_server_path + "/maps"}).string();
-	}
-	else if (File::Exists(fs::path{m_server_path + "/Maps"}.string())) {
-		m_maps_path = fs::relative(fs::path{m_server_path + "/Maps"}).string();
-	}
+	auto resolve_path = [&](const std::string& dir, const std::vector<std::string>& fallback_dirs = {}) -> std::string {
+		// relative
+		if (File::Exists((fs::path{m_server_path} / dir).string())) {
+			return fs::relative(fs::path{m_server_path} / dir).lexically_normal().string();
+		}
 
-	// quests
-	if (File::Exists(fs::path{m_server_path + "/" + c->QuestDir}.string())) {
-		m_quests_path = fs::relative(fs::path{m_server_path + "/" + c->QuestDir}).string();
-	}
+		// absolute
+		if (File::Exists(fs::path{dir}.string())) {
+			return fs::absolute(fs::path{dir}).string();
+		}
 
-	// plugins
-	if (File::Exists(fs::path{m_server_path + "/" + c->PluginDir}.string())) {
-		m_plugins_path = fs::relative(fs::path{m_server_path + "/" + c->PluginDir}).string();
-	}
+		// fallback search options if specified
+		for (const auto& fallback : fallback_dirs) {
+			if (File::Exists((fs::path{m_server_path} / fallback).string())) {
+				return fs::relative(fs::path{m_server_path} / fallback).lexically_normal().string();
+			}
+		}
 
-	// lua_modules
-	if (File::Exists(fs::path{m_server_path + "/" + c->LuaModuleDir}.string())) {
-		m_lua_modules_path = fs::relative(fs::path{m_server_path + "/" + c->LuaModuleDir}).string();
-	}
+		// if all else fails, just set it to the config value
+		return dir;
+	};
 
-	// lua mods
-	if (File::Exists(fs::path{ m_server_path + "/mods" }.string())) {
-		m_lua_mods_path = fs::relative(fs::path{ m_server_path + "/mods" }).string();
-	}
+	m_maps_path          = resolve_path(c->MapDir, {"maps", "Maps"});
+	m_quests_path        = resolve_path(c->QuestDir);
+	m_plugins_path       = resolve_path(c->PluginDir);
+	m_lua_modules_path   = resolve_path(c->LuaModuleDir);
+	m_lua_mods_path      = resolve_path("mods");
+	m_patch_path         = resolve_path(c->PatchDir);
+	m_opcode_path        = resolve_path(c->OpcodeDir);
+	m_shared_memory_path = resolve_path(c->SharedMemDir);
+	m_log_path           = resolve_path(c->LogDir, {"logs"});
 
-	// patches
-	if (File::Exists(fs::path{m_server_path + "/" + c->PatchDir}.string())) {
-		m_patch_path = fs::relative(fs::path{m_server_path + "/" + c->PatchDir}).string();
-	}
+	// Log all paths in a loop
+	std::vector<std::pair<std::string, std::string>> paths = {
+		{"server", m_server_path},
+		{"logs", m_log_path},
+		{"lua mods", m_lua_mods_path},
+		{"lua_modules", m_lua_modules_path},
+		{"maps", m_maps_path},
+		{"patches", m_patch_path},
+		{"opcode", m_opcode_path},
+		{"plugins", m_plugins_path},
+		{"quests", m_quests_path},
+		{"shared_memory", m_shared_memory_path}
+	};
 
-	// patches
-	if (File::Exists(fs::path{ m_server_path + "/" + c->OpcodeDir }.string())) {
-		m_opcode_path = fs::relative(fs::path{ m_server_path + "/" + c->OpcodeDir }).string();
-	}
+	constexpr int name_width   = 15;
+	constexpr int path_width   = 0;
+	constexpr int break_length = 70;
 
-	// shared_memory_path
-	if (File::Exists(fs::path{m_server_path + "/" + c->SharedMemDir}.string())) {
-		m_shared_memory_path = fs::relative(fs::path{ m_server_path + "/" + c->SharedMemDir }).string();
+	std::cout << std::endl;
+	LogInfo("{}", Strings::Repeat("-", break_length));
+	for (const auto& [name, in_path] : paths) {
+		if (!in_path.empty()) {
+			LogInfo("{:>{}} > [{:<{}}]", name, name_width, in_path, path_width);
+		}
 	}
-
-	// logging path
-	if (File::Exists(fs::path{m_server_path + "/" + c->LogDir}.string())) {
-		m_log_path = fs::relative(fs::path{m_server_path + "/" + c->LogDir}).string();
-	}
-
-	LogInfo("logs path [{}]", m_log_path);
-	LogInfo("lua mods path [{}]", m_lua_mods_path);
-	LogInfo("lua_modules path [{}]", m_lua_modules_path);
-	LogInfo("maps path [{}]", m_maps_path);
-	LogInfo("patches path [{}]", m_patch_path);
-	LogInfo("opcode path [{}]", m_opcode_path);
-	LogInfo("plugins path [{}]", m_plugins_path);
-	LogInfo("quests path [{}]", m_quests_path);
-	LogInfo("shared_memory path [{}]", m_shared_memory_path);
+	LogInfo("{}", Strings::Repeat("-", break_length));
 }
 
 const std::string &PathManager::GetServerPath() const

common/repositories/base/base_character_evolving_items_repository.h

@@ -0,0 +1,475 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
+#define EQEMU_BASE_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseCharacterEvolvingItemsRepository {
+public:
+	struct CharacterEvolvingItems {
+		uint64_t id;
+		uint32_t character_id;
+		uint32_t item_id;
+		uint8_t  activated;
+		uint8_t  equipped;
+		int64_t  current_amount;
+		double   progression;
+		uint32_t final_item_id;
+		time_t   deleted_at;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"character_id",
+			"item_id",
+			"activated",
+			"equipped",
+			"current_amount",
+			"progression",
+			"final_item_id",
+			"deleted_at",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"character_id",
+			"item_id",
+			"activated",
+			"equipped",
+			"current_amount",
+			"progression",
+			"final_item_id",
+			"UNIX_TIMESTAMP(deleted_at)",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("character_evolving_items");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static CharacterEvolvingItems NewEntity()
+	{
+		CharacterEvolvingItems e{};
+
+		e.id             = 0;
+		e.character_id   = 0;
+		e.item_id        = 0;
+		e.activated      = 0;
+		e.equipped       = 0;
+		e.current_amount = 0;
+		e.progression    = 0;
+		e.final_item_id  = 0;
+		e.deleted_at     = 0;
+
+		return e;
+	}
+
+	static CharacterEvolvingItems GetCharacterEvolvingItems(
+		const std::vector<CharacterEvolvingItems> &character_evolving_itemss,
+		int character_evolving_items_id
+	)
+	{
+		for (auto &character_evolving_items : character_evolving_itemss) {
+			if (character_evolving_items.id == character_evolving_items_id) {
+				return character_evolving_items;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static CharacterEvolvingItems FindOne(
+		Database& db,
+		int character_evolving_items_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				character_evolving_items_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			CharacterEvolvingItems e{};
+
+			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
+			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int character_evolving_items_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				character_evolving_items_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const CharacterEvolvingItems &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[1] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.activated));
+		v.push_back(columns[4] + " = " + std::to_string(e.equipped));
+		v.push_back(columns[5] + " = " + std::to_string(e.current_amount));
+		v.push_back(columns[6] + " = " + std::to_string(e.progression));
+		v.push_back(columns[7] + " = " + std::to_string(e.final_item_id));
+		v.push_back(columns[8] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static CharacterEvolvingItems InsertOne(
+		Database& db,
+		CharacterEvolvingItems e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.activated));
+		v.push_back(std::to_string(e.equipped));
+		v.push_back(std::to_string(e.current_amount));
+		v.push_back(std::to_string(e.progression));
+		v.push_back(std::to_string(e.final_item_id));
+		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<CharacterEvolvingItems> &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.character_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.activated));
+			v.push_back(std::to_string(e.equipped));
+			v.push_back(std::to_string(e.current_amount));
+			v.push_back(std::to_string(e.progression));
+			v.push_back(std::to_string(e.final_item_id));
+			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<CharacterEvolvingItems> All(Database& db)
+	{
+		std::vector<CharacterEvolvingItems> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterEvolvingItems e{};
+
+			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
+			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<CharacterEvolvingItems> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<CharacterEvolvingItems> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterEvolvingItems e{};
+
+			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
+			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		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 CharacterEvolvingItems &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.activated));
+		v.push_back(std::to_string(e.equipped));
+		v.push_back(std::to_string(e.current_amount));
+		v.push_back(std::to_string(e.progression));
+		v.push_back(std::to_string(e.final_item_id));
+		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+
+		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<CharacterEvolvingItems> &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.character_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.activated));
+			v.push_back(std::to_string(e.equipped));
+			v.push_back(std::to_string(e.current_amount));
+			v.push_back(std::to_string(e.progression));
+			v.push_back(std::to_string(e.final_item_id));
+			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+
+			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_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H

common/repositories/base/base_character_pet_name_repository.h

@@ -0,0 +1,392 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_CHARACTER_PET_NAME_REPOSITORY_H
+#define EQEMU_BASE_CHARACTER_PET_NAME_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseCharacterPetNameRepository {
+public:
+	struct CharacterPetName {
+		int32_t     character_id;
+		std::string name;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("character_id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"character_id",
+			"name",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"character_id",
+			"name",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("character_pet_name");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static CharacterPetName NewEntity()
+	{
+		CharacterPetName e{};
+
+		e.character_id = 0;
+		e.name         = "";
+
+		return e;
+	}
+
+	static CharacterPetName GetCharacterPetName(
+		const std::vector<CharacterPetName> &character_pet_names,
+		int character_pet_name_id
+	)
+	{
+		for (auto &character_pet_name : character_pet_names) {
+			if (character_pet_name.character_id == character_pet_name_id) {
+				return character_pet_name;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static CharacterPetName FindOne(
+		Database& db,
+		int character_pet_name_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				character_pet_name_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			CharacterPetName e{};
+
+			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name         = row[1] ? row[1] : "";
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int character_pet_name_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				character_pet_name_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const CharacterPetName &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[0] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.character_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static CharacterPetName InsertOne(
+		Database& db,
+		CharacterPetName e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.character_id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.character_id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<CharacterPetName> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.character_id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<CharacterPetName> All(Database& db)
+	{
+		std::vector<CharacterPetName> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterPetName e{};
+
+			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name         = row[1] ? row[1] : "";
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<CharacterPetName> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<CharacterPetName> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterPetName e{};
+
+			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name         = row[1] ? row[1] : "";
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		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 CharacterPetName &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.character_id));
+		v.push_back("'" + Strings::Escape(e.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<CharacterPetName> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.character_id));
+			v.push_back("'" + Strings::Escape(e.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_CHARACTER_PET_NAME_REPOSITORY_H

common/repositories/base/base_data_buckets_repository.h

@@ -23,6 +23,7 @@ public:
 		std::string key_;
 		std::string value;
 		uint32_t    expires;
+		int64_t     account_id;
 		int64_t     character_id;
 		int64_t     npc_id;
 		int64_t     bot_id;
@@ -36,6 +37,7 @@ public:
 				CEREAL_NVP(key_),
 				CEREAL_NVP(value),
 				CEREAL_NVP(expires),
+				CEREAL_NVP(account_id),
 				CEREAL_NVP(character_id),
 				CEREAL_NVP(npc_id),
 				CEREAL_NVP(bot_id)
@@ -55,6 +57,7 @@ public:
 			"`key`",
 			"value",
 			"expires",
+			"account_id",
 			"character_id",
 			"npc_id",
 			"bot_id",
@@ -68,6 +71,7 @@ public:
 			"`key`",
 			"value",
 			"expires",
+			"account_id",
 			"character_id",
 			"npc_id",
 			"bot_id",
@@ -115,6 +119,7 @@ public:
 		e.key_         = "";
 		e.value        = "";
 		e.expires      = 0;
+		e.account_id   = 0;
 		e.character_id = 0;
 		e.npc_id       = 0;
 		e.bot_id       = 0;
@@ -158,9 +163,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 
 			return e;
 		}
@@ -197,9 +203,10 @@ public:
 		v.push_back(columns[1] + " = '" + Strings::Escape(e.key_) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.value) + "'");
 		v.push_back(columns[3] + " = " + std::to_string(e.expires));
-		v.push_back(columns[4] + " = " + std::to_string(e.character_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[6] + " = " + std::to_string(e.bot_id));
+		v.push_back(columns[4] + " = " + std::to_string(e.account_id));
+		v.push_back(columns[5] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[6] + " = " + std::to_string(e.npc_id));
+		v.push_back(columns[7] + " = " + std::to_string(e.bot_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -225,6 +232,7 @@ public:
 		v.push_back("'" + Strings::Escape(e.key_) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));
+		v.push_back(std::to_string(e.account_id));
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
@@ -261,6 +269,7 @@ public:
 			v.push_back("'" + Strings::Escape(e.key_) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));
+			v.push_back(std::to_string(e.account_id));
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));
@@ -301,9 +310,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -332,9 +342,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -413,6 +424,7 @@ public:
 		v.push_back("'" + Strings::Escape(e.key_) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));
+		v.push_back(std::to_string(e.account_id));
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
@@ -442,6 +454,7 @@ public:
 			v.push_back("'" + Strings::Escape(e.key_) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));
+			v.push_back(std::to_string(e.account_id));
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));

common/repositories/base/base_items_evolving_details_repository.h

@@ -0,0 +1,451 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
+#define EQEMU_BASE_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseItemsEvolvingDetailsRepository {
+public:
+	struct ItemsEvolvingDetails {
+		uint32_t id;
+		uint32_t item_evo_id;
+		uint32_t item_evolve_level;
+		uint32_t item_id;
+		uint32_t type;
+		uint32_t sub_type;
+		int64_t  required_amount;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"item_evo_id",
+			"item_evolve_level",
+			"item_id",
+			"type",
+			"sub_type",
+			"required_amount",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"item_evo_id",
+			"item_evolve_level",
+			"item_id",
+			"type",
+			"sub_type",
+			"required_amount",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("items_evolving_details");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static ItemsEvolvingDetails NewEntity()
+	{
+		ItemsEvolvingDetails e{};
+
+		e.id                = 0;
+		e.item_evo_id       = 0;
+		e.item_evolve_level = 0;
+		e.item_id           = 0;
+		e.type              = 0;
+		e.sub_type          = 0;
+		e.required_amount   = 0;
+
+		return e;
+	}
+
+	static ItemsEvolvingDetails GetItemsEvolvingDetails(
+		const std::vector<ItemsEvolvingDetails> &items_evolving_detailss,
+		int items_evolving_details_id
+	)
+	{
+		for (auto &items_evolving_details : items_evolving_detailss) {
+			if (items_evolving_details.id == items_evolving_details_id) {
+				return items_evolving_details;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static ItemsEvolvingDetails FindOne(
+		Database& db,
+		int items_evolving_details_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				items_evolving_details_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			ItemsEvolvingDetails e{};
+
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_evolve_level = 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.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int items_evolving_details_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				items_evolving_details_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const ItemsEvolvingDetails &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[1] + " = " + std::to_string(e.item_evo_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.item_evolve_level));
+		v.push_back(columns[3] + " = " + std::to_string(e.item_id));
+		v.push_back(columns[4] + " = " + std::to_string(e.type));
+		v.push_back(columns[5] + " = " + std::to_string(e.sub_type));
+		v.push_back(columns[6] + " = " + std::to_string(e.required_amount));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static ItemsEvolvingDetails InsertOne(
+		Database& db,
+		ItemsEvolvingDetails e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.item_evo_id));
+		v.push_back(std::to_string(e.item_evolve_level));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.sub_type));
+		v.push_back(std::to_string(e.required_amount));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<ItemsEvolvingDetails> &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_evo_id));
+			v.push_back(std::to_string(e.item_evolve_level));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.sub_type));
+			v.push_back(std::to_string(e.required_amount));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<ItemsEvolvingDetails> All(Database& db)
+	{
+		std::vector<ItemsEvolvingDetails> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			ItemsEvolvingDetails e{};
+
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_evolve_level = 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.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<ItemsEvolvingDetails> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<ItemsEvolvingDetails> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			ItemsEvolvingDetails e{};
+
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_evolve_level = 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.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		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 ItemsEvolvingDetails &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.item_evo_id));
+		v.push_back(std::to_string(e.item_evolve_level));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.sub_type));
+		v.push_back(std::to_string(e.required_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<ItemsEvolvingDetails> &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_evo_id));
+			v.push_back(std::to_string(e.item_evolve_level));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.sub_type));
+			v.push_back(std::to_string(e.required_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_ITEMS_EVOLVING_DETAILS_REPOSITORY_H

common/repositories/base/base_zone_repository.h

@@ -111,12 +111,13 @@ public:
 		int32_t     fast_regen_mana;
 		int32_t     fast_regen_endurance;
 		int32_t     npc_max_aggro_dist;
-		uint32_t    max_movement_update_range;
+		uint32_t    client_update_range;
 		int32_t     underworld_teleport_index;
 		int32_t     lava_damage;
 		int32_t     min_lava_damage;
 		uint8_t     idle_when_empty;
 		uint32_t    seconds_before_idle;
+		int32_t     shard_at_player_count;
 	};
 
 	static std::string PrimaryKey()
@@ -219,12 +220,13 @@ public:
 			"fast_regen_mana",
 			"fast_regen_endurance",
 			"npc_max_aggro_dist",
-			"max_movement_update_range",
+			"client_update_range",
 			"underworld_teleport_index",
 			"lava_damage",
 			"min_lava_damage",
 			"idle_when_empty",
 			"seconds_before_idle",
+			"shard_at_player_count",
 		};
 	}
 
@@ -323,12 +325,13 @@ public:
 			"fast_regen_mana",
 			"fast_regen_endurance",
 			"npc_max_aggro_dist",
-			"max_movement_update_range",
+			"client_update_range",
 			"underworld_teleport_index",
 			"lava_damage",
 			"min_lava_damage",
 			"idle_when_empty",
 			"seconds_before_idle",
+			"shard_at_player_count",
 		};
 	}
 
@@ -461,12 +464,13 @@ public:
 		e.fast_regen_mana           = 180;
 		e.fast_regen_endurance      = 180;
 		e.npc_max_aggro_dist        = 600;
-		e.max_movement_update_range = 600;
+		e.client_update_range       = 600;
 		e.underworld_teleport_index = 0;
 		e.lava_damage               = 50;
 		e.min_lava_damage           = 10;
 		e.idle_when_empty           = 1;
 		e.seconds_before_idle       = 60;
+		e.shard_at_player_count     = 0;
 
 		return e;
 	}
@@ -595,12 +599,13 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
+			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
 
 			return e;
 		}
@@ -725,12 +730,13 @@ public:
 		v.push_back(columns[89] + " = " + std::to_string(e.fast_regen_mana));
 		v.push_back(columns[90] + " = " + std::to_string(e.fast_regen_endurance));
 		v.push_back(columns[91] + " = " + std::to_string(e.npc_max_aggro_dist));
-		v.push_back(columns[92] + " = " + std::to_string(e.max_movement_update_range));
+		v.push_back(columns[92] + " = " + std::to_string(e.client_update_range));
 		v.push_back(columns[93] + " = " + std::to_string(e.underworld_teleport_index));
 		v.push_back(columns[94] + " = " + std::to_string(e.lava_damage));
 		v.push_back(columns[95] + " = " + std::to_string(e.min_lava_damage));
 		v.push_back(columns[96] + " = " + std::to_string(e.idle_when_empty));
 		v.push_back(columns[97] + " = " + std::to_string(e.seconds_before_idle));
+		v.push_back(columns[98] + " = " + std::to_string(e.shard_at_player_count));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -844,12 +850,13 @@ public:
 		v.push_back(std::to_string(e.fast_regen_mana));
 		v.push_back(std::to_string(e.fast_regen_endurance));
 		v.push_back(std::to_string(e.npc_max_aggro_dist));
-		v.push_back(std::to_string(e.max_movement_update_range));
+		v.push_back(std::to_string(e.client_update_range));
 		v.push_back(std::to_string(e.underworld_teleport_index));
 		v.push_back(std::to_string(e.lava_damage));
 		v.push_back(std::to_string(e.min_lava_damage));
 		v.push_back(std::to_string(e.idle_when_empty));
 		v.push_back(std::to_string(e.seconds_before_idle));
+		v.push_back(std::to_string(e.shard_at_player_count));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -971,12 +978,13 @@ public:
 			v.push_back(std::to_string(e.fast_regen_mana));
 			v.push_back(std::to_string(e.fast_regen_endurance));
 			v.push_back(std::to_string(e.npc_max_aggro_dist));
-			v.push_back(std::to_string(e.max_movement_update_range));
+			v.push_back(std::to_string(e.client_update_range));
 			v.push_back(std::to_string(e.underworld_teleport_index));
 			v.push_back(std::to_string(e.lava_damage));
 			v.push_back(std::to_string(e.min_lava_damage));
 			v.push_back(std::to_string(e.idle_when_empty));
 			v.push_back(std::to_string(e.seconds_before_idle));
+			v.push_back(std::to_string(e.shard_at_player_count));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1102,12 +1110,13 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
+			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -1224,12 +1233,13 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
+			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -1396,12 +1406,13 @@ public:
 		v.push_back(std::to_string(e.fast_regen_mana));
 		v.push_back(std::to_string(e.fast_regen_endurance));
 		v.push_back(std::to_string(e.npc_max_aggro_dist));
-		v.push_back(std::to_string(e.max_movement_update_range));
+		v.push_back(std::to_string(e.client_update_range));
 		v.push_back(std::to_string(e.underworld_teleport_index));
 		v.push_back(std::to_string(e.lava_damage));
 		v.push_back(std::to_string(e.min_lava_damage));
 		v.push_back(std::to_string(e.idle_when_empty));
 		v.push_back(std::to_string(e.seconds_before_idle));
+		v.push_back(std::to_string(e.shard_at_player_count));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1516,12 +1527,13 @@ public:
 			v.push_back(std::to_string(e.fast_regen_mana));
 			v.push_back(std::to_string(e.fast_regen_endurance));
 			v.push_back(std::to_string(e.npc_max_aggro_dist));
-			v.push_back(std::to_string(e.max_movement_update_range));
+			v.push_back(std::to_string(e.client_update_range));
 			v.push_back(std::to_string(e.underworld_teleport_index));
 			v.push_back(std::to_string(e.lava_damage));
 			v.push_back(std::to_string(e.min_lava_damage));
 			v.push_back(std::to_string(e.idle_when_empty));
 			v.push_back(std::to_string(e.seconds_before_idle));
+			v.push_back(std::to_string(e.shard_at_player_count));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/character_data_repository.h

@@ -80,6 +80,93 @@ public:
 
 		return l.empty() ? CharacterDataRepository::NewEntity() : l.front();
 	}
+
+	struct InstancePlayerCount {
+		int32_t instance_id;
+		uint32_t zone_id;
+		uint32_t player_count;
+	};
+
+	static std::vector<InstancePlayerCount> GetInstanceZonePlayerCounts(Database& db, int zone_id) {
+		std::vector<InstancePlayerCount> zone_player_counts;
+
+		uint64_t shard_instance_duration = 3155760000;
+
+		auto query = fmt::format(SQL(
+			SELECT
+				zone_id,
+				0 AS instance_id,
+				COUNT(id) AS player_count
+				FROM
+				character_data
+			WHERE
+				zone_instance = 0
+				AND zone_id = {}
+				AND last_login >= UNIX_TIMESTAMP(NOW()) - 600
+			GROUP BY
+				zone_id
+			ORDER BY
+				zone_id, player_count DESC
+		), zone_id);
+
+		auto results = db.QueryDatabase(query);
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			InstancePlayerCount e{};
+			e.zone_id      = std::stoi(row[0]);
+			e.instance_id  = 0;
+			e.player_count = std::stoi(row[2]);
+			zone_player_counts.push_back(e);
+		}
+
+		if (zone_player_counts.empty()) {
+			InstancePlayerCount e{};
+			e.zone_id      = zone_id;
+			e.instance_id  = 0;
+			e.player_count = 0;
+			zone_player_counts.push_back(e);
+		}
+
+		// duration 3155760000 is for shards explicitly
+		query = fmt::format(
+			SQL(
+				SELECT
+				i.id AS instance_id,
+				i.zone AS zone_id,
+				COUNT(c.id) AS player_count
+				FROM
+				instance_list  i
+				LEFT           JOIN
+				character_data c
+				ON
+				i.zone = c.zone_id
+				AND i.id = c.zone_instance
+				AND c.last_login >= UNIX_TIMESTAMP(NOW()) - 600
+				AND (i.start_time + i.duration >= UNIX_TIMESTAMP(NOW()) OR i.never_expires = 0)
+				AND i.duration = {}
+				WHERE
+				i.zone IS NOT NULL AND i.zone = {}
+				GROUP BY
+				i.id, i.zone, i.version
+				ORDER BY
+				i.id ASC;
+			), shard_instance_duration, zone_id
+		);
+
+		results = db.QueryDatabase(query);
+		if (!results.Success() || results.RowCount() == 0) {
+			return zone_player_counts;
+		}
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			InstancePlayerCount e{};
+			e.instance_id  = std::stoi(row[0]);
+			e.zone_id      = std::stoi(row[1]);
+			e.player_count = std::stoi(row[2]);
+			zone_player_counts.push_back(e);
+		}
+
+		return zone_player_counts;
+	}
 };
 
 #endif //EQEMU_CHARACTER_DATA_REPOSITORY_H

common/repositories/character_evolving_items_repository.h

@@ -0,0 +1,66 @@
+#ifndef EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
+#define EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
+
+#include "../database.h"
+#include "../strings.h"
+#include "base/base_character_evolving_items_repository.h"
+
+#include <boost/tuple/tuple_comparison.hpp>
+
+class CharacterEvolvingItemsRepository: public BaseCharacterEvolvingItemsRepository {
+public:
+	// Custom extended repository methods here
+
+	static CharacterEvolvingItems SetCurrentAmountAndProgression(Database& db, const uint64 id, const uint64 amount, const double progression)
+	{
+		auto e = FindOne(db, id);
+		if (e.id == 0) {
+			return NewEntity();
+		}
+
+		e.current_amount = amount;
+		e.progression    = progression;
+		e.deleted_at     = 0;
+		UpdateOne(db, e);
+		return e;
+	}
+
+	static CharacterEvolvingItems SetEquipped(Database& db, const uint64 id, const bool equipped)
+	{
+		auto e = FindOne(db, id);
+		if (e.id == 0) {
+			return NewEntity();
+		}
+
+		e.equipped   = equipped;
+		e.deleted_at = 0;
+		UpdateOne(db, e);
+		return e;
+	}
+
+	static CharacterEvolvingItems SoftDelete(Database& db, const uint64 id)
+	{
+		auto e = FindOne(db, id);
+		if (e.id == 0) {
+			return NewEntity();
+		}
+
+		e.deleted_at = time(nullptr);
+		UpdateOne(db, e);
+		return e;
+	}
+
+	static bool UpdateCharID(Database &db, const uint64 id, const uint32 to_char_id)
+	{
+		auto e = FindOne(db, id);
+		if (e.id == 0) {
+			return false;
+		}
+
+		e.character_id = to_char_id;
+		e.deleted_at   = 0;
+		return UpdateOne(db, e);
+	}
+};
+
+#endif //EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H

common/repositories/character_pet_name_repository.h

@@ -0,0 +1,13 @@
+#ifndef EQEMU_CHARACTER_PET_NAME_REPOSITORY_H
+#define EQEMU_CHARACTER_PET_NAME_REPOSITORY_H
+
+#include "../database.h"
+#include "../strings.h"
+#include "base/base_character_pet_name_repository.h"
+
+class CharacterPetNameRepository: public BaseCharacterPetNameRepository {
+public:
+	// Custom extended repository methods here
+};
+
+#endif //EQEMU_CHARACTER_PET_NAME_REPOSITORY_H

common/repositories/items_evolving_details_repository.h

@@ -0,0 +1,14 @@
+#ifndef EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
+#define EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
+
+#include "../database.h"
+#include "../strings.h"
+#include "base/base_items_evolving_details_repository.h"
+
+class ItemsEvolvingDetailsRepository: public BaseItemsEvolvingDetailsRepository {
+public:
+	// Custom extended repository methods here
+
+};
+
+#endif //EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H

common/repositories/trader_repository.h

@@ -12,6 +12,7 @@
 
 class TraderRepository : public BaseTraderRepository {
 public:
+	static constexpr uint32 TRADER_CONVERT_ID = 4000000000;
 
 	struct DistinctTraders_Struct {
 		uint32      trader_id;
@@ -40,15 +41,24 @@ public:
 		int32 char_zone_instance_id
 	);
 
-	static BulkTraders_Struct GetDistinctTraders(Database &db)
+	static BulkTraders_Struct GetDistinctTraders(
+		Database &db,
+		uint32 char_zone_instance_id,
+		uint32 max_results = std::numeric_limits<uint32>::max()
+		)
 	{
 		BulkTraders_Struct                  all_entries{};
 		std::vector<DistinctTraders_Struct> distinct_traders;
 
-		auto results = db.QueryDatabase(
+		auto results = db.QueryDatabase(fmt::format(
 			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
 			"FROM trader AS t "
-			"JOIN character_data AS c ON t.char_id = c.id;"
+			"JOIN character_data AS c ON t.char_id = c.id "
+			"WHERE t.char_zone_instance_id = {} "
+			"ORDER BY t.char_zone_instance_id ASC "
+			"LIMIT {}",
+			char_zone_instance_id,
+			max_results)
 		);
 
 		distinct_traders.reserve(results.RowCount());
@@ -224,6 +234,37 @@ public:
 
 		return DeleteWhere(db, fmt::format("`id` IN({})", Strings::Implode(",", delete_ids)));
 	}
+
+	static DistinctTraders_Struct GetTraderByInstanceAndSerialnumber(
+		Database &db,
+		uint32 instance_id,
+		const char *serial_number
+		)
+	{
+		DistinctTraders_Struct trader{};
+
+		auto query = fmt::format(
+			"SELECT t.id, t.char_id, c.name "
+			"FROM trader AS t "
+			"JOIN character_data AS c ON c.id = t.char_id "
+			"WHERE t.char_zone_id = 151 AND t.char_zone_instance_id = {} AND t.item_sn = {} LIMIT 1",
+			instance_id,
+			serial_number
+		);
+
+		auto results = db.QueryDatabase(query);
+
+		if (results.RowCount() == 0) {
+			return trader;
+		}
+
+		auto        row    = results.begin();
+		std::string name   = row[2];
+		trader.trader_id   = Strings::ToUnsignedInt(row[1]);
+		trader.trader_name = row[2] ? row[2] : "";
+
+		return trader;
+	}
 };
 
 #endif //EQEMU_TRADER_REPOSITORY_H

common/ruletypes.h

@@ -372,6 +372,7 @@ RULE_INT(Zone, FishingChance, 399, "Chance of fishing from zone table vs global
 RULE_BOOL(Zone, AllowCrossZoneSpellsOnBots, false, "Set to true to allow cross zone spells (cast/remove) to affect bots")
 RULE_BOOL(Zone, AllowCrossZoneSpellsOnMercs, false, "Set to true to allow cross zone spells (cast/remove) to affect mercenaries")
 RULE_BOOL(Zone, AllowCrossZoneSpellsOnPets, false, "Set to true to allow cross zone spells (cast/remove) to affect pets")
+RULE_BOOL(Zone, ZoneShardQuestMenuOnly, false, "Set to true if you only want quests to show the zone shard menu")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Map)
@@ -829,6 +830,7 @@ RULE_REAL(Bazaar, ParcelDeliveryCostMod, 0.20, "Cost of parcel delivery for a ba
 RULE_INT(Bazaar, VoucherDeliveryCost, 200, "Number of vouchers for direct delivery for a bazaar purchase. Default is 200 vouchers. RoF+ Only.")
 RULE_BOOL(Bazaar, EnableParcelDelivery, true, "Enable bazaar purchases via parcel delivery.  Default is True.")
 RULE_INT(Bazaar, MaxBuyerInventorySearchResults, 200, "Maximum number of search results when a Buyer searches the global item list. Default is 200. RoF+ Only.")
+RULE_BOOL(Bazaar, UseAlternateBazaarSearch, false, "Allows the bazaar search window to search across bazaar shards. Default is false.")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mail)
@@ -1037,6 +1039,13 @@ RULE_INT(Parcel, ParcelMaxItems, 50, "The maximum number of parcels a player is
 RULE_INT(Parcel, ParcelPruneDelay, 30, "The number of days after which a parcel is deleted. Items are lost!")
 RULE_CATEGORY_END()
 
+RULE_CATEGORY(EvolvingItems)
+RULE_REAL(EvolvingItems, PercentOfSoloExperience, 0.1, "Percentage of solo experience allocated to evolving items that require experience.")
+RULE_REAL(EvolvingItems, PercentOfGroupExperience, 0.1, "Percentage of group experience allocated to evolving items that require experience.")
+RULE_REAL(EvolvingItems, PercentOfRaidExperience, 0.1, "Percentage of solo experience allocated to evolving items that require experience.")
+RULE_INT(EvolvingItems, DelayUponEquipping, 30000, "Delay in ms before an evolving item will earn rewards after equipping.  Default is 30000ms or 30s.")
+RULE_CATEGORY_END()
+
 #undef RULE_CATEGORY
 #undef RULE_INT
 #undef RULE_REAL

common/shareddb.cpp

@@ -37,11 +37,13 @@
 #include "strings.h"
 #include "eqemu_config.h"
 #include "data_verification.h"
+#include "evolving_items.h"
 #include "repositories/criteria/content_filter_criteria.h"
 #include "repositories/account_repository.h"
 #include "repositories/faction_association_repository.h"
 #include "repositories/starting_items_repository.h"
 #include "path_manager.h"
+#include "../zone/client.h"
 #include "repositories/loottable_repository.h"
 #include "repositories/character_item_recast_repository.h"
 #include "repositories/character_corpses_repository.h"
@@ -645,15 +647,23 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 
 	return true;
 }
-
 // Overloaded: Retrieve character inventory based on character id (zone entry)
-bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
+//bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
+bool SharedDatabase::GetInventory(Client *c)
 {
-	if (!char_id || !inv)
+	if (!c) {
 		return false;
+	}
+
+	uint32                char_id = c->CharacterID();
+	EQ::InventoryProfile &inv     = c->GetInv();
 
 	// Retrieve character inventory
-	auto results = InventoryRepository::GetWhere(*this, fmt::format("`charid` = '{}' ORDER BY `slotid`;", char_id));
+	auto results   = InventoryRepository::GetWhere(*this, fmt::format("`charid` = '{}' ORDER BY `slotid`", char_id));
+	auto e_results = CharacterEvolvingItemsRepository::GetWhere(
+		*this, fmt::format("`character_id` = '{}' AND `deleted_at` IS NULL", char_id)
+	);
+
 	if (results.empty()) {
 		LogError("Error loading inventory for char_id {} from the database.", char_id);
 		return false;
@@ -667,8 +677,8 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 
 	const auto timestamps = GetItemRecastTimestamps(char_id);
 	auto cv_conflict      = false;
-	const auto pmask      = inv->GetLookup()->PossessionsBitmask;
-	const auto bank_size  = inv->GetLookup()->InventoryTypeSize.Bank;
+	const auto pmask      = inv.GetLookup()->PossessionsBitmask;
+	const auto bank_size  = inv.GetLookup()->InventoryTypeSize.Bank;
 
 	std::vector<InventoryRepository::Inventory> queue{};
 	for (auto &row: results) {
@@ -785,9 +795,55 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			}
 		}
 
+		if (item->EvolvingItem) {
+			if (slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <= EQ::invslot::EQUIPMENT_END) {
+				inst->SetEvolveEquipped(true);
+			}
+
+			auto t = std::ranges::find_if(
+				e_results.cbegin(),
+				e_results.cend(),
+				[&](const CharacterEvolvingItemsRepository::CharacterEvolvingItems &x) {
+					return x.item_id == item_id;
+				}
+			);
+
+			if (t == std::end(e_results)) {
+				auto e = CharacterEvolvingItemsRepository::NewEntity();
+
+				e.character_id  = char_id;
+				e.item_id       = item_id;
+				e.equipped      = inst->GetEvolveEquipped();
+				e.final_item_id = evolving_items_manager.GetFinalItemID(*inst);
+
+				auto r = CharacterEvolvingItemsRepository::InsertOne(*this, e);
+				e.id = r.id;
+				e_results.push_back(e);
+
+				inst->SetEvolveUniqueID(e.id);
+				inst->SetEvolveCharID(e.character_id);
+				inst->SetEvolveItemID(e.item_id);
+				inst->SetEvolveActivated(e.activated);
+				inst->SetEvolveEquipped(e.equipped);
+				inst->SetEvolveCurrentAmount(e.current_amount);
+				inst->CalculateEvolveProgression();
+				inst->SetEvolveFinalItemID(e.final_item_id);
+			}
+			else {
+				inst->SetEvolveUniqueID(t->id);
+				inst->SetEvolveCharID(t->character_id);
+				inst->SetEvolveItemID(t->item_id);
+				inst->SetEvolveActivated(t->activated);
+				inst->SetEvolveEquipped(t->equipped);
+				inst->SetEvolveCurrentAmount(t->current_amount);
+				inst->CalculateEvolveProgression();
+				inst->SetEvolveFinalItemID(t->final_item_id);
+			}
+		}
+
 		int16 put_slot_id;
 		if (slot_id >= 8000 && slot_id <= 8999) {
-			put_slot_id = inv->PushCursor(*inst);
+			put_slot_id = inv.PushCursor(*inst);
 		}
 		else if (slot_id >= 3111 && slot_id <= 3179) {
 			// Admins: please report any occurrences of this error
@@ -797,10 +853,10 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 				item_id,
 				slot_id
 			);
-			put_slot_id = inv->PushCursor(*inst);
+			put_slot_id = inv.PushCursor(*inst);
 		}
 		else {
-			put_slot_id = inv->PutItem(slot_id, *inst);
+			put_slot_id = inv.PutItem(slot_id, *inst);
 		}
 
 		row.guid = inst->GetSerialNumber();
@@ -825,8 +881,8 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			"ClientVersion/Expansion conflict during inventory load at zone entry for [{}] (charid: [{}], inver: [{}], gmi: [{}])",
 			char_name,
 			char_id,
-			EQ::versions::MobVersionName(inv->InventoryVersion()),
-			(inv->GMInventory() ? "true" : "false")
+			EQ::versions::MobVersionName(inv.InventoryVersion()),
+			(inv.GMInventory() ? "true" : "false")
 		);
 	}
 
@@ -837,7 +893,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 	EQ::ItemInstance::ClearGUIDMap();
 
 	// Retrieve shared inventory
-	return GetSharedBank(char_id, inv, true);
+	return GetSharedBank(char_id, &inv, true);
 }
 
 // Overloaded: Retrieve character inventory based on account_id and character name (char select)

common/shareddb.h

@@ -28,6 +28,8 @@
 #include "fixed_memory_variable_hash_set.h"
 #include "say_link.h"
 #include "repositories/command_subsettings_repository.h"
+#include "repositories/items_evolving_details_repository.h"
+#include "../common/repositories/character_evolving_items_repository.h"
 
 #include <list>
 #include <map>
@@ -103,7 +105,7 @@ public:
 	bool GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is_charid);
 	int32 GetSharedPlatinum(uint32 account_id);
 	bool SetSharedPlatinum(uint32 account_id, int32 amount_to_add);
-	bool GetInventory(uint32 char_id, EQ::InventoryProfile *inv);
+	bool GetInventory(Client* c);
 	bool GetInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv); // deprecated
 	std::map<uint32, uint32> GetItemRecastTimestamps(uint32 char_id);
 	uint32 GetItemRecastTimestamp(uint32 char_id, uint32 recast_type);

common/timer.h

@@ -86,6 +86,9 @@ struct BenchTimer
 	void reset() { start_time = clock::now(); }
 	// this is seconds
 	double elapsed() { return std::chrono::duration<double> (clock::now() - start_time).count(); }
+	std::chrono::milliseconds::rep elapsedMilliseconds() { return std::chrono::duration_cast<std::chrono::milliseconds>(clock::now() - start_time).count(); }
+	std::chrono::microseconds::rep elapsedMicroseconds() { return std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - start_time).count(); }
+	std::chrono::nanoseconds::rep elapsedNanoseconds() { return std::chrono::duration_cast<std::chrono::nanoseconds>(clock::now() - start_time).count(); }
 private:
 	std::chrono::time_point<std::chrono::high_resolution_clock> start_time;
 };

common/version.h

@@ -25,7 +25,7 @@
 
 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "22.60.0-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "22.61.0-dev" // always append -dev to the current version for custom-builds
 #define LOGIN_VERSION "0.8.0"
 #define COMPILE_DATE    __DATE__
 #define COMPILE_TIME    __TIME__
@@ -42,7 +42,7 @@
  * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
  */
 
-#define CURRENT_BINARY_DATABASE_VERSION 9286
+#define CURRENT_BINARY_DATABASE_VERSION 9293
 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9045
 
 #endif

common/zone_store.cpp

@@ -676,12 +676,6 @@ int ZoneStore::GetZoneNPCMaximumAggroDistance(uint32 zone_id, int version)
 	return z ? z->npc_max_aggro_dist : DEFAULT_ZONE_MAX_AGGRO_DISTANCE;
 }
 
-uint32 ZoneStore::GetZoneMaximumMovementUpdateRange(uint32 zone_id, int version)
-{
-	const auto& z = GetZoneVersionWithFallback(zone_id, version);
-	return z ? z->max_movement_update_range : DEFAULT_ZONE_MAX_MOVEMENT_UPDATE_RANGE;
-}
-
 int8 ZoneStore::GetZoneMinimumExpansion(uint32 zone_id, int version)
 {
 	const auto& z = GetZoneVersionWithFallback(zone_id, version);

common/zone_store.h

@@ -94,7 +94,6 @@ public:
 	int GetZoneFastRegenMana(uint32 zone_id, int version = 0);
 	int GetZoneFastRegenEndurance(uint32 zone_id, int version = 0);
 	int GetZoneNPCMaximumAggroDistance(uint32 zone_id, int version = 0);
-	uint32 GetZoneMaximumMovementUpdateRange(uint32 zone_id, int version = 0);
 	int8 GetZoneMinimumExpansion(uint32 zone_id, int version = 0);
 	int8 GetZoneMaximumExpansion(uint32 zone_id, int version = 0);
 	const std::string GetZoneContentFlags(uint32 zone_id, int version = 0);

loginserver/world_server.cpp

@@ -51,12 +51,6 @@ WorldServer::WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> wo
 		ServerOP_LSAccountUpdate,
 		std::bind(&WorldServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2)
 	);
-
-	m_keepalive = std::make_unique<EQ::Timer>(
-		1000,
-		true,
-		std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1)
-	);
 }
 
 WorldServer::~WorldServer() = default;
@@ -1307,12 +1301,6 @@ const std::string &WorldServer::GetVersion() const
 	return m_version;
 }
 
-void WorldServer::OnKeepAlive(EQ::Timer *t)
-{
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	m_connection->SendPacket(&pack);
-}
-
 void WorldServer::FormatWorldServerName(char *name, int8 server_list_type)
 {
 	std::string server_long_name = name;

loginserver/world_server.h

@@ -187,13 +187,6 @@ private:
 	bool         m_is_server_logged_in;
 	bool         m_is_server_trusted;
 
-	/**
-	 * Keepalive
-	 * @param t
-	 */
-	void OnKeepAlive(EQ::Timer *t);
-	std::unique_ptr<EQ::Timer> m_keepalive;
-
 	static void FormatWorldServerName(char *name, int8 server_list_type);
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "22.60.0",
+  "version": "22.61.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/EQEmu/Server.git"

shared_memory/main.cpp

@@ -33,12 +33,14 @@
 #include "../common/zone_store.h"
 #include "../common/path_manager.h"
 #include "../common/events/player_event_logs.h"
+#include "../common/evolving_items.h"
 
-EQEmuLogSys         LogSys;
-WorldContentService content_service;
-ZoneStore           zone_store;
-PathManager         path;
-PlayerEventLogs     player_event_logs;
+EQEmuLogSys          LogSys;
+WorldContentService  content_service;
+ZoneStore            zone_store;
+PathManager          path;
+PlayerEventLogs      player_event_logs;
+EvolvingItemsManager evolving_items_manager;
 
 #ifdef _WINDOWS
 #include <direct.h>

utils/patches/patch_RoF2.conf

@@ -261,6 +261,7 @@ OP_ItemPacket=0x368e
 OP_ItemLinkResponse=0x70c0
 OP_ItemLinkClick=0x4cef
 OP_ItemPreview=0x6b5c
+OP_ItemPreviewRequest=0x7f80
 OP_NewSpawn=0x6097
 OP_Track=0x17e5
 OP_TrackTarget=0x695e
@@ -566,7 +567,7 @@ OP_RaidUpdate=0x3973
 OP_RaidJoin=0x0000
 OP_RaidDelegateAbility=0x2b33
 OP_MarkRaidNPC=0x5a58
-OP_RaidClearNPCMarks=0x20d3							 
+OP_RaidClearNPCMarks=0x20d3
 
 # Button-push commands
 OP_Taunt=0x2703
@@ -728,3 +729,18 @@ OP_InitialHPUpdate=0x0000
 #aura related
 OP_UpdateAura=0x1456
 OP_RemoveTrap=0x71da
+
+OP_PickZoneWindow=0x72d8
+OP_PickZone=0xaaba
+
+#evolve item related
+OP_EvolveItem=0x7cfb
+
+# This is bugged in ROF2
+# OP_InvokeChangePetNameImmediate is supposed to write DisablePetNameChangeReminder=0 to reset the 'nag reminder'
+# It actually sets DisableNameChangeReminder=0 (player name change nag reminder). Additionally, clicking the
+# 'Don't remind me later' button sets DisableNameChangeReminder=1
+# This can be fixed with a client patch.
+OP_InvokeChangePetNameImmediate=0x046d
+OP_InvokeChangePetName=0x4506
+OP_ChangePetName=0x5dab

world/cli/copy_character.cpp

@@ -11,7 +11,7 @@ void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std
 		"destination_account_name"
 	};
 	std::vector<std::string> options   = {};
-
+	
 	if (cmd[{"-h", "--help"}]) {
 		return;
 	}

world/cli/database_dump.cpp

@@ -24,12 +24,12 @@ void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std:
 		"--compress"
 	};
 
-	EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
-
 	if (cmd[{"-h", "--help"}]) {
 		return;
 	}
 
+	EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
 	auto s        = new DatabaseDumpService();
 	bool dump_all = cmd[{"-a", "--all"}];
 

world/cli/database_updates.cpp

@@ -4,12 +4,17 @@ void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, s
 {
 	description = "Runs database updates manually";
 
+	std::vector<std::string> options   = {
+		"--skip-backup",
+	};
+
 	if (cmd[{"-h", "--help"}]) {
 		return;
 	}
 
 	DatabaseUpdate update;
 	update.SetDatabase(&database)
+		->SetSkipBackup(cmd[{"--skip-backup"}] )
 		->SetContentDatabase(&content_db)
 		->CheckDbUpdates();
 }

world/cli/test.cpp

@@ -1,6 +1,8 @@
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
+#include <iomanip>
 #include "../../common/events/player_events.h"
+#include "../../common/memory/ksm.hpp"
 
 void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
@@ -10,5 +12,21 @@ void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::
 		return;
 	}
 
-	
+	void* start_marker = KSM::MarkHeapStart();
+	std::cout << "Start marker: " << start_marker << "\n";
+
+	std::vector<std::string> vec = {};
+	for (int i = 0; i < 100000; i++) {
+		vec.push_back("Some random string");
+	}
+
+	// Measure allocated memory size
+	size_t allocated_size = KSM::MeasureHeapUsage(start_marker);
+	// Convert to MB as a float and output with precision
+	double allocated_size_mb = static_cast<double>(allocated_size) / (1024 * 1024);
+	std::cout << std::fixed << std::setprecision(3)
+			  << "Allocated size: " << allocated_size_mb << " MB\n";
+
+	// Mark memory for KSM
+	KSM::MarkMemoryForKSM(start_marker, allocated_size);
 }

world/login_server.cpp

@@ -595,11 +595,6 @@ bool LoginServer::Connect()
 		);
 	}
 
-	m_keepalive = std::make_unique<EQ::Timer>(
-		1000,
-		true,
-		std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1));
-
 	return true;
 }
 
@@ -716,8 +711,3 @@ void LoginServer::SendAccountUpdate(ServerPacket *pack)
 	}
 }
 
-void LoginServer::OnKeepAlive(EQ::Timer *t)
-{
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	SendPacket(&pack);
-}

world/login_server.h

@@ -50,7 +50,6 @@ private:
 	void ProcessLSRemoteAddr(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSAccountUpdate(uint16_t opcode, EQ::Net::Packet &p);
 
-	void OnKeepAlive(EQ::Timer *t);
 	std::unique_ptr<EQ::Timer> m_keepalive;
 
 	std::unique_ptr<EQ::Net::ServertalkClient>       m_client;

world/main.cpp

@@ -46,6 +46,7 @@
 #include "client.h"
 #include "worlddb.h"
 #include "wguild_mgr.h"
+#include "../common/evolving_items.h"
 
 #ifdef _WINDOWS
 #include <process.h>
@@ -111,6 +112,7 @@ WorldContentService content_service;
 WebInterfaceList    web_interface;
 PathManager         path;
 PlayerEventLogs     player_event_logs;
+EvolvingItemsManager evolving_items_manager;
 
 void CatchSignal(int sig_num);
 

world/queryserv.cpp

@@ -22,7 +22,6 @@ void QueryServConnection::AddConnection(std::shared_ptr<EQ::Net::ServertalkServe
 	connection->OnMessage(ServerOP_QueryServGeneric, std::bind(&QueryServConnection::HandleGenericMessage, this, std::placeholders::_1, std::placeholders::_2));
 	connection->OnMessage(ServerOP_LFGuildUpdate, std::bind(&QueryServConnection::HandleLFGuildUpdateMessage, this, std::placeholders::_1, std::placeholders::_2));
 	m_streams.emplace(std::make_pair(connection->GetUUID(), connection));
-	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&QueryServConnection::OnKeepAlive, this, std::placeholders::_1));
 }
 
 void QueryServConnection::RemoveConnection(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection)
@@ -54,8 +53,3 @@ bool QueryServConnection::SendPacket(ServerPacket* pack)
 	return true;
 }
 
-void QueryServConnection::OnKeepAlive(EQ::Timer *t)
-{
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	SendPacket(&pack);
-}

world/queryserv.h

@@ -15,7 +15,6 @@ public:
 	void HandleGenericMessage(uint16_t opcode, EQ::Net::Packet &p);
 	void HandleLFGuildUpdateMessage(uint16_t opcode, EQ::Net::Packet &p);
 	bool SendPacket(ServerPacket* pack);
-	void OnKeepAlive(EQ::Timer *t);
 private:
 	std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams;
 	std::unique_ptr<EQ::Timer> m_keepalive;

world/ucs.cpp

@@ -31,8 +31,6 @@ void UCSConnection::SetConnection(std::shared_ptr<EQ::Net::ServertalkServerConne
 			)
 		);
 	}
-
-	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&UCSConnection::OnKeepAlive, this, std::placeholders::_1));
 }
 
 const std::shared_ptr<EQ::Net::ServertalkServerConnection> &UCSConnection::GetConnection() const
@@ -92,13 +90,3 @@ void UCSConnection::SendMessage(const char *From, const char *Message)
 	SendPacket(pack);
 	safe_delete(pack);
 }
-
-void UCSConnection::OnKeepAlive(EQ::Timer *t)
-{
-	if (!connection) {
-		return;
-	}
-
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	connection->SendPacket(&pack);
-}

world/ucs.h

@@ -23,11 +23,6 @@ private:
 	inline std::string GetIP() const { return (connection && connection->Handle()) ? connection->Handle()->RemoteIP() : 0; }
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> connection;
 
-	/**
-	 * Keepalive
-	 */
-	std::unique_ptr<EQ::Timer> m_keepalive;
-	void OnKeepAlive(EQ::Timer *t);
 };
 
 #endif /*UCS_H_*/

world/zonelist.cpp

@@ -42,7 +42,6 @@ ZSList::ZSList()
 	memset(pLockedZones, 0, sizeof(pLockedZones));
 
 	m_tick = std::make_unique<EQ::Timer>(5000, true, std::bind(&ZSList::OnTick, this, std::placeholders::_1));
-	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
 }
 
 ZSList::~ZSList() {
@@ -846,13 +845,6 @@ void ZSList::OnTick(EQ::Timer *t)
 	web_interface.SendEvent(out);
 }
 
-void ZSList::OnKeepAlive(EQ::Timer *t)
-{
-	for (auto &zone : zone_server_list) {
-		zone->SendKeepAlive();
-	}
-}
-
 const std::list<std::unique_ptr<ZoneServer>> &ZSList::getZoneServerList() const
 {
 	return zone_server_list;

world/zonelist.h

@@ -72,7 +72,6 @@ public:
 
 private:
 	void OnTick(EQ::Timer *t);
-	void OnKeepAlive(EQ::Timer *t);
 	uint32 NextID;
 	uint16	pLockedZones[MaxLockedZones];
 	uint32 CurGroupID;

zone/CMakeLists.txt

@@ -17,6 +17,7 @@ SET(zone_sources
     botspellsai.cpp
     cheat_manager.cpp
     client.cpp
+    client_evolving_items.cpp
     client_bot.cpp
     client_mods.cpp
     client_packet.cpp

zone/attack.cpp

@@ -2815,7 +2815,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
 
 				if (con_level != ConsiderColor::Gray) {
 					if (!GetOwner() || (GetOwner() && !GetOwner()->IsClient())) {
-						give_exp_client->AddEXP(ExpSource::Kill, final_exp, con_level);
+						give_exp_client->AddEXP(ExpSource::Kill, final_exp, con_level, false, this);
 
 						if (
 							killer_mob &&

zone/bot.cpp

@@ -7390,39 +7390,6 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
 	return;
 }
 
-/**
- * @param close_mobs
- * @param scanning_mob
- */
-void EntityList::ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob)
-{
-	float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);
-
-	close_mobs.clear();
-
-	for (auto& e : mob_list) {
-		auto mob = e.second;
-
-		if (!mob->IsClient()) {
-			continue;
-		}
-
-		if (mob->GetID() <= 0) {
-			continue;
-		}
-
-		float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
-		if (distance <= scan_range) {
-			close_mobs.insert(std::pair<uint16, Mob*>(mob->GetID(), mob));
-		}
-		else if (mob->GetAggroRange() >= scan_range) {
-			close_mobs.insert(std::pair<uint16, Mob*>(mob->GetID(), mob));
-		}
-	}
-
-	LogAIScanCloseDetail("Close Client Mob List Size [{}] for mob [{}]", close_mobs.size(), scanning_mob->GetCleanName());
-}
-
 uint8 Bot::GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets, Raid* raid) {
 
 	uint8 need_healed = 0;

zone/client.cpp

@@ -66,6 +66,7 @@ extern volatile bool RunLoops;
 #include "../common/repositories/character_spells_repository.h"
 #include "../common/repositories/character_disciplines_repository.h"
 #include "../common/repositories/character_data_repository.h"
+#include "../common/repositories/character_pet_name_repository.h"
 #include "../common/repositories/discovered_items_repository.h"
 #include "../common/repositories/inventory_repository.h"
 #include "../common/repositories/keyring_repository.h"
@@ -157,7 +158,7 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
 	endupkeep_timer(1000),
 	autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
 	m_client_npc_aggro_scan_timer(RuleI(Aggro, ClientAggroCheckIdleInterval)),
-	m_client_zone_wide_full_position_update_timer(5 * 60 * 1000),
+	m_client_bulk_npc_pos_update_timer(60 * 1000),
 	tribute_timer(Tribute_duration),
 	proximity_timer(ClientProximity_interval),
 	TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
@@ -402,6 +403,7 @@ Client::~Client() {
 
 	mMovementManager->RemoveClient(this);
 
+	DataBucket::DeleteCachedBuckets(DataBucketLoadType::Account, AccountID());
 	DataBucket::DeleteCachedBuckets(DataBucketLoadType::Client, CharacterID());
 
 	if (RuleB(Bots, Enabled)) {
@@ -1827,7 +1829,7 @@ void Client::FriendsWho(char *FriendsString) {
 		Message(0, "Error: World server disconnected");
 	else {
 		auto pack =
-		    new ServerPacket(ServerOP_FriendsWho, sizeof(ServerFriendsWho_Struct) + strlen(FriendsString));
+			new ServerPacket(ServerOP_FriendsWho, sizeof(ServerFriendsWho_Struct) + strlen(FriendsString));
 		ServerFriendsWho_Struct* FriendsWho = (ServerFriendsWho_Struct*) pack->pBuffer;
 		FriendsWho->FromID = GetID();
 		strcpy(FriendsWho->FromName, GetName());
@@ -2208,7 +2210,7 @@ void Client::Stand() {
 }
 
 void Client::Sit() {
-    SetAppearance(eaSitting, false);
+	SetAppearance(eaSitting, false);
 }
 
 void Client::ChangeLastName(std::string last_name) {
@@ -4391,6 +4393,83 @@ void Client::KeyRingList()
 	}
 }
 
+bool Client::IsPetNameChangeAllowed() {
+	DataBucketKey k = GetScopedBucketKeys();
+	k.key = "PetNameChangesAllowed";
+
+	auto b = DataBucket::GetData(k);
+	if (!b.value.empty()) {
+		return true;
+	}
+
+	return false;
+}
+
+void Client::InvokeChangePetName(bool immediate) {
+	if (!IsPetNameChangeAllowed()) {
+		return;
+	}
+
+	auto packet_op = immediate ? OP_InvokeChangePetNameImmediate : OP_InvokeChangePetName;
+
+	auto outapp = new EQApplicationPacket(packet_op, 0);
+	QueuePacket(outapp);
+	safe_delete(outapp);
+}
+
+void Client::GrantPetNameChange() {
+	DataBucketKey k = GetScopedBucketKeys();
+	k.key = "PetNameChangesAllowed";
+	k.value = "true";
+	DataBucket::SetData(k);
+
+	InvokeChangePetName(true);
+}
+
+void Client::ClearPetNameChange() {
+	DataBucketKey k = GetScopedBucketKeys();
+	k.key = "PetNameChangesAllowed";
+
+	DataBucket::DeleteData(k);
+}
+
+bool Client::ChangePetName(std::string new_name)
+{
+	if (new_name.empty()) {
+		return false;
+	}
+
+	if (!IsPetNameChangeAllowed()) {
+		return false;
+	}
+
+	auto pet = GetPet();
+	if (!pet) {
+		return false;
+	}
+
+	if (pet->GetName() == new_name) {
+		return false;
+	}
+
+	if (!database.CheckNameFilter(new_name) || database.IsNameUsed(new_name)) {
+		return false;
+	}
+
+	CharacterPetNameRepository::ReplaceOne(
+		database,
+		CharacterPetNameRepository::CharacterPetName{
+			.character_id = static_cast<int32_t>(CharacterID()),
+			.name = new_name
+		}
+	);
+
+	pet->TempName(new_name.c_str());
+
+	ClearPetNameChange();
+	return true;
+}
+
 bool Client::IsDiscovered(uint32 item_id) {
 	const auto& l = DiscoveredItemsRepository::GetWhere(
 		database,
@@ -5627,13 +5706,13 @@ bool Client::TryReward(uint32 claim_id)
 
 	if (amt == 1) {
 		query = StringFormat("DELETE FROM account_rewards "
-				     "WHERE account_id = %i AND reward_id = %i",
-				     AccountID(), claim_id);
+					 "WHERE account_id = %i AND reward_id = %i",
+					 AccountID(), claim_id);
 		auto results = database.QueryDatabase(query);
 	} else {
 		query = StringFormat("UPDATE account_rewards SET amount = (amount-1) "
-				     "WHERE account_id = %i AND reward_id = %i",
-				     AccountID(), claim_id);
+					 "WHERE account_id = %i AND reward_id = %i",
+					 AccountID(), claim_id);
 		auto results = database.QueryDatabase(query);
 	}
 
@@ -8366,7 +8445,7 @@ int Client::GetQuiverHaste(int delay)
 	for (int r = EQ::invslot::GENERAL_BEGIN; r <= EQ::invslot::GENERAL_END; r++) {
 		pi = GetInv().GetItem(r);
 		if (pi && pi->IsClassBag() && pi->GetItem()->BagType == EQ::item::BagTypeQuiver &&
-		    pi->GetItem()->BagWR > 0)
+			pi->GetItem()->BagWR > 0)
 			break;
 		if (r == EQ::invslot::GENERAL_END)
 			// we will get here if we don't find a valid quiver
@@ -9840,7 +9919,7 @@ const ExpeditionLockoutTimer* Client::GetExpeditionLockout(
 	for (const auto& expedition_lockout : m_expedition_lockouts)
 	{
 		if ((include_expired || !expedition_lockout.IsExpired()) &&
-		    expedition_lockout.IsSameLockout(expedition_name, event_name))
+			expedition_lockout.IsSameLockout(expedition_name, event_name))
 		{
 			return &expedition_lockout;
 		}
@@ -9855,7 +9934,7 @@ std::vector<ExpeditionLockoutTimer> Client::GetExpeditionLockouts(
 	for (const auto& lockout : m_expedition_lockouts)
 	{
 		if ((include_expired || !lockout.IsExpired()) &&
-		    lockout.GetExpeditionName() == expedition_name)
+			lockout.GetExpeditionName() == expedition_name)
 		{
 			lockouts.emplace_back(lockout);
 		}
@@ -10461,27 +10540,15 @@ void Client::SendToInstance(std::string instance_type, std::string zone_short_na
 	MovePC(zone_id, instance_id, x, y, z, heading);
 }
 
-int Client::CountItem(uint32 item_id)
+uint32 Client::CountItem(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 quantity = 0;
 	EQ::ItemInstance *item = nullptr;
-	static const int16 slots[][2] = {
-		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
-		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
-		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
-	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
-		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
-			item = GetInv().GetItem(slot_id);
-			if (item && item->GetID() == item_id) {
-				quantity += (item->IsStackable() ? item->GetCharges() : 1);
-			}
+
+	for (const int16& slot_id : GetInventorySlots()) {
+		item = GetInv().GetItem(slot_id);
+		if (item && item->GetID() == item_id) {
+			quantity += (item->IsStackable() ? item->GetCharges() : 1);
 		}
 	}
 
@@ -10498,30 +10565,26 @@ void Client::ResetItemCooldown(uint32 item_id)
 	int recast_type = item_d->RecastType;
 	bool found_item = false;
 
-	static const int16 slots[][2] = {
-		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
-		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
-	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
-		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
-			item = GetInv().GetItem(slot_id);
-			if (item) {
-				item_d = item->GetItem();
-				if (item_d && item->GetID() == item_id || (item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM && item_d->RecastType == recast_type)) {
-					item->SetRecastTimestamp(0);
-					DeleteItemRecastTimer(item_d->ID);
-					SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
-					found_item = true;
-				}
+	for (const int16& slot_id : GetInventorySlots()) {
+		item = GetInv().GetItem(slot_id);
+		if (item) {
+			item_d = item->GetItem();
+			if (
+				item_d &&
+				item->GetID() == item_id ||
+				(
+					item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM &&
+					item_d->RecastType == recast_type
+				)
+			) {
+				item->SetRecastTimestamp(0);
+				DeleteItemRecastTimer(item_d->ID);
+				SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
+				found_item = true;
 			}
 		}
 	}
+
 	if (!found_item) {
 		DeleteItemRecastTimer(item_id); //We didn't find the item but we still want to remove the timer
 	}
@@ -10556,25 +10619,20 @@ void Client::SetItemCooldown(uint32 item_id, bool use_saved_timer, uint32 in_sec
 		final_time = total_time - current_time;
 	}
 
-	static const int16 slots[][2] = {
-		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
-		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
-	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
-		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
-			item = GetInv().GetItem(slot_id);
-			if (item) {
-				item_d = item->GetItem();
-				if (item_d && item->GetID() == item_id || (item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM && item_d->RecastType == recast_type)) {
-					item->SetRecastTimestamp(total_time);
-					SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
-				}
+	for (const int16& slot_id : GetInventorySlots()) {
+		item = GetInv().GetItem(slot_id);
+		if (item) {
+			item_d = item->GetItem();
+			if (
+				item_d &&
+				item->GetID() == item_id ||
+				(
+					item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM &&
+					item_d->RecastType == recast_type
+				)
+			) {
+				item->SetRecastTimestamp(total_time);
+				SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
 			}
 		}
 	}
@@ -10617,38 +10675,26 @@ uint32 Client::GetItemCooldown(uint32 item_id)
 
 void Client::RemoveItem(uint32 item_id, uint32 quantity)
 {
+	uint32 removed_count = 0;
 	EQ::ItemInstance *item = nullptr;
-	static const int16 slots[][2] = {
-		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
-		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
-		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-	int16 removed_count = 0;
-	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
-	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
-		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
-			if (removed_count == quantity) {
-				break;
-			}
 
-			item = GetInv().GetItem(slot_id);
-			if (item && item->GetID() == item_id) {
-				int16 charges = item->IsStackable() ? item->GetCharges() : 0;
-				int16 stack_size = std::max(charges, static_cast<int16>(1));
-				if ((removed_count + stack_size) <= quantity) {
-					removed_count += stack_size;
-					DeleteItemInInventory(slot_id, charges, true);
-				} else {
-					int16 amount_left = (quantity - removed_count);
-					if (amount_left > 0 && stack_size >= amount_left) {
-						removed_count += amount_left;
-						DeleteItemInInventory(slot_id, amount_left, true);
-					}
+	for (const int16& slot_id : GetInventorySlots()) {
+		if (removed_count == quantity) {
+			break;
+		}
+
+		item = GetInv().GetItem(slot_id);
+		if (item && item->GetID() == item_id) {
+			uint32 charges    = item->IsStackable() ? item->GetCharges() : 0;
+			uint32 stack_size = std::max(charges, static_cast<uint32>(1));
+			if ((removed_count + stack_size) <= quantity) {
+				removed_count += stack_size;
+				DeleteItemInInventory(slot_id, charges, true);
+			} else {
+				uint32 amount_left = (quantity - removed_count);
+				if (amount_left > 0 && stack_size >= amount_left) {
+					removed_count += amount_left;
+					DeleteItemInInventory(slot_id, amount_left, true);
 				}
 			}
 		}
@@ -12820,37 +12866,28 @@ uint16 Client::GetSkill(EQ::skills::SkillType skill_id) const
 void Client::RemoveItemBySerialNumber(uint32 serial_number, uint32 quantity)
 {
 	EQ::ItemInstance *item = nullptr;
-	static const int16 slots[][2] = {
-		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
-		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
-		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-	int16 removed_count = 0;
-	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
-	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
-		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
-			if (removed_count == quantity) {
-				break;
-			}
 
-			item = GetInv().GetItem(slot_id);
-			if (item && item->GetSerialNumber() == serial_number) {
-				int16 charges = item->IsStackable() ? item->GetCharges() : 0;
-				int16 stack_size = std::max(charges, static_cast<int16>(1));
-				if ((removed_count + stack_size) <= quantity) {
-					removed_count += stack_size;
-					DeleteItemInInventory(slot_id, charges, true);
-				} else {
-					int16 amount_left = (quantity - removed_count);
-					if (amount_left > 0 && stack_size >= amount_left) {
-						removed_count += amount_left;
-						DeleteItemInInventory(slot_id, amount_left, true);
-					}
+	uint32 removed_count = 0;
+
+	const auto& slot_ids = GetInventorySlots();
+
+	for (const int16& slot_id : slot_ids) {
+		if (removed_count == quantity) {
+			break;
+		}
+
+		item = GetInv().GetItem(slot_id);
+		if (item && item->GetSerialNumber() == serial_number) {
+			uint32 charges    = item->IsStackable() ? item->GetCharges() : 0;
+			uint32 stack_size = std::max(charges, static_cast<uint32>(1));
+			if ((removed_count + stack_size) <= quantity) {
+				removed_count += stack_size;
+				DeleteItemInInventory(slot_id, charges, true);
+			} else {
+				uint32 amount_left = (quantity - removed_count);
+				if (amount_left > 0 && stack_size >= amount_left) {
+					removed_count += amount_left;
+					DeleteItemInInventory(slot_id, amount_left, true);
 				}
 			}
 		}
@@ -12981,50 +13018,77 @@ void Client::SendTopLevelInventory()
 	}
 }
 
-// On a normal basis we limit mob movement updates based on distance
-// This ensures we send a periodic full zone update to a client that has started moving after 5 or so minutes
-//
-// For very large zones we will also force a full update based on distance
-//
-// We ignore a small distance around us so that we don't interrupt already pathing deltas as those npcs will appear
-// to full stop when they are actually still pathing
-void Client::CheckSendBulkClientPositionUpdate()
+void Client::CheckSendBulkNpcPositions()
 {
 	float distance_moved                      = DistanceNoZ(m_last_position_before_bulk_update, GetPosition());
-	bool  moved_far_enough_before_bulk_update = distance_moved >= zone->GetNpcPositionUpdateDistance();
+	float update_range                        = RuleI(Range, MobCloseScanDistance);
+	bool  moved_far_enough_before_bulk_update = distance_moved >= update_range;
 	bool  is_ready_to_update                  = (
-		m_client_zone_wide_full_position_update_timer.Check() || moved_far_enough_before_bulk_update
+		m_client_bulk_npc_pos_update_timer.Check() || moved_far_enough_before_bulk_update
 	);
 
-	if (IsMoving() && is_ready_to_update) {
-		LogDebug("[[{}]] Client Zone Wide Position Update NPCs", GetCleanName());
-
+	int updated_count = 0;
+	int skipped_count = 0;
+	if (is_ready_to_update) {
 		auto &mob_movement_manager = MobMovementManager::Get();
-		auto &mob_list             = entity_list.GetMobList();
 
-		for (auto &it : mob_list) {
-			Mob *entity = it.second;
-			if (!entity->IsNPC()) {
+		for (auto &e: entity_list.GetMobList()) {
+			Mob *mob = e.second;
+			if (!mob->IsNPC()) {
 				continue;
 			}
 
 			int animation_speed = 0;
-			if (entity->IsMoving()) {
-				if (entity->IsRunning()) {
-					animation_speed = (entity->IsFeared() ? entity->GetFearSpeed() : entity->GetRunspeed());
+			if (mob->IsMoving()) {
+				if (mob->IsRunning()) {
+					animation_speed = (mob->IsFeared() ? mob->GetFearSpeed() : mob->GetRunspeed());
 				}
 				else {
-					animation_speed = entity->GetWalkspeed();
+					animation_speed = mob->GetWalkspeed();
 				}
 			}
 
-			mob_movement_manager.SendCommandToClients(entity, 0.0, 0.0, 0.0, 0.0, animation_speed, ClientRangeAny, this);
+			// if we have seen this mob before, and it hasn't moved, skip it
+			if (m_last_seen_mob_position.contains(mob->GetID())) {
+				if (m_last_seen_mob_position[mob->GetID()] == mob->GetPosition()) {
+					LogPositionUpdateDetail(
+						"Mob [{}] has already been sent to client [{}] at this position, skipping",
+						mob->GetCleanName(),
+						GetCleanName()
+					);
+					skipped_count++;
+					continue;
+				}
+			}
+
+			mob_movement_manager.SendCommandToClients(
+				mob,
+				0.0,
+				0.0,
+				0.0,
+				0.0,
+				animation_speed,
+				ClientRangeAny,
+				this
+			);
+
+			updated_count++;
 		}
 
+		LogPositionUpdate(
+			"[{}] Sent [{}] bulk updated NPC positions, skipped [{}] distance_moved [{}] update_range [{}]",
+			GetCleanName(),
+			updated_count,
+			skipped_count,
+			distance_moved,
+			update_range
+		);
+
 		m_last_position_before_bulk_update = GetPosition();
 	}
 }
 
+
 const uint16 scan_npc_aggro_timer_idle   = RuleI(Aggro, ClientAggroCheckIdleInterval);
 const uint16 scan_npc_aggro_timer_moving = RuleI(Aggro, ClientAggroCheckMovingInterval);
 
@@ -13075,3 +13139,169 @@ void Client::ClientToNpcAggroProcess()
 		LogAggro("Checking Reverse Aggro (client->npc) scanned_npcs ([{}])", npc_scan_count);
 	}
 }
+
+const std::vector<int16>& Client::GetInventorySlots()
+{
+	static const std::vector<std::pair<int16, int16>> slots = {
+		{EQ::invslot::POSSESSIONS_BEGIN,     EQ::invslot::POSSESSIONS_END},
+		{EQ::invbag::GENERAL_BAGS_BEGIN,     EQ::invbag::GENERAL_BAGS_END},
+		{EQ::invbag::CURSOR_BAG_BEGIN,       EQ::invbag::CURSOR_BAG_END},
+		{EQ::invslot::BANK_BEGIN,            EQ::invslot::BANK_END},
+		{EQ::invbag::BANK_BAGS_BEGIN,        EQ::invbag::BANK_BAGS_END},
+		{EQ::invslot::SHARED_BANK_BEGIN,     EQ::invslot::SHARED_BANK_END},
+		{EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END},
+	};
+
+	static std::vector<int16> slot_ids;
+
+	if (slot_ids.empty()) {
+		for (const auto &[begin, end]: slots) {
+			for (int16 slot_id = begin; slot_id <= end; ++slot_id) {
+				slot_ids.emplace_back(slot_id);
+			}
+		}
+	}
+
+	return slot_ids;
+}
+
+void Client::ShowZoneShardMenu()
+{
+	auto z = GetZone(GetZoneID());
+	if (z && !z->shard_at_player_count) {
+		return;
+	}
+
+	auto results = CharacterDataRepository::GetInstanceZonePlayerCounts(database, GetZoneID());
+	LogZoning("Zone sharding results count [{}]", results.size());
+
+	if (results.empty()) {
+		Message(Chat::White, "No zone shards found.");
+		return;
+	}
+
+	if (!results.empty()) {
+		Message(Chat::White, "Available Zone Shards:");
+	}
+
+	int number = 1;
+	for (auto &e: results) {
+		std::string teleport_link = Saylink::Silent(
+			fmt::format("#zoneshard {} {}", e.zone_id, (e.instance_id == 0 ? -1 : e.instance_id)),
+			"Teleport"
+		);
+
+		std::string yours;
+		if (e.zone_id == GetZoneID() && e.instance_id == GetInstanceID()) {
+			teleport_link = "Teleport";
+			yours         = " (Yours)";
+		}
+
+		Message(
+			Chat::White, fmt::format(
+				" --> [{}] #{} {} ({}) [{}/{}] players {}",
+				teleport_link,
+				number,
+				z->long_name,
+				e.instance_id,
+				e.player_count,
+				z->shard_at_player_count,
+				yours
+			).c_str()
+		);
+		number++;
+	}
+}
+
+void Client::SetAAEXPPercentage(uint8 percentage)
+{
+	const uint32 before_percentage = m_epp.perAA;
+
+	if (before_percentage > 0 && percentage == 0) {
+		MessageString(Chat::White, AA_OFF);
+	}
+	else if (before_percentage == 0 && percentage > 0) {
+		MessageString(Chat::White, AA_ON);
+	}
+
+	m_epp.perAA = EQ::Clamp(static_cast<int>(percentage), 0, 100);
+
+	SendAlternateAdvancementStats();
+	SendAlternateAdvancementTable();
+}
+
+void Client::BroadcastPositionUpdate()
+{
+	EQApplicationPacket               outapp(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
+	PlayerPositionUpdateServer_Struct *spu = (PlayerPositionUpdateServer_Struct *) outapp.pBuffer;
+
+	memset(spu, 0x00, sizeof(PlayerPositionUpdateServer_Struct));
+	spu->spawn_id      = GetID();
+	spu->x_pos         = FloatToEQ19(GetX());
+	spu->y_pos         = FloatToEQ19(GetY());
+	spu->z_pos         = FloatToEQ19(GetZ());
+	spu->heading       = FloatToEQ12(GetHeading());
+	spu->delta_x       = FloatToEQ13(0);
+	spu->delta_y       = FloatToEQ13(0);
+	spu->delta_z       = FloatToEQ13(0);
+	spu->delta_heading = FloatToEQ10(0);
+	spu->animation     = 0;
+
+	entity_list.QueueCloseClients(this, &outapp, true, zone->GetClientUpdateRange());
+
+	Group *g = GetGroup();
+	if (g) {
+		for (auto &m: g->members) {
+			if (m && m->IsClient() && m != this) {
+				m->CastToClient()->QueuePacket(&outapp);
+			}
+		}
+	}
+}
+
+std::string Client::GetAccountBucket(std::string bucket_name)
+{
+	DataBucketKey k = {};
+	k.account_id   = AccountID();
+	k.key          = bucket_name;
+
+	return DataBucket::GetData(k).value;
+}
+
+void Client::SetAccountBucket(std::string bucket_name, std::string bucket_value, std::string expiration)
+{
+	DataBucketKey k = {};
+	k.account_id   = AccountID();
+	k.key          = bucket_name;
+	k.expires      = expiration;
+	k.value        = bucket_value;
+
+	DataBucket::SetData(k);
+}
+
+void Client::DeleteAccountBucket(std::string bucket_name)
+{
+	DataBucketKey k = {};
+	k.account_id   = AccountID();
+	k.key          = bucket_name;
+
+	DataBucket::DeleteData(k);
+}
+
+std::string Client::GetAccountBucketExpires(std::string bucket_name)
+{
+	DataBucketKey k = {};
+	k.account_id   = AccountID();
+	k.key          = bucket_name;
+
+	return DataBucket::GetDataExpires(k);
+}
+
+std::string Client::GetAccountBucketRemaining(std::string bucket_name)
+{
+	DataBucketKey k = {};
+	k.account_id   = AccountID();
+	k.key          = bucket_name;
+
+	return DataBucket::GetDataRemaining(k);
+}

zone/client.h

@@ -72,6 +72,7 @@ namespace EQ
 #include "../common/repositories/trader_repository.h"
 #include "../common/guild_base.h"
 #include "../common/repositories/buyer_buy_lines_repository.h"
+#include "../common/repositories/character_evolving_items_repository.h"
 
 #ifdef _WINDOWS
 	// since windows defines these within windef.h (which windows.h include)
@@ -294,7 +295,7 @@ public:
 	void SendBazaarDone(uint32 trader_id);
 	void SendBulkBazaarTraders();
 	void SendBulkBazaarBuyers();
-	void DoBazaarInspect(const BazaarInspect_Struct &in);
+	void DoBazaarInspect(BazaarInspect_Struct &in);
 	void SendBazaarDeliveryCosts();
 	static std::string DetermineMoneyString(uint64 copper);
 
@@ -306,6 +307,11 @@ public:
 	void KeyRingAdd(uint32 item_id);
 	bool KeyRingCheck(uint32 item_id);
 	void KeyRingList();
+	bool IsPetNameChangeAllowed();
+	void GrantPetNameChange();
+	void ClearPetNameChange();
+	void InvokeChangePetName(bool immediate = true);
+	bool ChangePetName(std::string new_name);
 	bool IsClient() const override { return true; }
 	bool IsOfClientBot() const override { return true; }
 	bool IsOfClientBotMerc() const override { return true; }
@@ -467,6 +473,7 @@ public:
 	inline ExtendedProfile_Struct& GetEPP() { return m_epp; }
 	inline EQ::InventoryProfile& GetInv() { return m_inv; }
 	inline const EQ::InventoryProfile& GetInv() const { return m_inv; }
+	const std::vector<int16>& GetInventorySlots();
 	inline PetInfo* GetPetInfo(int pet_info_type) { return pet_info_type == PetInfoType::Suspended ? &m_suspendedminion : &m_petinfo; }
 	inline InspectMessage_Struct& GetInspectMessage() { return m_inspect_message; }
 	inline const InspectMessage_Struct& GetInspectMessage() const { return m_inspect_message; }
@@ -691,6 +698,8 @@ public:
 	void SetAAEXPModifier(uint32 zone_id, float aa_modifier, int16 instance_version = -1);
 	void SetEXPModifier(uint32 zone_id, float exp_modifier, int16 instance_version = -1);
 
+	void SetAAEXPPercentage(uint8 percentage);
+
 	bool UpdateLDoNPoints(uint32 theme_id, int points);
 	void SetLDoNPoints(uint32 theme_id, uint32 points);
 	void SetPVPPoints(uint32 Points) { m_pp.PVPCurrentPoints = Points; }
@@ -707,13 +716,13 @@ public:
 	void SendCrystalCounts();
 
 	uint64 GetExperienceForKill(Mob *against);
-	void AddEXP(ExpSource exp_source, uint64 in_add_exp, uint8 conlevel = 0xFF, bool resexp = false);
+	void AddEXP(ExpSource exp_source, uint64 in_add_exp, uint8 conlevel = 0xFF, bool resexp = false, NPC* npc = nullptr);
 	uint64 CalcEXP(uint8 conlevel = 0xFF, bool ignore_mods = false);
 	void CalculateNormalizedAAExp(uint64 &add_aaxp, uint8 conlevel, bool resexp);
 	void CalculateStandardAAExp(uint64 &add_aaxp, uint8 conlevel, bool resexp);
 	void CalculateLeadershipExp(uint64 &add_exp, uint8 conlevel);
 	void CalculateExp(uint64 in_add_exp, uint64 &add_exp, uint64 &add_aaxp, uint8 conlevel, bool resexp);
-	void SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool resexp = false);
+	void SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool resexp = false, NPC* npc = nullptr);
 	void AddLevelBasedExp(ExpSource exp_source, uint8 exp_percentage, uint8 max_level = 0, bool ignore_mods = false);
 	void SetLeadershipEXP(uint64 group_exp, uint64 raid_exp);
 	void AddLeadershipEXP(uint64 group_exp, uint64 raid_exp);
@@ -1093,7 +1102,7 @@ public:
 	bool PushItemOnCursor(const EQ::ItemInstance& inst, bool client_update = false);
 	void SendCursorBuffer();
 	void DeleteItemInInventory(int16 slot_id, int16 quantity = 0, bool client_update = false, bool update_db = true);
-	int CountItem(uint32 item_id);
+	uint32 CountItem(uint32 item_id);
 	void ResetItemCooldown(uint32 item_id);
 	void SetItemCooldown(uint32 item_id, bool use_saved_timer = false, uint32 in_seconds = 1);
 	uint32 GetItemCooldown(uint32 item_id);
@@ -1127,6 +1136,10 @@ public:
 	void SetTrader(bool status) { trader = status; }
 	uint16 GetTraderID() { return trader_id; }
 	void SetTraderID(uint16 id) { trader_id = id; }
+	void SetTraderCount(uint32 no) { m_trader_count = no; }
+	uint32 GetTraderCount() { return m_trader_count; }
+	void IncrementTraderCount() { m_trader_count += 1; }
+	void DecrementTraderCount() { m_trader_count > 0 ? m_trader_count -= 1 : m_trader_count = 0; }
 
 	eqFilterMode GetFilter(eqFilterType filter_id) const { return ClientFilters[filter_id]; }
 	void SetFilter(eqFilterType filter_id, eqFilterMode filter_mode) { ClientFilters[filter_id] = filter_mode; }
@@ -1162,7 +1175,7 @@ public:
 	void Escape(); //keep or quest function
 	void DisenchantSummonedBags(bool client_update = true);
 	void RemoveNoRent(bool client_update = true);
-	void RemoveDuplicateLore(bool client_update = true);
+	void RemoveDuplicateLore();
 	void MoveSlotNotAllowed(bool client_update = true);
 	virtual bool RangedAttack(Mob* other, bool CanDoubleAttack = false);
 	virtual void ThrowingAttack(Mob* other, bool CanDoubleAttack = false);
@@ -1809,6 +1822,25 @@ public:
 	void RecordKilledNPCEvent(NPC *n);
 
 	uint32 GetEXPForLevel(uint16 check_level);
+
+	// Evolving Item Info
+	void ProcessEvolvingItem(const uint64 exp, const Mob* mob);
+	void SendEvolvingPacket(int8 action, const CharacterEvolvingItemsRepository::CharacterEvolvingItems &item);
+	void DoEvolveItemToggle(const EQApplicationPacket* app);
+	void DoEvolveItemDisplayFinalResult(const EQApplicationPacket* app);
+	bool DoEvolveCheckProgression(const EQ::ItemInstance &inst);
+	void SendEvolveXPWindowDetails(const EQApplicationPacket* app);
+	void DoEvolveTransferXP(const EQApplicationPacket* app);
+	void SendEvolveXPTransferWindow();
+	void SendEvolveTransferResults(const EQ::ItemInstance &inst_from, const EQ::ItemInstance &inst_to, const EQ::ItemInstance &inst_from_new, const EQ::ItemInstance &inst_to_new, const uint32 compatibility, const uint32 max_transfer_level);
+
+	// Account buckets
+	std::string GetAccountBucket(std::string bucket_name);
+	void SetAccountBucket(std::string bucket_name, std::string bucket_value, std::string expiration = "");
+	void DeleteAccountBucket(std::string bucket_name);
+	std::string GetAccountBucketExpires(std::string bucket_name);
+	std::string GetAccountBucketRemaining(std::string bucket_name);
+
 protected:
 	friend class Mob;
 	void CalcEdibleBonuses(StatBonuses* newbon);
@@ -1945,6 +1977,7 @@ private:
 	uint8 firstlogon;
 	uint32 mercid; // current merc
 	uint8 mercSlot; // selected merc slot
+	uint32                                                         m_trader_count{};
 	uint32                                                         m_buyer_id;
 	uint32                                                         m_barter_time;
 	int32                                                          m_parcel_platinum;
@@ -1967,6 +2000,8 @@ private:
 
 	uint16 m_door_tool_entity_id;
 	uint16 m_object_tool_entity_id;
+
+
 public:
 	uint16 GetDoorToolEntityId() const;
 	void SetDoorToolEntityId(uint16 door_tool_entity_id);
@@ -2064,12 +2099,13 @@ private:
 	Timer m_client_npc_aggro_scan_timer;
 	void CheckClientToNpcAggroTimer();
 	void ClientToNpcAggroProcess();
+	void BroadcastPositionUpdate();
 
 	// bulk position updates
 	glm::vec4 m_last_position_before_bulk_update;
-	Timer     m_client_zone_wide_full_position_update_timer;
+	Timer     m_client_bulk_npc_pos_update_timer;
 	Timer     m_position_update_timer;
-	void CheckSendBulkClientPositionUpdate();
+	void      CheckSendBulkNpcPositions();
 
 	void BulkSendInventoryItems();
 
@@ -2235,6 +2271,8 @@ private:
 public:
 	const std::string &GetMailKeyFull() const;
 	const std::string &GetMailKey() const;
+	void ShowZoneShardMenu();
+	void Handle_OP_ChangePetName(const EQApplicationPacket *app);
 };
 
 #endif

zone/client_evolving_items.cpp

@@ -0,0 +1,451 @@
+#include "../common/evolving_items.h"
+
+#include "../common/events/player_event_logs.h"
+#include "../common/global_define.h"
+
+#include "client.h"
+#include "string_ids.h"
+#include "worldserver.h"
+
+extern WorldServer worldserver;
+
+void Client::DoEvolveItemToggle(const EQApplicationPacket *app)
+{
+	const auto in   = reinterpret_cast<EvolveItemToggle *>(app->pBuffer);
+	auto       item = CharacterEvolvingItemsRepository::FindOne(database, in->unique_id);
+
+	LogEvolveItemDetail(
+		"Character ID <green>[{}] requested to set evolve item with unique id <yellow>[{}] to status <yellow>[{}]",
+		CharacterID(),
+		in->unique_id,
+		in->activated
+	);
+
+	if (!item.id) {
+		LogEvolveItemDetail(
+			"Character ID <green>[{}] toggle evolve item unique id <yellow>[{}] failed", CharacterID(), in->unique_id);
+		return;
+	}
+
+	item.activated  = in->activated;
+	const auto inst = GetInv().GetItem(GetInv().HasItem(item.item_id));
+	inst->SetEvolveActivated(item.activated ? true : false);
+
+	CharacterEvolvingItemsRepository::ReplaceOne(database, item);
+
+	SendEvolvingPacket(EvolvingItems::Actions::UPDATE_ITEMS, item);
+}
+
+void Client::SendEvolvingPacket(const int8 action, const CharacterEvolvingItemsRepository::CharacterEvolvingItems &item)
+{
+	auto       out  = std::make_unique<EQApplicationPacket>(OP_EvolveItem, sizeof(EvolveItemToggle));
+	const auto data = reinterpret_cast<EvolveItemToggle *>(out->pBuffer);
+
+	LogEvolveItemDetail(
+		"Character ID <green>[{}] requested info for evolving item with unique id <yellow>[{}] status <yellow>[{}] "
+		"percentage <yellow>[{}]",
+		CharacterID(),
+		item.id,
+		item.activated,
+		item.progression
+	);
+
+	data->action     = action;
+	data->unique_id  = item.id;
+	data->percentage = item.progression;
+	data->activated  = item.activated;
+
+	QueuePacket(out.get());
+
+	LogEvolveItem(
+		"Sent evolve item with unique id <yellow>[{}] status <yellow>[{}] percentage <yellow>[{}] to Character ID "
+		"<green>[{}]",
+		data->unique_id,
+		data->activated,
+		data->percentage,
+		CharacterID()
+	);
+}
+
+void Client::ProcessEvolvingItem(const uint64 exp, const Mob *mob)
+{
+	std::vector<const EQ::ItemInstance *> queue{};
+
+	for (auto &[key, inst]: GetInv().GetWorn()) {
+		LogEvolveItemDetail(
+			"CharacterID <green>[{}] found equipped item ID <yellow>[{}]", CharacterID(), inst->GetID());
+		if (!inst->IsEvolving() || !inst->GetEvolveActivated()) {
+			LogEvolveItemDetail(
+				"CharacterID <green>[{}], item ID <yellow>[{}] not an evolving item.", CharacterID(), inst->GetID());
+			continue;
+		}
+
+		if (inst->GetTimers().contains("evolve") && !inst->GetTimers().at("evolve").Check()) {
+			LogEvolveItemDetail(
+				"CharacterID <green>[{}], item ID <yellow>[{}] timer not yet expired. <red>[{}] secs remaining.",
+				CharacterID(),
+				inst->GetID(),
+				inst->GetTimers().at("evolve").GetRemainingTime() / 1000);
+			continue;
+		}
+
+		auto const type     = evolving_items_manager.GetEvolvingItemsCache().at(inst->GetID()).type;
+		auto const sub_type = evolving_items_manager.GetEvolvingItemsCache().at(inst->GetID()).sub_type;
+
+		LogEvolveItemDetail(
+			"CharacterID <green>[{}] item id <green>[{}] type {} sub_type {} is Evolving.  Continue processing...",
+			CharacterID(),
+			inst->GetID(),
+			type,
+			sub_type);
+
+		switch (type) {
+			case EvolvingItems::Types::AMOUNT_OF_EXP: {
+				LogEvolveItemDetail("Type <green>[{}] Processing sub_type", type);
+				if (sub_type == EvolvingItems::SubTypes::ALL_EXP ||
+					(sub_type == EvolvingItems::SubTypes::GROUP_EXP && IsGrouped())) {
+					LogEvolveItemDetail("Sub_Type <green>[{}] Processing Item", sub_type);
+					inst->SetEvolveAddToCurrentAmount(exp * RuleR(EvolvingItems, PercentOfGroupExperience) / 100);
+				}
+				else if (
+					sub_type == EvolvingItems::SubTypes::ALL_EXP ||
+					(sub_type == EvolvingItems::SubTypes::RAID_EXP && IsRaidGrouped())) {
+					LogEvolveItemDetail("Sub_Type <green>[{}] Processing Item", sub_type);
+					inst->SetEvolveAddToCurrentAmount(exp * RuleR(EvolvingItems, PercentOfRaidExperience) / 100);
+				}
+				else if (
+					sub_type == EvolvingItems::SubTypes::ALL_EXP || sub_type == EvolvingItems::SubTypes::SOLO_EXP) {
+					LogEvolveItemDetail("Sub_Type <green>[{}] Processing Item", sub_type);
+					inst->SetEvolveAddToCurrentAmount(exp * RuleR(EvolvingItems, PercentOfSoloExperience) / 100);
+				}
+
+				inst->CalculateEvolveProgression();
+
+				auto e = CharacterEvolvingItemsRepository::SetCurrentAmountAndProgression(
+					database, inst->GetEvolveUniqueID(), inst->GetEvolveCurrentAmount(), inst->GetEvolveProgression());
+				if (!e.id) {
+					break;
+				}
+
+				SendEvolvingPacket(EvolvingItems::Actions::UPDATE_ITEMS, e);
+
+				LogEvolveItem(
+					"Processing Complete for item id <green>[{1}] Type 1 Amount of EXP - SubType <yellow>[{0}] - "
+					"Assigned <yellow>[{2}] of exp to <green>[{1}]",
+					sub_type,
+					inst->GetID(),
+					exp * 0.001
+				);
+
+				if (inst->GetEvolveProgression() >= 100) {
+					queue.push_back(inst);
+				}
+
+				break;
+			}
+			case EvolvingItems::Types::SPECIFIC_MOB_RACE: {
+				LogEvolveItemDetail("Type <green>[{}] Processing sub type", type);
+				if (mob && mob->GetRace() == sub_type) {
+					LogEvolveItemDetail("Sub_Type <green>[{}] Processing Item", sub_type);
+					inst->SetEvolveAddToCurrentAmount(1);
+					inst->CalculateEvolveProgression();
+
+					auto e = CharacterEvolvingItemsRepository::SetCurrentAmountAndProgression(
+						database,
+						inst->GetEvolveUniqueID(),
+						inst->GetEvolveCurrentAmount(),
+						inst->GetEvolveProgression());
+					if (!e.id) {
+						break;
+					}
+
+					SendEvolvingPacket(EvolvingItems::Actions::UPDATE_ITEMS, e);
+
+					LogEvolveItem(
+						"Processing Complete for item id <green>[{1}] Type 3 Specific Mob Race - SubType <yellow>[{0}] "
+						"- Increased count by 1 for <green>[{1}]",
+						sub_type,
+						inst->GetID()
+					);
+				}
+
+				if (inst->GetEvolveProgression() >= 100) {
+					queue.push_back(inst);
+				}
+
+				break;
+			}
+			case EvolvingItems::Types::SPECIFIC_ZONE_ID: {
+				LogEvolveItemDetail("Type <green>[{}] Processing sub type", type);
+				if (mob && mob->GetZoneID() == sub_type) {
+					LogEvolveItemDetail("Sub_Type <green>[{}] Processing Item", sub_type);
+					inst->SetEvolveAddToCurrentAmount(1);
+					inst->CalculateEvolveProgression();
+
+					auto e = CharacterEvolvingItemsRepository::SetCurrentAmountAndProgression(
+						database,
+						inst->GetEvolveUniqueID(),
+						inst->GetEvolveCurrentAmount(),
+						inst->GetEvolveProgression());
+					if (!e.id) {
+						break;
+					}
+
+					SendEvolvingPacket(EvolvingItems::Actions::UPDATE_ITEMS, e);
+
+					LogEvolveItem(
+						"Processing Complete for item id <green>[{1}] Type 4 Specific Zone ID - SubType <yellow>[{0}] "
+						"- Increased count by 1 for <green>[{1}]",
+						sub_type,
+						inst->GetID()
+					);
+				}
+
+				if (inst->GetEvolveProgression() >= 100) {
+					queue.push_back(inst);
+				}
+
+				break;
+			}
+			default: {
+			}
+		}
+	}
+
+	if (!queue.empty()) {
+		for (auto const &i: queue) {
+			DoEvolveCheckProgression(*i);
+		}
+	}
+}
+
+void Client::DoEvolveItemDisplayFinalResult(const EQApplicationPacket *app)
+{
+	const auto in        = reinterpret_cast<EvolveItemToggle *>(app->pBuffer);
+
+	const uint32 item_id = static_cast<uint32>(in->unique_id & 0xFFFFFFFF);
+	if (item_id == 0) {
+		LogEvolveItem("Error - Item ID of final evolve item is blank.");
+		return;
+	}
+
+	std::unique_ptr<EQ::ItemInstance> const inst(database.CreateItem(item_id));
+
+	LogEvolveItemDetail(
+		"Character ID <green>[{}] requested to view final evolve item id <yellow>[{}] for evolve item id <yellow>[{}]",
+		CharacterID(),
+		item_id,
+		evolving_items_manager.GetFirstItemInLoreGroupByItemID(item_id));
+
+	inst->SetEvolveProgression(100);
+
+	if (inst) {
+		LogEvolveItemDetail(
+			"Sending final result for item id <yellow>[{}] to Character ID <green>[{}]", item_id, CharacterID());
+		SendItemPacket(0, inst.get(), ItemPacketViewLink);
+	}
+}
+
+bool Client::DoEvolveCheckProgression(const EQ::ItemInstance &inst)
+{
+	if (inst.GetEvolveProgression() < 100 || inst.GetEvolveLvl() == inst.GetMaxEvolveLvl()) {
+		return false;
+	}
+
+	const auto new_item_id = evolving_items_manager.GetNextEvolveItemID(inst);
+	if (!new_item_id) {
+		return false;
+	}
+
+	std::unique_ptr<EQ::ItemInstance> const new_inst(database.CreateItem(new_item_id));
+
+	PlayerEvent::EvolveItem e{};
+
+	RemoveItemBySerialNumber(inst.GetSerialNumber());
+	evolving_items_manager.LoadPlayerEvent(inst, e);
+	e.status = "Evolved Item due to obtaining progression - Old Evolve Item removed from inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	PushItemOnCursor(*new_inst, true);
+	evolving_items_manager.LoadPlayerEvent(*new_inst, e);
+	e.status = "Evolved Item due to obtaining progression - New Evolve Item placed in inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	MessageString(Chat::Yellow, EVOLVE_ITEM_EVOLVED, inst.GetItem()->Name);
+
+	LogEvolveItem(
+		"Evolved item id <red>[{}] into item id <green>[{}] for Character ID <green>[{}]",
+		inst.GetID(),
+		new_inst->GetID(),
+		CharacterID());
+
+	return true;
+}
+
+void Client::SendEvolveXPTransferWindow()
+{
+	auto       out  = std::make_unique<EQApplicationPacket>(OP_EvolveItem, sizeof(EvolveItemToggle));
+	const auto data = reinterpret_cast<EvolveItemToggle *>(out->pBuffer);
+
+	data->action    = 1;
+
+	QueuePacket(out.get());
+}
+
+void Client::SendEvolveXPWindowDetails(const EQApplicationPacket *app)
+{
+	const auto in = reinterpret_cast<EvolveXPWindowReceive *>(app->pBuffer);
+
+	const auto item_1_slot =
+		GetInv().HasEvolvingItem(in->item1_unique_id, 1, invWherePersonal | invWhereWorn | invWhereCursor);
+	const auto item_2_slot =
+		GetInv().HasEvolvingItem(in->item2_unique_id, 1, invWherePersonal | invWhereWorn | invWhereCursor);
+
+	if (item_1_slot == INVALID_INDEX || item_2_slot == INVALID_INDEX) {
+		return;
+	}
+
+	const auto inst_from = GetInv().GetItem(item_1_slot);
+	const auto inst_to   = GetInv().GetItem(item_2_slot);
+
+	if (!inst_from || !inst_to) {
+		return;
+	}
+
+	const auto results = evolving_items_manager.DetermineTransferResults(*inst_from, *inst_to);
+
+	if (!results.item_from_id || !results.item_to_id) {
+		SendEvolveTransferResults(*inst_from, *inst_to, *inst_from, *inst_to, 0, 0);
+		return;
+	}
+
+	std::unique_ptr<EQ::ItemInstance> const inst_from_new(database.CreateItem(results.item_from_id));
+	std::unique_ptr<EQ::ItemInstance> const inst_to_new(database.CreateItem(results.item_to_id));
+	if (!inst_from_new || !inst_to_new) {
+		SendEvolveTransferResults(*inst_from, *inst_to, *inst_from, *inst_to, 0, 0);
+		return;
+	}
+
+	inst_from_new->SetEvolveCurrentAmount(results.item_from_current_amount);
+	inst_from_new->CalculateEvolveProgression();
+	inst_to_new->SetEvolveCurrentAmount(results.item_to_current_amount);
+	inst_to_new->CalculateEvolveProgression();
+
+	SendEvolveTransferResults(
+		*inst_from, *inst_to, *inst_from_new, *inst_to_new, results.compatibility, results.max_transfer_level);
+}
+
+void Client::DoEvolveTransferXP(const EQApplicationPacket *app)
+{
+	const auto in = reinterpret_cast<EvolveXPWindowReceive *>(app->pBuffer);
+
+	const auto item_1_slot =
+		GetInv().HasEvolvingItem(in->item1_unique_id, 1, invWherePersonal | invWhereWorn | invWhereCursor);
+	const auto item_2_slot =
+		GetInv().HasEvolvingItem(in->item2_unique_id, 1, invWherePersonal | invWhereWorn | invWhereCursor);
+
+	if (item_1_slot == INVALID_INDEX || item_2_slot == INVALID_INDEX) {
+		return;
+	}
+
+	const auto inst_from = GetInv().GetItem(item_1_slot);
+	const auto inst_to   = GetInv().GetItem(item_2_slot);
+
+	if (!inst_from || !inst_to) {
+		Message(Chat::Red, "Transfer Failed.  Incompatible Items.");
+		LogEvolveItem("Transfer Failed for Character ID <green>[{}]", CharacterID());
+		return;
+	}
+
+	const auto results = evolving_items_manager.DetermineTransferResults(*inst_from, *inst_to);
+
+	if (!results.item_from_id || !results.item_to_id) {
+		Message(Chat::Red, "Transfer Failed.  Incompatible Items.");
+		LogEvolveItem("Transfer Failed for Character ID <green>[{}]", CharacterID());
+		return;
+	}
+
+	std::unique_ptr<const EQ::ItemInstance> const inst_from_new(database.CreateItem(results.item_from_id));
+	std::unique_ptr<const EQ::ItemInstance> const inst_to_new(database.CreateItem(results.item_to_id));
+
+	if (!inst_from_new || !inst_to_new) {
+		Message(Chat::Red, "Transfer Failed.  Incompatible Items.");
+		LogEvolveItem("Transfer Failed for Character ID <green>[{}]", CharacterID());
+		return;
+	}
+
+	inst_from_new->SetEvolveCurrentAmount(results.item_from_current_amount);
+	inst_from_new->CalculateEvolveProgression();
+	inst_to_new->SetEvolveCurrentAmount(results.item_to_current_amount);
+	inst_to_new->CalculateEvolveProgression();
+
+	PlayerEvent::EvolveItem e{};
+
+	RemoveItemBySerialNumber(inst_from->GetSerialNumber());
+	evolving_items_manager.LoadPlayerEvent(*inst_from, e);
+	e.status = "Transfer XP - Original FROM Evolve Item removed from inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	PushItemOnCursor(*inst_from_new, true);
+	evolving_items_manager.LoadPlayerEvent(*inst_from_new, e);
+	e.status = "Transfer XP - Updated FROM item placed in inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	RemoveItemBySerialNumber(inst_to->GetSerialNumber());
+	evolving_items_manager.LoadPlayerEvent(*inst_to, e);
+	e.status = "Transfer XP - Original TO Evolve Item removed from inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	PushItemOnCursor(*inst_to_new, true);
+	evolving_items_manager.LoadPlayerEvent(*inst_to_new, e);
+	e.status = "Transfer XP - Updated TO Evolve item placed in inventory.";
+	RecordPlayerEventLog(PlayerEvent::EVOLVE_ITEM, e);
+
+	LogEvolveItem(
+		"Evolve Transfer XP resulted in evolved item id <red>[{}] into item id <green>[{}] for Character ID "
+		"<green>[{}]",
+		inst_to->GetID(),
+		inst_to_new->GetID(),
+		CharacterID()
+	);
+}
+
+void Client::SendEvolveTransferResults(
+	const EQ::ItemInstance &inst_from,
+	const EQ::ItemInstance &inst_to,
+	const EQ::ItemInstance &inst_from_new,
+	const EQ::ItemInstance &inst_to_new,
+	const uint32            compatibility,
+	const uint32            max_transfer_level)
+{
+	std::stringstream           ss;
+	cereal::BinaryOutputArchive ar(ss);
+
+	EvolveXPWindowSend e{};
+	e.action             = EvolvingItems::Actions::TRANSFER_WINDOW_DETAILS;
+	e.compatibility      = compatibility;
+	e.item1_unique_id    = inst_from.GetEvolveUniqueID();
+	e.item2_unique_id    = inst_to.GetEvolveUniqueID();
+	e.max_transfer_level = max_transfer_level;
+	e.item1_present      = 1;
+	e.item2_present      = 1;
+	e.serialize_item_1   = inst_from_new.Serialize(0);
+	e.serialize_item_2   = inst_to_new.Serialize(0);
+
+	{
+		ar(e);
+	}
+
+	uint32 packet_size = sizeof(EvolveItemMessaging) + ss.str().length();
+
+	std::unique_ptr<EQApplicationPacket> out(new EQApplicationPacket(OP_EvolveItem, packet_size));
+	const auto                           data = reinterpret_cast<EvolveItemMessaging *>(out->pBuffer);
+
+	data->action                              = EvolvingItems::Actions::TRANSFER_WINDOW_DETAILS;
+	memcpy(data->serialized_data, ss.str().data(), ss.str().length());
+
+	QueuePacket(out.get());
+
+	ss.str("");
+	ss.clear();
+}

zone/client_packet.cpp

@@ -66,6 +66,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/repositories/character_corpses_repository.h"
 #include "../common/repositories/guild_tributes_repository.h"
 #include "../common/repositories/buyer_buy_lines_repository.h"
+#include "../common/repositories/character_pet_name_repository.h"
 
 #include "../common/events/player_event_logs.h"
 #include "../common/repositories/character_stats_record_repository.h"
@@ -80,7 +81,6 @@ extern PetitionList petition_list;
 extern EntityList entity_list;
 typedef void (Client::*ClientPacketProc)(const EQApplicationPacket *app);
 
-
 //Use a map for connecting opcodes since it dosent get used a lot and is sparse
 std::map<uint32, ClientPacketProc> ConnectingOpcodes;
 //Use a static array for connected, for speed
@@ -161,6 +161,7 @@ void MapOpcodes()
 	ConnectedOpcodes[OP_CancelTrade] = &Client::Handle_OP_CancelTrade;
 	ConnectedOpcodes[OP_CastSpell] = &Client::Handle_OP_CastSpell;
 	ConnectedOpcodes[OP_ChannelMessage] = &Client::Handle_OP_ChannelMessage;
+	ConnectedOpcodes[OP_ChangePetName] = &Client::Handle_OP_ChangePetName;
 	ConnectedOpcodes[OP_ClearBlockedBuffs] = &Client::Handle_OP_ClearBlockedBuffs;
 	ConnectedOpcodes[OP_ClearNPCMarks] = &Client::Handle_OP_ClearNPCMarks;
 	ConnectedOpcodes[OP_ClearSurname] = &Client::Handle_OP_ClearSurname;
@@ -208,6 +209,7 @@ void MapOpcodes()
 	ConnectedOpcodes[OP_Emote] = &Client::Handle_OP_Emote;
 	ConnectedOpcodes[OP_EndLootRequest] = &Client::Handle_OP_EndLootRequest;
 	ConnectedOpcodes[OP_EnvDamage] = &Client::Handle_OP_EnvDamage;
+	ConnectedOpcodes[OP_EvolveItem] = &Client::Handle_OP_EvolveItem;
 	ConnectedOpcodes[OP_FaceChange] = &Client::Handle_OP_FaceChange;
 	ConnectedOpcodes[OP_FeignDeath] = &Client::Handle_OP_FeignDeath;
 	ConnectedOpcodes[OP_FindPersonRequest] = &Client::Handle_OP_FindPersonRequest;
@@ -283,6 +285,7 @@ void MapOpcodes()
 	ConnectedOpcodes[OP_ItemLinkResponse] = &Client::Handle_OP_ItemLinkResponse;
 	ConnectedOpcodes[OP_ItemName] = &Client::Handle_OP_ItemName;
 	ConnectedOpcodes[OP_ItemPreview] = &Client::Handle_OP_ItemPreview;
+	ConnectedOpcodes[OP_ItemPreviewRequest] = &Client::Handle_OP_ItemPreviewRequest;
 	ConnectedOpcodes[OP_ItemVerifyRequest] = &Client::Handle_OP_ItemVerifyRequest;
 	ConnectedOpcodes[OP_ItemViewUnknown] = &Client::Handle_OP_Ignore;
 	ConnectedOpcodes[OP_Jump] = &Client::Handle_OP_Jump;
@@ -339,6 +342,7 @@ void MapOpcodes()
 	ConnectedOpcodes[OP_PlayerStateAdd] = &Client::Handle_OP_PlayerStateAdd;
 	ConnectedOpcodes[OP_PlayerStateRemove] = &Client::Handle_OP_PlayerStateRemove;
 	ConnectedOpcodes[OP_PickPocket] = &Client::Handle_OP_PickPocket;
+	ConnectedOpcodes[OP_PickZone] = &Client::Handle_OP_PickZone;
 	ConnectedOpcodes[OP_PopupResponse] = &Client::Handle_OP_PopupResponse;
 	ConnectedOpcodes[OP_PotionBelt] = &Client::Handle_OP_PotionBelt;
 	ConnectedOpcodes[OP_PurchaseLeadershipAA] = &Client::Handle_OP_PurchaseLeadershipAA;
@@ -818,6 +822,10 @@ void Client::CompleteConnect()
 				CharacterID()
 			)
 		);
+
+		if (IsPetNameChangeAllowed()) {
+			InvokeChangePetName(false);
+		}
 	}
 
 	if(ClientVersion() == EQ::versions::ClientVersion::RoF2 && RuleB(Parcel, EnableParcelMerchants)) {
@@ -860,7 +868,7 @@ void Client::CompleteConnect()
 	if (IsInAGuild()) {
 		if (firstlogon == 1) {
 			guild_mgr.UpdateDbMemberOnline(CharacterID(), true);
-			guild_mgr.SendToWorldSendGuildMembersList(GuildID());
+			SendGuildMembersList();
 		}
 
 		guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), zone->GetZoneID(), time(nullptr));
@@ -941,6 +949,11 @@ void Client::CompleteConnect()
 		ShowDevToolsMenu();
 	}
 
+	auto z = GetZone(GetZoneID(), GetInstanceVersion());
+	if (z && z->shard_at_player_count > 0 && !RuleB(Zone, ZoneShardQuestMenuOnly)) {
+		ShowZoneShardMenu();
+	}
+
 	// shared tasks memberlist
 	if (RuleB(TaskSystem, EnableTaskSystem) && GetTaskState()->HasActiveSharedTask()) {
 
@@ -964,6 +977,16 @@ void Client::CompleteConnect()
 	RecordStats();
 	AutoGrantAAPoints();
 
+	// set initial position for mob tracking
+	m_last_seen_mob_position.reserve(entity_list.GetMobList().size());
+	for (auto& mob : entity_list.GetMobList()) {
+		if (!mob.second->IsNPC()) {
+			continue;
+		}
+
+		m_last_seen_mob_position[mob.second->GetID()] = mob.second->GetPosition();
+	}
+
 	// enforce some rules..
 	if (!CanEnterZone()) {
 		LogInfo("Kicking character [{}] from zone, not allowed here (missing requirements)", GetCleanName());
@@ -1303,7 +1326,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	// set to full support in case they're a gm with items in disabled expansion slots...but, have their gm flag off...
 	// item loss will occur when they use the 'empty' slots, if this is not done
 	m_inv.SetGMInventory(true);
-	loaditems = database.GetInventory(cid, &m_inv); /* Load Character Inventory */
+	loaditems = database.GetInventory(this); /* Load Character Inventory */
 	database.LoadCharacterBandolier(cid, &m_pp); /* Load Character Bandolier */
 	database.LoadCharacterBindPoint(cid, &m_pp); /* Load Character Bind */
 	database.LoadCharacterMaterialColor(cid, &m_pp); /* Load Character Material */
@@ -1858,8 +1881,9 @@ void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 		PurchaseAlternateAdvancementRank(action->ability);
 	}
 	else if (action->action == aaActionDisableEXP) { //Turn Off AA Exp
-		if (m_epp.perAA > 0)
+		if (m_epp.perAA > 0) {
 			MessageString(Chat::White, AA_OFF);
+		}
 
 		m_epp.perAA = 0;
 		SendAlternateAdvancementStats();
@@ -3228,11 +3252,11 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (!new_aug) { // Shouldn't get the OP code without the augment on the user's cursor, but maybe it's h4x.
 					LogError("AugmentItem OpCode with 'Insert' or 'Swap' action received, but no augment on client's cursor");
 					Message(Chat::Red, "Error: No augment found on cursor for inserting.");
-					return;
+					break;
 				} else {
 					if (!RuleB(Inventory, AllowMultipleOfSameAugment) && tobe_auged->ContainsAugmentByID(new_aug->GetID())) {
 						Message(Chat::Red, "Error: Cannot put multiple of the same augment in an item.");
-						return;
+						break;
 					}
 
 					if (
@@ -3316,7 +3340,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 									in_augment->augment_index
 								).c_str()
 							);
-							return;
+							break;
 						}
 
 						item_one_to_push = tobe_auged->Clone();
@@ -3388,7 +3412,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					}
 				} else {
 					Message(Chat::Red, "Error: Could not find augmentation to remove at index %i. Aborting.", in_augment->augment_index);
-					return;
+					break;
 				}
 
 				old_aug = tobe_auged->RemoveAugment(in_augment->augment_index);
@@ -3421,7 +3445,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					if (!PutItemInInventory(EQ::invslot::slotCursor, *item_two_to_push, true)) {
 						LogError("Problem returning augment to player's cursor after safe removal");
 						Message(Chat::Yellow, "Error: Failed to return augment after removal from item!");
-						return;
+						break;
 					}
 				}
 				break;
@@ -3466,7 +3490,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 							in_augment->augment_index
 						).c_str()
 					);
-					return;
+					break;
 				}
 
 				tobe_auged->DeleteAugment(in_augment->augment_index);
@@ -3487,6 +3511,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				if (material != EQ::textures::materialInvalid) {
 					SendWearChange(material);
 				}
+
 				break;
 			default: // Unknown
 				LogInventory(
@@ -3500,9 +3525,12 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				);
 				break;
 		}
+		safe_delete(item_one_to_push);
+		safe_delete(item_two_to_push);
 	} else {
 		Object::HandleAugmentation(this, in_augment, m_tradeskill_object); // Delegate to tradeskill object to perform combine
 	}
+
 	return;
 }
 
@@ -4550,6 +4578,27 @@ void Client::Handle_OP_ChannelMessage(const EQApplicationPacket *app)
 	return;
 }
 
+void Client::Handle_OP_ChangePetName(const EQApplicationPacket *app) {
+	if (app->size != sizeof(ChangePetName_Struct)) {
+		LogError("Got OP_ChangePetName of incorrect size. Expected [{}], got [{}].", sizeof(ChangePetName_Struct), app->size);
+		return;
+	}
+
+	auto p = (ChangePetName_Struct *) app->pBuffer;
+	if (!IsPetNameChangeAllowed()) {
+		p->response_code = ChangePetNameResponse::NotEligible;
+		QueuePacket(app);
+		return;
+	}
+
+	p->response_code = ChangePetNameResponse::Denied;
+	if (ChangePetName(p->new_pet_name)) {
+		p->response_code = ChangePetNameResponse::Accepted;
+	}
+
+	QueuePacket(app);
+}
+
 void Client::Handle_OP_ClearBlockedBuffs(const EQApplicationPacket *app)
 {
 	if (!RuleB(Spells, EnableBlockedBuffs))
@@ -4948,7 +4997,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 		CheckScanCloseMobsMovingTimer();
 	}
 
-	CheckSendBulkClientPositionUpdate();
+	CheckSendBulkNpcPositions();
 
 	int32 new_animation = ppu->animation;
 
@@ -7937,6 +7986,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	SetGuildID(new_guild_id);
 	SendGuildList();
 	guild_mgr.MemberAdd(new_guild_id, CharacterID(), GetLevel(), GetClass(), GUILD_LEADER, GetZoneID(), GetName());
+	guild_mgr.SendGuildRefresh(new_guild_id, true, true, true, true);
 	guild_mgr.SendToWorldSendGuildList();
 	SendGuildSpawnAppearance();
 
@@ -9292,6 +9342,30 @@ void Client::Handle_OP_ItemPreview(const EQApplicationPacket *app)
 		return;
 }
 
+void Client::Handle_OP_ItemPreviewRequest(const EQApplicationPacket* app)
+{
+	VERIFY_PACKET_LENGTH(OP_ItemPreviewRequest, app, ItemPreview_Struct);
+	auto ips  = (ItemPreview_Struct*) app->pBuffer;
+	const EQ::ItemData* item = database.GetItem(ips->itemid);
+
+	if (item) {
+		EQ::ItemInstance* inst = database.CreateItem(item);
+		if (inst) {
+			std::string packet = inst->Serialize(-1);
+			auto        outapp = new EQApplicationPacket(OP_ItemPreviewRequest, packet.length());
+			memcpy(outapp->pBuffer, packet.c_str(), packet.length());
+
+#if EQDEBUG >= 9
+			DumpPacket(outapp);
+#endif
+
+			QueuePacket(outapp);
+			safe_delete(outapp);
+			safe_delete(inst);
+		}
+	}
+}
+
 void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 {
 	using EQ::spells::CastingSlot;
@@ -10740,7 +10814,12 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 			InterrogateInventory(this, true, false, true, error);
 	}
 
-	return;
+	for (int slot : {mi->to_slot, mi->from_slot}) {
+		auto item = GetInv().GetItem(slot);
+		if (item && item->IsEvolving()) {
+			CharacterEvolvingItemsRepository::UpdateOne(database, item->GetEvolvingDetails());
+		}
+	}
 }
 
 void Client::Handle_OP_MoveMultipleItems(const EQApplicationPacket *app)
@@ -10807,6 +10886,7 @@ void Client::Handle_OP_MoveMultipleItems(const EQApplicationPacket *app)
 						InterrogateInventory(this, true, false, true, error);
 					}
 				}
+				safe_delete(mi);
 			}
 		// This is the swap.
 		// Client behavior is just to move stacks without combining them
@@ -11838,6 +11918,17 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app)
 	SendPickPocketResponse(victim, 0, PickPocketFailed);
 }
 
+void Client::Handle_OP_PickZone(const EQApplicationPacket *app)
+{
+	if (app->size != sizeof(PickZone_Struct)) {
+		LogDebug("Size mismatch in OP_PickZone expected [{}] got [{}]", sizeof(PickZone_Struct), app->size);
+		DumpPacket(app);
+		return;
+	}
+
+	// handle
+}
+
 void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 {
 
@@ -15511,6 +15602,26 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
 	// Client has elected to buy an item from a Trader
 	//
 	auto in     = (TraderBuy_Struct *) app->pBuffer;
+
+	if (RuleB(Bazaar, UseAlternateBazaarSearch) && in->trader_id >= TraderRepository::TRADER_CONVERT_ID) {
+		auto trader = TraderRepository::GetTraderByInstanceAndSerialnumber(
+			database,
+			in->trader_id - TraderRepository::TRADER_CONVERT_ID,
+			in->serial_number
+		);
+
+		if (!trader.trader_id) {
+			LogTrading("Unable to convert trader id for {} and serial number {}.  Trader Buy aborted.",
+				in->trader_id - TraderRepository::TRADER_CONVERT_ID,
+				in->serial_number
+			);
+			return;
+		}
+
+		in->trader_id = trader.trader_id;
+		strn0cpy(in->seller_name, trader.trader_name.c_str(), sizeof(in->seller_name));
+	}
+
 	auto trader = entity_list.GetClientByID(in->trader_id);
 
 	switch (in->method) {
@@ -17146,3 +17257,37 @@ void Client::Handle_OP_ShopRetrieveParcel(const EQApplicationPacket *app)
     auto parcel_in = (ParcelRetrieve_Struct *)app->pBuffer;
     DoParcelRetrieve(*parcel_in);
 }
+
+void Client::Handle_OP_EvolveItem(const EQApplicationPacket *app)
+{
+	if (app->size != sizeof(EvolveItemToggle)) {
+		LogError(
+			"Received Handle_OP_EvolveItem packet. Expected size {}, received size {}.",
+			sizeof(EvolveItemToggle),
+			app->size
+		);
+		return;
+	}
+
+	auto in = reinterpret_cast<EvolveItemToggle *>(app->pBuffer);
+
+	switch (in->action) {
+		case EvolvingItems::Actions::UPDATE_ITEMS: {
+			DoEvolveItemToggle(app);
+			break;
+		}
+		case EvolvingItems::Actions::FINAL_RESULT: {
+			DoEvolveItemDisplayFinalResult(app);
+			break;
+		}
+		case EvolvingItems::Actions::TRANSFER_XP: {
+			DoEvolveTransferXP(app);
+			break;
+		}
+		case EvolvingItems::Actions::TRANSFER_WINDOW_DETAILS: {
+			SendEvolveXPWindowDetails(app);
+		}
+		default: {
+		}
+	}
+}

zone/client_packet.h

@@ -114,6 +114,7 @@
 	void Handle_OP_Emote(const EQApplicationPacket *app);
 	void Handle_OP_EndLootRequest(const EQApplicationPacket *app);
 	void Handle_OP_EnvDamage(const EQApplicationPacket *app);
+	void Handle_OP_EvolveItem(const EQApplicationPacket *app);
 	void Handle_OP_FaceChange(const EQApplicationPacket *app);
 	void Handle_OP_FeignDeath(const EQApplicationPacket *app);
 	void Handle_OP_FindPersonRequest(const EQApplicationPacket *app);
@@ -188,6 +189,7 @@
 	void Handle_OP_ItemLinkResponse(const EQApplicationPacket *app);
 	void Handle_OP_ItemName(const EQApplicationPacket *app);
 	void Handle_OP_ItemPreview(const EQApplicationPacket *app);
+	void Handle_OP_ItemPreviewRequest(const EQApplicationPacket *app);
 	void Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app);
 	void Handle_OP_Jump(const EQApplicationPacket *app);
 	void Handle_OP_KeyRing(const EQApplicationPacket *app);
@@ -242,6 +244,7 @@
 	void Handle_OP_PlayerStateAdd(const EQApplicationPacket *app);
 	void Handle_OP_PlayerStateRemove(const EQApplicationPacket *app);
 	void Handle_OP_PickPocket(const EQApplicationPacket *app);
+	void Handle_OP_PickZone(const EQApplicationPacket *app);
 	void Handle_OP_PopupResponse(const EQApplicationPacket *app);
 	void Handle_OP_PotionBelt(const EQApplicationPacket *app);
 	void Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app);

zone/client_process.cpp

@@ -122,7 +122,7 @@ bool Client::Process() {
 
 		/* I haven't naturally updated my position in 10 seconds, updating manually */
 		if (!IsMoving() && m_position_update_timer.Check()) {
-			SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0);
+			BroadcastPositionUpdate();
 		}
 
 		if (mana_timer.Check())
@@ -179,7 +179,7 @@ bool Client::Process() {
 			}
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
+				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
 			}
 
 			SetDynamicZoneMemberStatus(DynamicZoneMemberStatus::Offline);
@@ -202,7 +202,7 @@ bool Client::Process() {
 			Save();
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
+				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
 			}
 
 			if (GetMerc())
@@ -578,7 +578,7 @@ bool Client::Process() {
 			}
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
+				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
 			}
 
 			return false;
@@ -764,7 +764,7 @@ void Client::BulkSendInventoryItems()
 		RemoveNoRent(false);
 	}
 
-	RemoveDuplicateLore(false);
+	RemoveDuplicateLore();
 	MoveSlotNotAllowed(false);
 
 	EQ::OutBuffer ob;

zone/command.cpp

@@ -126,6 +126,7 @@ int command_init(void)
 		command_add("enablerecipe", "[Recipe ID] - Enables a Recipe", AccountStatus::QuestTroupe, command_enablerecipe) ||
 		command_add("entityvariable", "[clear|delete|set|view] - Modify entity variables for yourself or your target", AccountStatus::GMAdmin, command_entityvariable) ||
 		command_add("exptoggle", "[Toggle] - Toggle your or your target's experience gain.", AccountStatus::QuestTroupe, command_exptoggle) ||
+		command_add("evolve", "Evolving Item manipulation commands. Use argument help for more info.", AccountStatus::Steward, command_evolvingitems) ||
 		command_add("faction", "[Find (criteria | all ) | Review (criteria | all) | Reset (id)] - Resets Player's Faction", AccountStatus::QuestTroupe, command_faction) ||
 		command_add("factionassociation", "[factionid] [amount] - triggers a faction hits via association", AccountStatus::GMLeadAdmin, command_faction_association) ||
 		command_add("feature", "Change your or your target's feature's temporarily", AccountStatus::QuestTroupe, command_feature) ||
@@ -243,6 +244,7 @@ int command_init(void)
 		command_add("zone", "[Zone ID|Zone Short Name] [X] [Y] [Z] - Teleport to specified Zone by ID or Short Name (coordinates are optional)", AccountStatus::Guide, command_zone) ||
 		command_add("zonebootup", "[ZoneServerID] [shortname] - Make a zone server boot a specific zone", AccountStatus::GMLeadAdmin, command_zonebootup) ||
 		command_add("zoneinstance", "[Instance ID] [X] [Y] [Z] - Teleport to specified Instance by ID (coordinates are optional)", AccountStatus::Guide, command_zone_instance) ||
+		command_add("zoneshard", "[zone] [instance_id] - Teleport explicitly to a zone shard", AccountStatus::Player, command_zone_shard) ||
 		command_add("zoneshutdown", "[shortname] - Shut down a zone server", AccountStatus::GMLeadAdmin, command_zoneshutdown) ||
 		command_add("zsave", " Saves zheader to the database", AccountStatus::QuestTroupe, command_zsave)
 	) {
@@ -825,6 +827,7 @@ void command_bot(Client *c, const Seperator *sep)
 #include "gm_commands/entityvariable.cpp"
 #include "gm_commands/exptoggle.cpp"
 #include "gm_commands/faction.cpp"
+#include "gm_commands/evolving_items.cpp"
 #include "gm_commands/feature.cpp"
 #include "gm_commands/find.cpp"
 #include "gm_commands/fish.cpp"
@@ -936,4 +939,5 @@ void command_bot(Client *c, const Seperator *sep)
 #include "gm_commands/zonebootup.cpp"
 #include "gm_commands/zoneshutdown.cpp"
 #include "gm_commands/zone_instance.cpp"
+#include "gm_commands/zone_shard.cpp"
 #include "gm_commands/zsave.cpp"

zone/command.h

@@ -38,6 +38,7 @@ void SendShowInventorySubCommands(Client *c);
 void SendFixMobSubCommands(Client *c);
 void SendDataBucketsSubCommands(Client *c);
 void SendParcelsSubCommands(Client *c);
+void SendEvolvingItemsSubCommands(Client *c);
 
 // Commands
 void command_acceptrules(Client *c, const Seperator *sep);
@@ -80,6 +81,7 @@ void command_emptyinventory(Client *c, const Seperator *sep);
 void command_enablerecipe(Client *c, const Seperator *sep);
 void command_entityvariable(Client *c, const Seperator *sep);
 void command_exptoggle(Client *c, const Seperator *sep);
+void command_evolvingitems(Client *c, const Seperator *sep);
 void command_faction(Client *c, const Seperator *sep);
 void command_faction_association(Client *c, const Seperator *sep);
 void command_feature(Client *c, const Seperator *sep);
@@ -195,6 +197,7 @@ void command_wpadd(Client *c, const Seperator *sep);
 void command_worldwide(Client *c, const Seperator *sep);
 void command_zone(Client *c, const Seperator *sep);
 void command_zone_instance(Client *c, const Seperator *sep);
+void command_zone_shard(Client *c, const Seperator *sep);
 void command_zonebootup(Client *c, const Seperator *sep);
 void command_zoneshutdown(Client *c, const Seperator *sep);
 void command_zopp(Client *c, const Seperator *sep);

zone/corpse.cpp

@@ -1871,9 +1871,10 @@ bool Corpse::HasItem(uint32 item_id)
 	return false;
 }
 
-uint16 Corpse::CountItem(uint32 item_id)
+uint32 Corpse::CountItem(uint32 item_id)
 {
-	uint16 item_count = 0;
+	uint32 item_count = 0;
+
 	if (!database.GetItem(item_id)) {
 		return item_count;
 	}
@@ -1893,6 +1894,7 @@ uint16 Corpse::CountItem(uint32 item_id)
 			item_count += i->charges > 0 ? i->charges : 1;
 		}
 	}
+
 	return item_count;
 }
 

zone/corpse.h

@@ -196,7 +196,7 @@ public:
 	/* Corpse: Loot */
 	void QueryLoot(Client *to);
 	bool HasItem(uint32 item_id);
-	uint16 CountItem(uint32 item_id);
+	uint32 CountItem(uint32 item_id);
 	uint32 GetItemIDBySlot(uint16 loot_slot);
 	uint16 GetFirstLootSlotByItemID(uint32 item_id);
 	std::vector<int> GetLootList();

zone/data_bucket.cpp

@@ -16,6 +16,7 @@ void DataBucket::SetData(const std::string &bucket_key, const std::string &bucke
 		.key = bucket_key,
 		.value = bucket_value,
 		.expires = expires_time,
+		.account_id = 0,
 		.character_id = 0,
 		.npc_id = 0,
 		.bot_id = 0
@@ -37,6 +38,9 @@ void DataBucket::SetData(const DataBucketKey &k)
 	if (k.character_id > 0) {
 		b.character_id = k.character_id;
 	}
+	else if (k.account_id > 0) {
+		b.account_id = k.account_id;
+	}
 	else if (k.npc_id > 0) {
 		b.npc_id = k.npc_id;
 	}
@@ -95,9 +99,10 @@ std::string DataBucket::GetData(const std::string &bucket_key)
 DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, bool ignore_misses_cache)
 {
 	LogDataBuckets(
-		"Getting bucket key [{}] bot_id [{}] character_id [{}] npc_id [{}]",
+		"Getting bucket key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}]",
 		k.key,
 		k.bot_id,
+		k.account_id,
 		k.character_id,
 		k.npc_id
 	);
@@ -151,6 +156,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 					.key_ = k.key,
 					.value = "",
 					.expires = 0,
+					.account_id = k.account_id,
 					.character_id = k.character_id,
 					.npc_id = k.npc_id,
 					.bot_id = k.bot_id
@@ -158,8 +164,9 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 			);
 
 			LogDataBuckets(
-				"Key [{}] not found in database, adding to cache as a miss character_id [{}] npc_id [{}] bot_id [{}] cache size before [{}] after [{}]",
+				"Key [{}] not found in database, adding to cache as a miss account_id [{}] character_id [{}] npc_id [{}] bot_id [{}] cache size before [{}] after [{}]",
 				k.key,
+				k.account_id,
 				k.character_id,
 				k.npc_id,
 				k.bot_id,
@@ -216,8 +223,6 @@ bool DataBucket::DeleteData(const std::string &bucket_key)
 // GetDataBuckets bulk loads all data buckets for a mob
 bool DataBucket::GetDataBuckets(Mob *mob)
 {
-	DataBucketLoadType::Type t{};
-
 	const uint32 id = mob->GetMobTypeIdentifier();
 
 	if (!id) {
@@ -225,14 +230,13 @@ bool DataBucket::GetDataBuckets(Mob *mob)
 	}
 
 	if (mob->IsBot()) {
-		t = DataBucketLoadType::Bot;
+		BulkLoadEntitiesToCache(DataBucketLoadType::Bot, {id});
 	}
 	else if (mob->IsClient()) {
-		t = DataBucketLoadType::Client;
+		BulkLoadEntitiesToCache(DataBucketLoadType::Account, {id});
+		BulkLoadEntitiesToCache(DataBucketLoadType::Client, {id});
 	}
 
-	BulkLoadEntitiesToCache(t, {id});
-
 	return true;
 }
 
@@ -254,9 +258,10 @@ bool DataBucket::DeleteData(const DataBucketKey &k)
 		);
 
 		LogDataBuckets(
-			"Deleting bucket key [{}] bot_id [{}] character_id [{}] npc_id [{}] cache size before [{}] after [{}]",
+			"Deleting bucket key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}] cache size before [{}] after [{}]",
 			k.key,
 			k.bot_id,
+			k.account_id,
 			k.character_id,
 			k.npc_id,
 			size_before,
@@ -277,9 +282,10 @@ bool DataBucket::DeleteData(const DataBucketKey &k)
 std::string DataBucket::GetDataExpires(const DataBucketKey &k)
 {
 	LogDataBuckets(
-		"Getting bucket expiration key [{}] bot_id [{}] character_id [{}] npc_id [{}]",
+		"Getting bucket expiration key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}]",
 		k.key,
 		k.bot_id,
+		k.account_id,
 		k.character_id,
 		k.npc_id
 	);
@@ -295,9 +301,10 @@ std::string DataBucket::GetDataExpires(const DataBucketKey &k)
 std::string DataBucket::GetDataRemaining(const DataBucketKey &k)
 {
 	LogDataBuckets(
-		"Getting bucket remaining key [{}] bot_id [{}] character_id [{}] npc_id [{}]",
+		"Getting bucket remaining key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}]",
 		k.key,
 		k.bot_id,
+		k.account_id,
 		k.character_id,
 		k.npc_id
 	);
@@ -320,6 +327,13 @@ std::string DataBucket::GetScopedDbFilters(const DataBucketKey &k)
 		query.emplace_back("character_id = 0");
 	}
 
+	if (k.account_id > 0) {
+		query.emplace_back(fmt::format("account_id = {}", k.account_id));
+	}
+	else {
+		query.emplace_back("account_id = 0");
+	}
+
 	if (k.npc_id > 0) {
 		query.emplace_back(fmt::format("npc_id = {}", k.npc_id));
 	}
@@ -346,6 +360,7 @@ bool DataBucket::CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe,
 	return (
 		dbe.key_ == k.key &&
 		dbe.bot_id == k.bot_id &&
+		dbe.account_id == k.account_id &&
 		dbe.character_id == k.character_id &&
 		dbe.npc_id == k.npc_id
 	);
@@ -364,6 +379,9 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 			if (t == DataBucketLoadType::Bot) {
 				has_cache = e.bot_id == ids[0];
 			}
+			else if (t == DataBucketLoadType::Account) {
+				has_cache = e.account_id == ids[0];
+			}
 			else if (t == DataBucketLoadType::Client) {
 				has_cache = e.character_id == ids[0];
 			}
@@ -384,6 +402,9 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 		case DataBucketLoadType::Client:
 			column = "character_id";
 			break;
+		case DataBucketLoadType::Account:
+			column = "account_id";
+			break;
 		default:
 			LogError("Incorrect LoadType [{}]", static_cast<int>(t));
 			break;
@@ -442,6 +463,7 @@ void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id)
 			[&](DataBucketsRepository::DataBuckets &e) {
 				return (
 					(type == DataBucketLoadType::Bot && e.bot_id == id) ||
+					(type == DataBucketLoadType::Account && e.account_id == id) ||
 					(type == DataBucketLoadType::Client && e.character_id == id)
 				);
 			}
@@ -481,6 +503,7 @@ void DataBucket::DeleteFromMissesCache(DataBucketsRepository::DataBuckets e)
 			g_data_bucket_cache.end(),
 			[&](DataBucketsRepository::DataBuckets &ce) {
 				return ce.id == 0 && ce.key_ == e.key_ &&
+					   ce.account_id == e.account_id &&
 					   ce.character_id == e.character_id &&
 					   ce.npc_id == e.npc_id &&
 					   ce.bot_id == e.bot_id;
@@ -516,6 +539,8 @@ void DataBucket::DeleteFromCache(uint64 id, DataBucketLoadType::Type type)
 						return e.bot_id == id;
 					case DataBucketLoadType::Client:
 						return e.character_id == id;
+					case DataBucketLoadType::Account:
+						return e.account_id == id;
 					default:
 						return false;
 				}
@@ -539,7 +564,7 @@ void DataBucket::DeleteFromCache(uint64 id, DataBucketLoadType::Type type)
 // npcs (ids) can be in multiple zones so we can't cache locally to the zone
 bool DataBucket::CanCache(const DataBucketKey &key)
 {
-	if (key.character_id > 0 || key.bot_id > 0) {
+	if (key.character_id > 0 || key.account_id > 0 || key.bot_id > 0) {
 		return true;
 	}
 

zone/data_bucket.h

@@ -12,20 +12,23 @@ struct DataBucketKey {
 	std::string key;
 	std::string value;
 	std::string expires;
-	int64_t     character_id;
-	int64_t     npc_id;
-	int64_t     bot_id;
+	int64_t     account_id = 0;
+	int64_t     character_id = 0;
+	int64_t     npc_id = 0;
+	int64_t     bot_id = 0;
 };
 
 namespace DataBucketLoadType {
 	enum Type : uint8 {
 		Bot,
+		Account,
 		Client,
 		MaxType
 	};
 
 	static const std::string Name[Type::MaxType] = {
 		"Bot",
+		"Account",
 		"Client",
 	};
 }

zone/doors.cpp

@@ -30,6 +30,7 @@
 #include "string_ids.h"
 #include "worldserver.h"
 #include "zonedb.h"
+#include "../common/evolving_items.h"
 #include "../common/repositories/criteria/content_filter_criteria.h"
 
 #include <string.h>
@@ -610,6 +611,10 @@ void Doors::HandleClick(Client *sender, uint8 trigger)
 			}
 		}
 	}
+
+	if (GetOpenType() == 40 && sender->GetZoneID() == Zones::CORATHUS) {
+		sender->SendEvolveXPTransferWindow();
+	}
 }
 
 void Doors::Open(Mob *sender, bool alt_mode)

zone/doors.h

@@ -77,6 +77,8 @@ public:
 
 	bool IsDoorBlacklisted();
 
+	const char* GetDoorZone() const { return m_zone_name; }
+
 private:
 	bool GetIsDoorBlacklisted();
 

zone/embparser_api.cpp

@@ -1446,7 +1446,7 @@ int Perl__collectitems(uint32_t item_id, bool remove_item)
 	return quest_manager.collectitems(item_id, remove_item);
 }
 
-int Perl__countitem(uint32_t item_id)
+uint32 Perl__countitem(uint32_t item_id)
 {
 	return quest_manager.countitem(item_id);
 }
@@ -5653,16 +5653,6 @@ int Perl__GetZoneNPCMaximumAggroDistance(uint32 zone_id, int version)
 	return zone_store.GetZoneNPCMaximumAggroDistance(zone_id, version);
 }
 
-uint32 Perl__GetZoneMaximumMovementUpdateRange(uint32 zone_id)
-{
-	return zone_store.GetZoneMaximumMovementUpdateRange(zone_id);
-}
-
-uint32 Perl__GetZoneMaximumMovementUpdateRange(uint32 zone_id, int version)
-{
-	return zone_store.GetZoneMaximumMovementUpdateRange(zone_id, version);
-}
-
 int8 Perl__GetZoneMinimumExpansion(uint32 zone_id)
 {
 	return zone_store.GetZoneMinimumExpansion(zone_id);
@@ -6112,8 +6102,6 @@ void perl_register_quest()
 	package.add("GetZoneMaximumExpansion", (int8(*)(uint32, int))&Perl__GetZoneMaximumExpansion);
 	package.add("GetZoneMaximumLevel", (uint8(*)(uint32))&Perl__GetZoneMaximumLevel);
 	package.add("GetZoneMaximumLevel", (uint8(*)(uint32, int))&Perl__GetZoneMaximumLevel);
-	package.add("GetZoneMaximumMovementUpdateRange", (uint32(*)(uint32))&Perl__GetZoneMaximumMovementUpdateRange);
-	package.add("GetZoneMaximumMovementUpdateRange", (uint32(*)(uint32, int))&Perl__GetZoneMaximumMovementUpdateRange);
 	package.add("GetZoneMaximumPlayers", (int(*)(uint32))&Perl__GetZoneMaximumPlayers);
 	package.add("GetZoneMaximumPlayers", (int(*)(uint32, int))&Perl__GetZoneMaximumPlayers);
 	package.add("GetZoneMinimumClip", (float(*)(uint32))&Perl__GetZoneMinimumClip);

zone/entity.cpp

@@ -1717,15 +1717,6 @@ void EntityList::QueueClientsByXTarget(Mob *sender, const EQApplicationPacket *a
 	}
 }
 
-/**
- * @param sender
- * @param app
- * @param ignore_sender
- * @param distance
- * @param skipped_mob
- * @param is_ack_required
- * @param filter
- */
 void EntityList::QueueCloseClients(
 	Mob *sender,
 	const EQApplicationPacket *app,
@@ -1742,7 +1733,7 @@ void EntityList::QueueCloseClients(
 	}
 
 	if (distance <= 0) {
-		distance = 600;
+		distance = zone->GetClientUpdateRange();
 	}
 
 	float distance_squared = distance * distance;
@@ -2878,6 +2869,8 @@ bool EntityList::RemoveMobFromCloseLists(Mob *mob)
 		);
 
 		it->second->m_close_mobs.erase(entity_id);
+		it->second->m_last_seen_mob_position.erase(entity_id);
+
 		++it;
 	}
 
@@ -2931,6 +2924,9 @@ void EntityList::RemoveAuraFromMobs(Mob *aura)
 // All of the above makes a tremendous impact on the bottom line of cpu cycle performance because we run an order of magnitude
 // less checks by focusing our hot path logic down to a very small subset of relevant entities instead of looping an entire
 // entity list (zone wide)
+
+BenchTimer g_scan_bench_timer;
+
 void EntityList::ScanCloseMobs(Mob *scanning_mob)
 {
 	if (!scanning_mob) {
@@ -2941,7 +2937,9 @@ void EntityList::ScanCloseMobs(Mob *scanning_mob)
 		return;
 	}
 
-	float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);
+	g_scan_bench_timer.reset();
+
+	float scan_range = RuleI(Range, MobCloseScanDistance);
 
 	// Reserve memory in m_close_mobs to avoid frequent re-allocations if not already reserved.
 	// Assuming mob_list.size() as an upper bound for reservation.
@@ -2957,7 +2955,7 @@ void EntityList::ScanCloseMobs(Mob *scanning_mob)
 			continue;
 		}
 
-		float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
+		float distance = Distance(scanning_mob->GetPosition(), mob->GetPosition());
 		if (distance <= scan_range || mob->GetAggroRange() >= scan_range) {
 			// add mob to scanning_mob's close list and vice versa
 			// check if the mob is already in the close mobs list before inserting
@@ -2969,10 +2967,11 @@ void EntityList::ScanCloseMobs(Mob *scanning_mob)
 	}
 
 	LogAIScanClose(
-		"[{}] Scanning close list > list_size [{}] moving [{}]",
+		"[{}] Scanning close list > list_size [{}] moving [{}] elapsed [{}] us",
 		scanning_mob->GetCleanName(),
 		scanning_mob->m_close_mobs.size(),
-		scanning_mob->IsMoving() ? "true" : "false"
+		scanning_mob->IsMoving() ? "true" : "false",
+		g_scan_bench_timer.elapsedMicroseconds()
 	);
 }
 
@@ -5759,10 +5758,6 @@ void EntityList::ReloadMerchants() {
  * then we return the full list
  *
  * See comments @EntityList::ScanCloseMobs for system explanation
- *
- * @param mob
- * @param distance
- * @return
  */
 std::unordered_map<uint16, Mob *> &EntityList::GetCloseMobList(Mob *mob, float distance)
 {

zone/entity.h

@@ -631,8 +631,6 @@ private:
 		bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint32 iSpellTypes); // TODO: Evaluate this closesly in hopes to eliminate
 		void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff
 
-		void ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob);
-
 		void GetBotList(std::list<Bot*> &b_list);
 	private:
 		std::list<Bot*> bot_list;

zone/exp.cpp

@@ -497,7 +497,7 @@ void Client::CalculateExp(uint64 in_add_exp, uint64 &add_exp, uint64 &add_aaxp,
 	add_exp = GetEXP() + add_exp;
 }
 
-void Client::AddEXP(ExpSource exp_source, uint64 in_add_exp, uint8 conlevel, bool resexp) {
+void Client::AddEXP(ExpSource exp_source, uint64 in_add_exp, uint8 conlevel, bool resexp, NPC* npc) {
 	if (!IsEXPEnabled()) {
 		return;
 	}
@@ -574,10 +574,10 @@ void Client::AddEXP(ExpSource exp_source, uint64 in_add_exp, uint8 conlevel, boo
 	}
 
 	// Now update our character's normal and AA xp
-	SetEXP(exp_source, exp, aaexp, resexp);
+	SetEXP(exp_source, exp, aaexp, resexp, npc);
 }
 
-void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool isrezzexp) {
+void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool isrezzexp, NPC* npc) {
 	uint64 current_exp = GetEXP();
 	uint64 current_aa_exp = GetAAXP();
 	uint64 total_current_exp = current_exp + current_aa_exp;
@@ -677,6 +677,7 @@ void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool
 				}
 			}
 		}
+		ProcessEvolvingItem(exp_gained, npc);
 	} else if(total_add_exp < total_current_exp) { //only loss message if you lose exp, no message if you gained/lost nothing.
 		uint64 exp_lost = current_exp - set_exp;
 		float exp_percent = (float)((float)exp_lost / (float)(GetEXPForLevel(GetLevel() + 1) - GetEXPForLevel(GetLevel())))*(float)100;
@@ -1205,7 +1206,7 @@ void Group::SplitExp(ExpSource exp_source, const uint64 exp, Mob* other) {
 			if (diff >= max_diff) {
 				const uint64 tmp  = (m->GetLevel() + 3) * (m->GetLevel() + 3) * 75 * 35 / 10;
 				const uint64 tmp2 = group_experience / member_count;
-				m->CastToClient()->AddEXP(exp_source, tmp < tmp2 ? tmp : tmp2, consider_level);
+				m->CastToClient()->AddEXP(exp_source, tmp < tmp2 ? tmp : tmp2, consider_level, false, other->CastToNPC());
 			}
 		}
 	}
@@ -1256,7 +1257,7 @@ void Raid::SplitExp(ExpSource exp_source, const uint64 exp, Mob* other) {
 			if (diff >= max_diff) {
 				const uint64 tmp  = (m.member->GetLevel() + 3) * (m.member->GetLevel() + 3) * 75 * 35 / 10;
 				const uint64 tmp2 = (raid_experience / member_modifier) + 1;
-				m.member->AddEXP(exp_source, tmp < tmp2 ? tmp : tmp2, consider_level);
+				m.member->AddEXP(exp_source, tmp < tmp2 ? tmp : tmp2, consider_level, false, other->CastToNPC());
 			}
 		}
 	}