Tweaks

CHANGELOG.md

@@ -1,157 +1,3 @@
-## [22.60.0] 11/25/2024
-
-### Bazaar
-
-* Further refinements for instanced bazaar ([#4544](https://github.com/EQEmu/Server/pull/4544)) @neckkola 2024-11-16
-
-### Code
-
-* Fix build with older C++ libraries ([#4549](https://github.com/EQEmu/Server/pull/4549)) @hgtw 2024-11-24
-
-### Config
-
-* Fix World TCP Address Configuration Default ([#4551](https://github.com/EQEmu/Server/pull/4551)) @Akkadius 2024-11-24
-
-### Fixes
-
-* Fix Issue with Perl EVENT_PAYLOAD ([#4545](https://github.com/EQEmu/Server/pull/4545)) @Kinglykrab 2024-11-24
-* Fix Possible Item Loss in Trades ([#4554](https://github.com/EQEmu/Server/pull/4554)) @Kinglykrab 2024-11-24
-* Fix Strings::Commify bug with #mystats ([#4547](https://github.com/EQEmu/Server/pull/4547)) @carolus21rex 2024-11-22
-* Fix an edge case with augmented items inside parceled containers ([#4546](https://github.com/EQEmu/Server/pull/4546)) @neckkola 2024-11-21
-* Fix for bazaar search of containers. ([#4540](https://github.com/EQEmu/Server/pull/4540)) @neckkola 2024-11-15
-* Fix for mult-instanced bazaar zones ([#4541](https://github.com/EQEmu/Server/pull/4541)) @neckkola 2024-11-15
-* Fix for sending money via Parcel, then changing your mind ([#4552](https://github.com/EQEmu/Server/pull/4552)) @neckkola 2024-11-24
-* Fix issue where NPC's are being hidden as traders ([#4539](https://github.com/EQEmu/Server/pull/4539)) @Akkadius 2024-11-15
-* Players could become flagged as a Trader when they were not trading ([#4553](https://github.com/EQEmu/Server/pull/4553)) @neckkola 2024-11-24
-
-### Rules
-
-* Add Rule to Disable NPCs Facing Target ([#4543](https://github.com/EQEmu/Server/pull/4543)) @Kinglykrab 2024-11-24
-
-### Tasks
-
-* Update tasks in all zones if invalid zone set ([#4550](https://github.com/EQEmu/Server/pull/4550)) @hgtw 2024-11-25
-
-## [22.59.1] 11/13/2024
-
-### Hotfix
-
-* Fix faulty database migration condition with databuckets (9285)
-
-## [22.59.0] 11/13/2024
-
-### Databuckets
-
-* Add database index to data_buckets ([#4535](https://github.com/EQEmu/Server/pull/4535)) @Akkadius 2024-11-09
-
-### Fixes
-
-* Bazaar two edge case issues resolved ([#4533](https://github.com/EQEmu/Server/pull/4533)) @neckkola 2024-11-09
-* Check if the mob is already in the close mobs list before inserting  @Akkadius 2024-11-11
-* ScanCloseMobs - Ensure scanning mob has an entity ID  @Akkadius 2024-11-10
-
-### Performance
-
-* Improvements to ScanCloseMobs logic ([#4534](https://github.com/EQEmu/Server/pull/4534)) @Akkadius 2024-11-08
-
-### Quest API
-
-* Add Native Database Querying Interface ([#4531](https://github.com/EQEmu/Server/pull/4531)) @hgtw 2024-11-13
-
-### Rules
-
-* Add Rule for restricting client versions to world server ([#4527](https://github.com/EQEmu/Server/pull/4527)) @knervous 2024-11-12
-
-## [22.58.0] 11/5/2024
-
-### Code
-
-* Add mysql prepared statement support ([#4530](https://github.com/EQEmu/Server/pull/4530)) @hgtw 2024-11-06
-* Update perlbind to 1.1.0 ([#4529](https://github.com/EQEmu/Server/pull/4529)) @hgtw 2024-11-06
-
-### Feature
-
-* Focus Skill Attack Spells ([#4528](https://github.com/EQEmu/Server/pull/4528)) @mmcgarvey 2024-10-31
-
-### Fixes
-
-* Add Missing Lua Registers ([#4525](https://github.com/EQEmu/Server/pull/4525)) @Kinglykrab 2024-10-24
-* Fix cross_zone_set_entity_variable_by_char_id in Lua ([#4526](https://github.com/EQEmu/Server/pull/4526)) @Kinglykrab 2024-10-24
-
-### Loginserver
-
-* Automatifc Opcode File Creation ([#4521](https://github.com/EQEmu/Server/pull/4521)) @KimLS 2024-10-22
-
-### Quest API
-
-* Add Spawn Circle/Grid Methods to Perl/Lua ([#4524](https://github.com/EQEmu/Server/pull/4524)) @Kinglykrab 2024-10-24
-
-## [22.57.1] 10/22/2024
-
-### Bots
-
-* Enable Bot Commands Only if Rule Enabled ([#4519](https://github.com/EQEmu/Server/pull/4519)) @Kinglykrab 2024-10-22
-* Fix pet buffs from saving duplicates every save ([#4520](https://github.com/EQEmu/Server/pull/4520)) @nytmyr 2024-10-22
-
-### Loginserver
-
-* Automatic Opcode File Creation ([#4521](https://github.com/EQEmu/Server/pull/4521)) @KimLS 2024-10-22
-
-## [22.57.0] 10/20/2024
-
-### Bots
-
-* Add "silent" option to ^spawn and mute raid spawn ([#4494](https://github.com/EQEmu/Server/pull/4494)) @nytmyr 2024-10-05
-* Add attack flag when told to attack ([#4490](https://github.com/EQEmu/Server/pull/4490)) @nytmyr 2024-09-29
-* Fix timers loading on spawn and zone ([#4516](https://github.com/EQEmu/Server/pull/4516)) @nytmyr 2024-10-20
-
-### Code
-
-* Fixed a typo in Zoning.cpp ([#4515](https://github.com/EQEmu/Server/pull/4515)) @carolus21rex 2024-10-20
-* Optimization Code Cleanup ([#4489](https://github.com/EQEmu/Server/pull/4489)) @Akkadius 2024-09-30
-* Remove Extra Skill in EQ::skills::GetExtraDamageSkills() ([#4486](https://github.com/EQEmu/Server/pull/4486)) @Kinglykrab 2024-10-03
-
-### Crash
-
-* Fixes a crash when the faction_list db table is empty. ([#4511](https://github.com/EQEmu/Server/pull/4511)) @KimLS 2024-10-14
-
-### Fixes
-
-* Add character_instance_safereturns to tables_to_zero_id ([#4485](https://github.com/EQEmu/Server/pull/4485)) @Morzain 2024-09-26
-* Correctly limit max targets of PBAOE ([#4507](https://github.com/EQEmu/Server/pull/4507)) @catapultam-habeo 2024-10-11
-* FindBestZ selecting false zone floor as bestz - Results in roambox failures ([#4504](https://github.com/EQEmu/Server/pull/4504)) @fryguy503 2024-10-13
-* Fix #set motd Crash ([#4495](https://github.com/EQEmu/Server/pull/4495)) @Kinglykrab 2024-10-05
-* Fix `character_exp_modifiers` Default Values ([#4502](https://github.com/EQEmu/Server/pull/4502)) @Kinglykrab 2024-10-09
-* Fix a display error regarding a few trader/buyer query errors ([#4514](https://github.com/EQEmu/Server/pull/4514)) @neckkola 2024-10-17
-* Fix Group ID 0 in Group::SaveGroupLeaderAA() ([#4487](https://github.com/EQEmu/Server/pull/4487)) @Kinglykrab 2024-10-03
-* Fix Mercenary Encounter Crash ([#4509](https://github.com/EQEmu/Server/pull/4509)) @Kinglykrab 2024-10-12
-* Fix NPC::CanTalk() Crash ([#4499](https://github.com/EQEmu/Server/pull/4499)) @Kinglykrab 2024-10-07
-* Fix Spells:DefaultAOEMaxTargets Default Value ([#4508](https://github.com/EQEmu/Server/pull/4508)) @Kinglykrab 2024-10-12
-* Fix Targeted AOE Max Targets Rule ([#4488](https://github.com/EQEmu/Server/pull/4488)) @Kinglykrab 2024-10-03
-* fixed a bug where it would use npc value instead of faction value in the database. ([#4491](https://github.com/EQEmu/Server/pull/4491)) @regneq 2024-09-29
-* Master of Disguise should apply to illusions casted by others. ([#4506](https://github.com/EQEmu/Server/pull/4506)) @fryguy503 2024-10-11
-* Spells - Self Only (Yellow) cast when non group member is targeted ([#4503](https://github.com/EQEmu/Server/pull/4503)) @fryguy503 2024-10-11
-
-### Loginserver
-
-* Larion loginserver support ([#4492](https://github.com/EQEmu/Server/pull/4492)) @KimLS 2024-10-03
-* Login Fatal Error Spamming ([#4476](https://github.com/EQEmu/Server/pull/4476)) @KimLS 2024-10-09
-
-### Logs
-
-* Add NPC Trades to Player Events ([#4505](https://github.com/EQEmu/Server/pull/4505)) @Kinglykrab 2024-10-13
-
-### Quest API
-
-* Add Buff Fade Methods to Perl/Lua ([#4501](https://github.com/EQEmu/Server/pull/4501)) @Kinglykrab 2024-10-09
-* Add EVENT_READ_ITEM to Perl/Lua ([#4497](https://github.com/EQEmu/Server/pull/4497)) @Kinglykrab 2024-10-08
-* Add NPC List Filter Methods to Perl/Lua ([#4493](https://github.com/EQEmu/Server/pull/4493)) @Kinglykrab 2024-10-04
-* Add Scripting Support to Mercenaries ([#4500](https://github.com/EQEmu/Server/pull/4500)) @Kinglykrab 2024-10-11
-
-### Rules
-
-* Add Rule to disable PVP Regions ([#4513](https://github.com/EQEmu/Server/pull/4513)) @Kinglykrab 2024-10-17
-
 ## [22.56.3] 9/23/2024
 
 ### Fixes

CMakeLists.txt

@@ -482,3 +482,4 @@ ENDIF(EQEMU_BUILD_TESTS)
 IF(EQEMU_BUILD_CLIENT_FILES)
 	ADD_SUBDIRECTORY(client_files)
 ENDIF(EQEMU_BUILD_CLIENT_FILES)
+

common/CMakeLists.txt

@@ -62,7 +62,6 @@ SET(common_sources
     mutex.cpp
     mysql_request_result.cpp
     mysql_request_row.cpp
-    mysql_stmt.cpp
     opcode_map.cpp
     opcodemgr.cpp
     packet_dump.cpp
@@ -543,7 +542,6 @@ SET(common_headers
     eqemu_config.h
     eqemu_config_elements.h
     eqemu_logsys.h
-    eqemu_logsys_log_aliases.h
     eq_limits.h
     eq_packet.h
     eq_stream_ident.h
@@ -587,7 +585,6 @@ SET(common_headers
     mutex.h
     mysql_request_result.h
     mysql_request_row.h
-    mysql_stmt.h
     op_codes.h
     opcode_dispatch.h
     opcodemgr.h
@@ -805,8 +802,13 @@ IF (UNIX)
     SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
 ENDIF (UNIX)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
+IF (EQEMU_BUILD_PCH)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-emu-common.h)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-containers.h)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-utilities.h)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-types.h)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-fmt.h)
+#    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch-repositories.h)
 ENDIF ()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/bazaar.cpp

@@ -235,8 +235,7 @@ Bazaar::GetSearchResults(
 		std::vector<ItemSearchType> item_search_types = {
 			{EQ::item::ItemType::ItemTypeAll,                  true},
 			{EQ::item::ItemType::ItemTypeBook,                 item->ItemClass == EQ::item::ItemType::ItemTypeBook},
-			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer ||
-			                                                   item->IsClassBag()},
+			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer},
 			{EQ::item::ItemType::ItemTypeAllEffects,           item->Scroll.Effect > 0 && item->Scroll.Effect < 65000},
 			{EQ::item::ItemType::ItemTypeUnknown9,             item->Worn.Effect == 998},
 			{EQ::item::ItemType::ItemTypeUnknown10,            item->Worn.Effect >= 1298 && item->Worn.Effect <= 1307},

common/database/database_update_manifest.cpp

@@ -5746,30 +5746,6 @@ ALTER TABLE `inventory`
 	ADD COLUMN `guid` BIGINT UNSIGNED NULL DEFAULT '0' AFTER `ornament_hero_model`;
 ALTER TABLE `inventory_snapshots`
 	ADD COLUMN `guid` BIGINT UNSIGNED NULL DEFAULT '0' AFTER `ornament_hero_model`;
-)"
-	},
-	ManifestEntry{
-		.version = 9284,
-		.description = "2024_10_08_character_exp_modifiers_default.sql",
-		.check = "SHOW CREATE TABLE `character_exp_modifiers`",
-		.condition = "contains",
-		.match = "`exp_modifier` float NOT NULL,",
-		.sql = R"(
-ALTER TABLE `character_exp_modifiers`
-MODIFY COLUMN `aa_modifier` float NOT NULL DEFAULT 1.0 AFTER `instance_version`,
-MODIFY COLUMN `exp_modifier` float NOT NULL DEFAULT 1.0 AFTER `aa_modifier`;
-)"
-	},
-	ManifestEntry{
-		.version = 9285,
-		.description = "2024_11_08_data_buckets_indexes.sql",
-		.check = "SHOW CREATE TABLE `data_buckets`",
-		.condition = "missing",
-		.match = "idx_character_expires",
-		.sql = R"(
-CREATE INDEX idx_character_expires ON data_buckets (character_id, expires);
-CREATE INDEX idx_npc_expires ON data_buckets (npc_id, expires);
-CREATE INDEX idx_bot_expires ON data_buckets (bot_id, expires);
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry

common/dbcore.cpp

@@ -7,7 +7,6 @@
 #include "timer.h"
 
 #include "dbcore.h"
-#include "mysql_stmt.h"
 
 #include <fstream>
 #include <iostream>
@@ -437,8 +436,3 @@ MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
 
 	return r;
 }
-
-mysql::PreparedStmt DBcore::Prepare(std::string query)
-{
-	return mysql::PreparedStmt(*mysql, std::move(query), m_mutex);
-}

common/dbcore.h

@@ -17,8 +17,6 @@
 #define CR_SERVER_GONE_ERROR    2006
 #define CR_SERVER_LOST          2013
 
-namespace mysql { class PreparedStmt; }
-
 class DBcore {
 public:
 	enum eStatus {
@@ -50,11 +48,6 @@ public:
 	}
 	void SetMutex(Mutex *mutex);
 
-	// only safe on connections shared with other threads if results buffered
-	// unsafe to use off main thread due to internal server logging
-	// throws std::runtime_error on failure
-	mysql::PreparedStmt Prepare(std::string query);
-
 protected:
 	bool Open(
 		const char *iHost,

common/emu_constants.cpp

@@ -21,7 +21,6 @@
 #include "bodytypes.h"
 #include "data_verification.h"
 #include "eqemu_logsys.h"
-#include "eqemu_logsys_log_aliases.h"
 #include "rulesys.h"
 
 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {

common/emu_constants.h

@@ -756,10 +756,4 @@ namespace PCNPCOnlyFlagType {
 	constexpr int NPC = 2;
 }
 
-namespace BookType {
-	constexpr uint8 Scroll   = 0;
-	constexpr uint8 Book     = 1;
-	constexpr uint8 ItemInfo = 2;
-}
-
 #endif /*COMMON_EMU_CONSTANTS_H*/

common/emu_oplist.h

@@ -465,7 +465,6 @@ N(OP_SendAAStats),
 N(OP_SendAATable),
 N(OP_SendCharInfo),
 N(OP_SendExpZonein),
-N(OP_SendFindableLocations),
 N(OP_SendFindableNPCs),
 N(OP_SendGuildTributes),
 N(OP_SendLoginInfo),
@@ -535,7 +534,6 @@ N(OP_Stamina),
 N(OP_Stun),
 N(OP_Surname),
 N(OP_SwapSpell),
-N(OP_SystemFingerprint),
 N(OP_TargetBuffs),
 N(OP_TargetCommand),
 N(OP_TargetHoTT),

common/eq_packet_structs.h

@@ -3221,7 +3221,6 @@ struct BuyerMessaging_Struct {
 	char   item_name[64];
 	uint32 slot;
 	uint32 seller_quantity;
-	uint32 purchase_method; // 0 direct merchant, 1 via /barter window
 };
 
 struct BuyerAddBuyertoBarterWindow_Struct {
@@ -4400,6 +4399,11 @@ struct FindPerson_Point {
 	float z;
 };
 
+struct FindPersonRequest_Struct {
+	uint32	npc_id;
+	FindPerson_Point client_pos;
+};
+
 //variable length packet of points
 struct FindPersonResult_Struct {
 	FindPerson_Point dest;
@@ -6431,38 +6435,6 @@ struct BuylineItemDetails_Struct {
 	uint32      item_quantity;
 };
 
-/* Taken from libeq */
-enum FindLocationType : uint32 {
-	LocationUnknown,
-	LocationPlayer,
-	LocationPOI,
-	LocationRealEstateItem,
-	LocationRealEstatePlot,
-	LocationMapPoint,
-	LocationSwitch,
-	LocationLocation
-};
-
-//For reference
-struct FindableLocation_Struct {
-/*00*/ FindLocationType type;
-/*04*/ int32 id;
-/*08*/ int32 sub_id;
-/*12*/ int32 zone_id;
-/*16*/ int32 zone_point_identifier;
-/*20*/ float y;
-/*24*/ float x;
-/*28*/ float z;
-/*32*/
-};
-
-struct FindPersonRequest_Struct {
-	FindLocationType type;
-	int32 id;
-	FindPerson_Point client_pos;
-	FindPerson_Point target_pos;
-};
-
 // Restore structure packing to default
 #pragma pack()
 

common/eqemu_config.cpp

@@ -94,7 +94,7 @@ void EQEmuConfig::parse_config()
 		auto_database_updates = true;
 	}
 
-	WorldIP      = _root["server"]["world"]["tcp"].get("ip", "127.0.0.1").asString();
+	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
 	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());
 
 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
@@ -171,7 +171,6 @@ void EQEmuConfig::parse_config()
 	PluginDir    = _root["server"]["directories"].get("plugins", "plugins/").asString();
 	LuaModuleDir = _root["server"]["directories"].get("lua_modules", "lua_modules/").asString();
 	PatchDir     = _root["server"]["directories"].get("patches", "./").asString();
-	OpcodeDir    = _root["server"]["directories"].get("opcodes", "./").asString();
 	SharedMemDir = _root["server"]["directories"].get("shared_memory", "shared/").asString();
 	LogDir       = _root["server"]["directories"].get("logs", "logs/").asString();
 

common/eqemu_config.h

@@ -95,7 +95,6 @@ class EQEmuConfig
 		std::string PluginDir;
 		std::string LuaModuleDir;
 		std::string PatchDir;
-		std::string OpcodeDir;
 		std::string SharedMemDir;
 		std::string LogDir;
 

common/eqemu_logsys.h

@@ -246,7 +246,7 @@ namespace Logs {
 	};
 }
 
-#include "eqemu_logsys_log_aliases.h"
+#include "eqemu_logsys_log_aliases.cpp"
 
 class Database;
 

common/eqemu_logsys_log_aliases.cpp

@@ -18,8 +18,8 @@
  *
 */
 
-#ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
-#define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
+#ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_CPP
+#define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_CPP
 
 #define LogAA(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::AA))\
@@ -855,4 +855,4 @@
 } while (0)
 
 
-#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
+#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_CPP

common/events/player_event_discord_formatter.cpp

@@ -789,36 +789,50 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 		);
 	}
 
-	std::string npc_info = fmt::format(
-		"{} ({})\n",
-		e.npc_name,
-		e.npc_id
-	);
-
-	npc_info += fmt::format(
-		"Is Quest Handin: {}",
-		e.is_quest_handin ? "Yes" : "No"
-	);
-
 	std::vector<DiscordField> f = {};
 
-
-	BuildDiscordField(&f, "NPC", npc_info);
-
 	if (!handin_items_info.empty()) {
-		BuildDiscordField(&f, "Handin Items", handin_items_info);
+		BuildDiscordField(
+			&f,
+			"Handin Items",
+			fmt::format(
+				"{}",
+				handin_items_info
+			)
+		);
 	}
 
 	if (!handin_money_info.empty()) {
-		BuildDiscordField(&f, "Handin Money", handin_money_info);
+		BuildDiscordField(
+			&f,
+			"Handin Money",
+			fmt::format(
+				"{}",
+				handin_money_info
+			)
+		);
 	}
 
 	if (!return_items_info.empty()) {
-		BuildDiscordField(&f, "Return Items", return_items_info);
+		BuildDiscordField(
+			&f,
+			"Return Items",
+			fmt::format(
+				"{}",
+				return_items_info
+			)
+		);
 	}
 
 	if (!return_money_info.empty()) {
-		BuildDiscordField(&f, "Return Money", return_money_info);
+		BuildDiscordField(
+			&f,
+			"Return Money",
+			fmt::format(
+				"{}",
+				return_money_info
+			)
+		);
 	}
 
 	std::vector<DiscordEmbed> embeds = {};

common/events/player_event_logs.cpp

@@ -654,53 +654,53 @@ const int32_t RETENTION_DAYS_DEFAULT = 7;
 
 void PlayerEventLogs::SetSettingsDefaults()
 {
-	m_settings[PlayerEvent::GM_COMMAND].event_enabled                = 1;
-	m_settings[PlayerEvent::ZONING].event_enabled                    = 1;
-	m_settings[PlayerEvent::AA_GAIN].event_enabled                   = 1;
-	m_settings[PlayerEvent::AA_PURCHASE].event_enabled               = 1;
-	m_settings[PlayerEvent::FORAGE_SUCCESS].event_enabled            = 0;
-	m_settings[PlayerEvent::FORAGE_FAILURE].event_enabled            = 0;
-	m_settings[PlayerEvent::FISH_SUCCESS].event_enabled              = 0;
-	m_settings[PlayerEvent::FISH_FAILURE].event_enabled              = 0;
-	m_settings[PlayerEvent::ITEM_DESTROY].event_enabled              = 1;
-	m_settings[PlayerEvent::WENT_ONLINE].event_enabled               = 0;
-	m_settings[PlayerEvent::WENT_OFFLINE].event_enabled              = 0;
-	m_settings[PlayerEvent::LEVEL_GAIN].event_enabled                = 1;
-	m_settings[PlayerEvent::LEVEL_LOSS].event_enabled                = 1;
-	m_settings[PlayerEvent::LOOT_ITEM].event_enabled                 = 1;
-	m_settings[PlayerEvent::MERCHANT_PURCHASE].event_enabled         = 1;
-	m_settings[PlayerEvent::MERCHANT_SELL].event_enabled             = 1;
-	m_settings[PlayerEvent::GROUP_JOIN].event_enabled                = 0;
-	m_settings[PlayerEvent::GROUP_LEAVE].event_enabled               = 0;
-	m_settings[PlayerEvent::RAID_JOIN].event_enabled                 = 0;
-	m_settings[PlayerEvent::RAID_LEAVE].event_enabled                = 0;
-	m_settings[PlayerEvent::GROUNDSPAWN_PICKUP].event_enabled        = 1;
-	m_settings[PlayerEvent::NPC_HANDIN].event_enabled                = 1;
-	m_settings[PlayerEvent::SKILL_UP].event_enabled                  = 0;
-	m_settings[PlayerEvent::TASK_ACCEPT].event_enabled               = 1;
-	m_settings[PlayerEvent::TASK_UPDATE].event_enabled               = 1;
-	m_settings[PlayerEvent::TASK_COMPLETE].event_enabled             = 1;
-	m_settings[PlayerEvent::TRADE].event_enabled                     = 1;
-	m_settings[PlayerEvent::GIVE_ITEM].event_enabled                 = 1;
-	m_settings[PlayerEvent::SAY].event_enabled                       = 0;
-	m_settings[PlayerEvent::REZ_ACCEPTED].event_enabled              = 1;
-	m_settings[PlayerEvent::DEATH].event_enabled                     = 1;
-	m_settings[PlayerEvent::COMBINE_FAILURE].event_enabled           = 1;
-	m_settings[PlayerEvent::COMBINE_SUCCESS].event_enabled           = 1;
-	m_settings[PlayerEvent::DROPPED_ITEM].event_enabled              = 1;
-	m_settings[PlayerEvent::SPLIT_MONEY].event_enabled               = 1;
-	m_settings[PlayerEvent::DZ_JOIN].event_enabled                   = 1;
-	m_settings[PlayerEvent::DZ_LEAVE].event_enabled                  = 1;
-	m_settings[PlayerEvent::TRADER_PURCHASE].event_enabled           = 1;
-	m_settings[PlayerEvent::TRADER_SELL].event_enabled               = 1;
-	m_settings[PlayerEvent::BANDOLIER_CREATE].event_enabled          = 0;
-	m_settings[PlayerEvent::BANDOLIER_SWAP].event_enabled            = 0;
-	m_settings[PlayerEvent::DISCOVER_ITEM].event_enabled             = 1;
-	m_settings[PlayerEvent::POSSIBLE_HACK].event_enabled             = 1;
-	m_settings[PlayerEvent::KILLED_NPC].event_enabled                = 0;
-	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled          = 1;
-	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled           = 1;
-	m_settings[PlayerEvent::ITEM_CREATION].event_enabled             = 1;
+	m_settings[PlayerEvent::GM_COMMAND].event_enabled         = 1;
+	m_settings[PlayerEvent::ZONING].event_enabled             = 1;
+	m_settings[PlayerEvent::AA_GAIN].event_enabled            = 1;
+	m_settings[PlayerEvent::AA_PURCHASE].event_enabled        = 1;
+	m_settings[PlayerEvent::FORAGE_SUCCESS].event_enabled     = 0;
+	m_settings[PlayerEvent::FORAGE_FAILURE].event_enabled     = 0;
+	m_settings[PlayerEvent::FISH_SUCCESS].event_enabled       = 0;
+	m_settings[PlayerEvent::FISH_FAILURE].event_enabled       = 0;
+	m_settings[PlayerEvent::ITEM_DESTROY].event_enabled       = 1;
+	m_settings[PlayerEvent::WENT_ONLINE].event_enabled        = 0;
+	m_settings[PlayerEvent::WENT_OFFLINE].event_enabled       = 0;
+	m_settings[PlayerEvent::LEVEL_GAIN].event_enabled         = 1;
+	m_settings[PlayerEvent::LEVEL_LOSS].event_enabled         = 1;
+	m_settings[PlayerEvent::LOOT_ITEM].event_enabled          = 1;
+	m_settings[PlayerEvent::MERCHANT_PURCHASE].event_enabled  = 1;
+	m_settings[PlayerEvent::MERCHANT_SELL].event_enabled      = 1;
+	m_settings[PlayerEvent::GROUP_JOIN].event_enabled         = 0;
+	m_settings[PlayerEvent::GROUP_LEAVE].event_enabled        = 0;
+	m_settings[PlayerEvent::RAID_JOIN].event_enabled          = 0;
+	m_settings[PlayerEvent::RAID_LEAVE].event_enabled         = 0;
+	m_settings[PlayerEvent::GROUNDSPAWN_PICKUP].event_enabled = 1;
+	m_settings[PlayerEvent::NPC_HANDIN].event_enabled         = 1;
+	m_settings[PlayerEvent::SKILL_UP].event_enabled           = 0;
+	m_settings[PlayerEvent::TASK_ACCEPT].event_enabled        = 1;
+	m_settings[PlayerEvent::TASK_UPDATE].event_enabled        = 1;
+	m_settings[PlayerEvent::TASK_COMPLETE].event_enabled      = 1;
+	m_settings[PlayerEvent::TRADE].event_enabled              = 1;
+	m_settings[PlayerEvent::GIVE_ITEM].event_enabled          = 1;
+	m_settings[PlayerEvent::SAY].event_enabled                = 0;
+	m_settings[PlayerEvent::REZ_ACCEPTED].event_enabled       = 1;
+	m_settings[PlayerEvent::DEATH].event_enabled              = 1;
+	m_settings[PlayerEvent::COMBINE_FAILURE].event_enabled    = 1;
+	m_settings[PlayerEvent::COMBINE_SUCCESS].event_enabled    = 1;
+	m_settings[PlayerEvent::DROPPED_ITEM].event_enabled       = 1;
+	m_settings[PlayerEvent::SPLIT_MONEY].event_enabled        = 1;
+	m_settings[PlayerEvent::DZ_JOIN].event_enabled            = 1;
+	m_settings[PlayerEvent::DZ_LEAVE].event_enabled           = 1;
+	m_settings[PlayerEvent::TRADER_PURCHASE].event_enabled    = 1;
+	m_settings[PlayerEvent::TRADER_SELL].event_enabled        = 1;
+	m_settings[PlayerEvent::BANDOLIER_CREATE].event_enabled   = 0;
+	m_settings[PlayerEvent::BANDOLIER_SWAP].event_enabled     = 0;
+	m_settings[PlayerEvent::DISCOVER_ITEM].event_enabled      = 1;
+	m_settings[PlayerEvent::POSSIBLE_HACK].event_enabled      = 1;
+	m_settings[PlayerEvent::KILLED_NPC].event_enabled         = 0;
+	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled   = 1;
+	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled    = 1;
+	m_settings[PlayerEvent::ITEM_CREATION].event_enabled      = 1;
 	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_ITEM].event_enabled = 1;
 	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_PLAT].event_enabled = 1;
 	m_settings[PlayerEvent::PARCEL_SEND].event_enabled               = 1;

common/events/player_events.h

@@ -860,12 +860,10 @@ namespace PlayerEvent {
 
 	class HandinEntry {
 	public:
-		uint32                   item_id;
-		std::string              item_name;
-		std::vector<uint32>      augment_ids;
-		std::vector<std::string> augment_names;
-		uint16                   charges;
-		bool                     attuned;
+		uint32      item_id;
+		std::string item_name;
+		uint16      charges;
+		bool        attuned;
 
 		// cereal
 		template<class Archive>
@@ -874,8 +872,6 @@ namespace PlayerEvent {
 			ar(
 				CEREAL_NVP(item_id),
 				CEREAL_NVP(item_name),
-				CEREAL_NVP(augment_ids),
-				CEREAL_NVP(augment_names),
 				CEREAL_NVP(charges),
 				CEREAL_NVP(attuned)
 			);
@@ -909,7 +905,6 @@ namespace PlayerEvent {
 		HandinMoney              handin_money;
 		std::vector<HandinEntry> return_items;
 		HandinMoney              return_money;
-		bool                     is_quest_handin;
 
 		// cereal
 		template<class Archive>
@@ -921,8 +916,7 @@ namespace PlayerEvent {
 				CEREAL_NVP(handin_items),
 				CEREAL_NVP(handin_money),
 				CEREAL_NVP(return_items),
-				CEREAL_NVP(return_money),
-				CEREAL_NVP(is_quest_handin)
+				CEREAL_NVP(return_money)
 			);
 		}
 	};

common/mysql_stmt.cpp

@@ -1,600 +0,0 @@
-#include "mysql_stmt.h"
-#include "eqemu_logsys.h"
-#include "mutex.h"
-#include "timer.h"
-#include <charconv>
-
-namespace mysql
-{
-
-void PreparedStmt::StmtDeleter::operator()(MYSQL_STMT* stmt) noexcept
-{
-	// The connection must be locked when closing the stmt to avoid mysql errors
-	// in case another thread tries to use it during the close. If the mutex is
-	// changed to one that throws then exceptions need to be caught here.
-	LockMutex lock(mutex);
-	mysql_stmt_close(stmt);
-}
-
-PreparedStmt::PreparedStmt(MYSQL& mysql, std::string query, Mutex* mutex, StmtOptions opts)
-	: m_stmt(mysql_stmt_init(&mysql), { mutex }), m_query(std::move(query)), m_mutex(mutex), m_options(opts)
-{
-	LockMutex lock(m_mutex);
-	if (mysql_stmt_prepare(m_stmt.get(), m_query.c_str(), static_cast<unsigned long>(m_query.size())) != 0)
-	{
-		ThrowError(fmt::format("Prepare error: {}", GetStmtError()));
-	}
-
-	m_params.resize(mysql_stmt_param_count(m_stmt.get()));
-	m_inputs.resize(m_params.size());
-}
-
-void PreparedStmt::ThrowError(const std::string& error)
-{
-	LogMySQLError("{}", error);
-	throw std::runtime_error(error);
-}
-
-std::string PreparedStmt::GetStmtError()
-{
-	auto err = mysql_stmt_errno(m_stmt.get());
-	auto str = mysql_stmt_error(m_stmt.get());
-	return fmt::format("({}) [{}] for query [{}]", err, str, m_query);
-}
-
-template <typename T>
-void PreparedStmt::BindInput(size_t index, T value)
-{
-	if (index >= m_inputs.size())
-	{
-		ThrowError(fmt::format("Cannot bind input, index {} out of range", index));
-	}
-
-	impl::Bind& arg  = m_inputs[index];
-	arg.is_null      = std::is_same_v<T, std::nullptr_t>;
-
-	MYSQL_BIND& bind = m_params[index];
-	bind.is_unsigned = std::is_unsigned_v<T>;
-	bind.is_null     = &arg.is_null;
-	bind.length      = &arg.length;
-
-	auto old_type = bind.buffer_type;
-
-	if constexpr (std::is_arithmetic_v<T>)
-	{
-		if (arg.buffer.size() < sizeof(T))
-		{
-			arg.buffer.resize(std::max(sizeof(T), sizeof(int64_t)));
-			bind.buffer = arg.buffer.data();
-			m_need_bind = true;
-		}
-		memcpy(arg.buffer.data(), &value, sizeof(T));
-	}
-
-	if constexpr (std::is_same_v<T, int8_t> || std::is_same_v<T, uint8_t> || std::is_same_v<T, bool>)
-	{
-		bind.buffer_type = MYSQL_TYPE_TINY;
-	}
-	else if constexpr (std::is_same_v<T, int16_t> || std::is_same_v<T, uint16_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_SHORT;
-	}
-	else if constexpr (std::is_same_v<T, int32_t> || std::is_same_v<T, uint32_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_LONG;
-	}
-	else if constexpr (std::is_same_v<T, int64_t> || std::is_same_v<T, uint64_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_LONGLONG;
-	}
-	else if constexpr (std::is_same_v<T, float>)
-	{
-		bind.buffer_type = MYSQL_TYPE_FLOAT;
-	}
-	else if constexpr (std::is_same_v<T, double>)
-	{
-		bind.buffer_type = MYSQL_TYPE_DOUBLE;
-	}
-	else if constexpr (std::is_same_v<T, std::string_view>)
-	{
-		bind.buffer_type = MYSQL_TYPE_STRING;
-		if (arg.buffer.empty() || arg.buffer.size() < value.size())
-		{
-			arg.buffer.resize(static_cast<size_t>((value.size() + 1) * 1.5));
-			bind.buffer = arg.buffer.data();
-			bind.buffer_length = static_cast<unsigned long>(arg.buffer.size());
-			m_need_bind = true;
-		}
-		std::copy(value.begin(), value.end(), arg.buffer.begin());
-		arg.length = static_cast<unsigned long>(value.size());
-	}
-	else if constexpr (!std::is_same_v<T, std::nullptr_t>)
-	{
-		static_assert(false_v<T>, "Cannot bind unsupported type");
-	}
-
-	if (old_type != bind.buffer_type)
-	{
-		m_need_bind = true;
-	}
-}
-
-void PreparedStmt::BindInput(size_t index, const char* str)
-{
-	BindInput(index, std::string_view(str));
-}
-
-void PreparedStmt::BindInput(size_t index, const std::string& str)
-{
-	BindInput(index, std::string_view(str));
-}
-
-StmtResult PreparedStmt::Execute()
-{
-	CheckArgs(0);
-	return DoExecute();
-}
-
-StmtResult PreparedStmt::Execute(const std::vector<param_t>& args)
-{
-	CheckArgs(args.size());
-	for (size_t i = 0; i < args.size(); ++i)
-	{
-		std::visit([&](const auto& arg) { BindInput(i, arg); }, args[i]);
-	}
-	return DoExecute();
-}
-
-template <typename T>
-StmtResult PreparedStmt::Execute(const std::vector<T>& args)
-{
-	CheckArgs(args.size());
-	for (size_t i = 0; i < args.size(); ++i)
-	{
-		BindInput(i, args[i]);
-	}
-	return DoExecute();
-}
-
-void PreparedStmt::CheckArgs(size_t argc)
-{
-	if (argc != m_params.size())
-	{
-		ThrowError(fmt::format("Bad arg count (got {}, expected {}) for [{}]", argc, m_params.size(), m_query));
-	}
-}
-
-StmtResult PreparedStmt::DoExecute()
-{
-	BenchTimer timer;
-	LockMutex lock(m_mutex);
-
-	if (m_need_bind && mysql_stmt_bind_param(m_stmt.get(), m_params.data()) != 0)
-	{
-		ThrowError(fmt::format("Bind param error: {}", GetStmtError()));
-	}
-
-	m_need_bind = false;
-
-	if (mysql_stmt_execute(m_stmt.get()) != 0)
-	{
-		ThrowError(fmt::format("Execute error: {}", GetStmtError()));
-	}
-
-	my_bool attr = m_options.use_max_length;
-	mysql_stmt_attr_set(m_stmt.get(), STMT_ATTR_UPDATE_MAX_LENGTH, &attr);
-
-	if (m_options.buffer_results && mysql_stmt_store_result(m_stmt.get()) != 0)
-	{
-		ThrowError(fmt::format("Store result error: {}", GetStmtError()));
-	}
-
-	// Result buffers are bound on first execute and re-used if needed
-	if (m_results.empty())
-	{
-		BindResults();
-	}
-
-	StmtResult res(m_stmt.get(), m_results.size());
-
-	if (m_results.empty())
-	{
-		LogMySQLQuery("{} -- ({} row(s) affected) ({:.6f}s)", m_query, res.RowsAffected(), timer.elapsed());
-	}
-	else
-	{
-		LogMySQLQuery("{} -- ({} row(s) returned) ({:.6f}s)", m_query, res.RowCount(), timer.elapsed());
-	}
-
-	return res;
-}
-
-void PreparedStmt::BindResults()
-{
-	MYSQL_RES* res = mysql_stmt_result_metadata(m_stmt.get());
-	if (!res)
-	{
-		return; // did not produce a result set
-	}
-
-	MYSQL_FIELD* fields = mysql_fetch_fields(res);
-	m_columns.resize(mysql_num_fields(res));
-	m_results.resize(m_columns.size());
-
-	for (int i = 0; i < static_cast<int>(m_columns.size()); ++i)
-	{
-		impl::BindColumn& col = m_columns[i].m_col;
-		MYSQL_BIND& bind = m_results[i];
-
-		col.index          = i;
-		col.name           = fields[i].name;
-		col.buffer_type    = fields[i].type;
-		col.is_unsigned    = (fields[i].flags & UNSIGNED_FLAG) != 0;
-		col.buffer.resize(GetResultBufferSize(fields[i]));
-
-		bind.buffer_type   = col.buffer_type;
-		bind.buffer        = col.buffer.data();
-		bind.buffer_length = static_cast<unsigned long>(col.buffer.size());
-		bind.is_unsigned   = col.is_unsigned;
-		bind.is_null       = &col.is_null;
-		bind.length        = &col.length;
-		bind.error         = &col.error;
-	}
-
-	mysql_free_result(res);
-
-	if (!m_results.empty() && mysql_stmt_bind_result(m_stmt.get(), m_results.data()) != 0)
-	{
-		ThrowError(fmt::format("Bind result error: {}", GetStmtError()));
-	}
-}
-
-int PreparedStmt::GetResultBufferSize(const MYSQL_FIELD& field) const
-{
-	switch (field.type)
-	{
-	case MYSQL_TYPE_TINY:
-		return sizeof(int8_t);
-	case MYSQL_TYPE_SHORT:
-		return sizeof(int16_t);
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return sizeof(int32_t);
-	case MYSQL_TYPE_LONGLONG:
-		return sizeof(int64_t);
-	case MYSQL_TYPE_FLOAT:
-		return sizeof(float);
-	case MYSQL_TYPE_DOUBLE:
-		return sizeof(double);
-	case MYSQL_TYPE_TIME:
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP:
-		return sizeof(MYSQL_TIME);
-	default: // if max_length is unavailable for strings buffers are resized on fetch
-		return field.max_length + 1; // ensure valid buffer created
-	}
-}
-
-StmtRow PreparedStmt::Fetch()
-{
-	StmtRow row;
-	if (!m_columns.empty())
-	{
-		int rc = mysql_stmt_fetch(m_stmt.get());
-		if (rc == 1)
-		{
-			ThrowError(fmt::format("Fetch error: {}", GetStmtError()));
-		}
-
-		if (rc != MYSQL_NO_DATA)
-		{
-			if (rc == MYSQL_DATA_TRUNCATED)
-			{
-				FetchTruncated();
-			}
-			row = StmtRow(m_columns);
-		}
-	}
-	return row;
-}
-
-void PreparedStmt::FetchTruncated()
-{
-	for (int i = 0; i < static_cast<int>(m_columns.size()); ++i)
-	{
-		impl::BindColumn& col = m_columns[i].m_col;
-		if (col.error)
-		{
-			MYSQL_BIND& bind = m_results[i];
-			col.buffer.resize(static_cast<size_t>(col.length * 1.5));
-			bind.buffer = col.buffer.data();
-			bind.buffer_length = static_cast<unsigned long>(col.buffer.size());
-
-			mysql_stmt_fetch_column(m_stmt.get(), &bind, i, 0);
-		}
-	}
-
-	if (mysql_stmt_bind_result(m_stmt.get(), m_results.data()) != 0)
-	{
-		ThrowError(fmt::format("Fetch rebind result error: {}", GetStmtError()));
-	}
-}
-
-// ---------------------------------------------------------------------------
-
-StmtResult::StmtResult(MYSQL_STMT* stmt, size_t columns)
-{
-	m_num_cols  = static_cast<int>(columns);
-	m_num_rows  = mysql_stmt_num_rows(stmt); // requires buffered results
-	m_affected  = mysql_stmt_affected_rows(stmt);
-	m_insert_id = mysql_stmt_insert_id(stmt);
-}
-
-// ---------------------------------------------------------------------------
-
-const StmtColumn* StmtRow::GetColumn(size_t index) const
-{
-	return index < m_columns.size() ? &m_columns[index] : nullptr;
-}
-
-const StmtColumn* StmtRow::GetColumn(std::string_view name) const
-{
-	auto it = std::ranges::find_if(m_columns,
-		[name](const StmtColumn& col) { return col.Name() == name; });
-
-	return it != m_columns.end() ? &(*it) : nullptr;
-}
-
-std::optional<std::string> StmtRow::operator[](size_t index) const
-{
-	return GetStr(index);
-}
-
-std::optional<std::string> StmtRow::operator[](std::string_view name) const
-{
-	return GetStr(name);
-}
-
-std::optional<std::string> StmtRow::GetStr(size_t index) const
-{
-	const StmtColumn* col = GetColumn(index);
-	return col ? col->GetStr() : std::nullopt;
-}
-
-std::optional<std::string> StmtRow::GetStr(std::string_view name) const
-{
-	const StmtColumn* col = GetColumn(name);
-	return col ? col->GetStr() : std::nullopt;
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtRow::Get(size_t index) const
-{
-	const StmtColumn* col = GetColumn(index);
-	return col ? col->Get<T>() : std::nullopt;
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtRow::Get(std::string_view name) const
-{
-	const StmtColumn* col = GetColumn(name);
-	return col ? col->Get<T>() : std::nullopt;
-}
-
-// ---------------------------------------------------------------------------
-
-static time_t MakeTime(const MYSQL_TIME& mt)
-{
-	// buffer mt given in mysql session time zone (assumes local)
-	std::tm tm{};
-	tm.tm_year  = mt.year - 1900;
-	tm.tm_mon   = mt.month - 1;
-	tm.tm_mday  = mt.day;
-	tm.tm_hour  = mt.hour;
-	tm.tm_min   = mt.minute;
-	tm.tm_sec   = mt.second;
-	tm.tm_isdst = -1;
-	return std::mktime(&tm);
-}
-
-static int MakeSeconds(const MYSQL_TIME& mt)
-{
-	return (mt.neg ? -1 : 1) * static_cast<int>(mt.hour * 3600 + mt.minute * 60 + mt.second);
-}
-
-static uint64_t MakeBits(std::span<const uint8_t> data)
-{
-	// byte stream for bits is in big endian
-	uint64_t bits = 0;
-	for (size_t i = 0; i < data.size() && i < sizeof(uint64_t); ++i)
-	{
-		bits |= static_cast<uint64_t>(data[data.size() - i - 1] & 0xff) << (i * 8);
-	}
-	return bits;
-}
-
-template <typename T>
-concept has_from_chars = requires (const char* first, const char* last, T value)
-{
-	std::from_chars(first, last, value);
-};
-
-template <typename T>
-static T FromString(std::string_view sv)
-{
-	if constexpr (std::is_same_v<T, bool>)
-	{
-		// return false for empty (zero-length) strings
-		return !sv.empty();
-	}
-	else if constexpr (std::is_same_v<T, float> && !has_from_chars<T>)
-	{
-		return std::strtof(std::string(sv).c_str(), nullptr);
-	}
-	else if constexpr (std::is_same_v<T, double> && !has_from_chars<T>)
-	{
-		return std::strtod(std::string(sv).c_str(), nullptr);
-	}
-	else
-	{
-		// non numbers return a zero initialized T (could return nullopt instead)
-		T value = {};
-		std::from_chars(sv.data(), sv.data() + sv.size(), value);
-		return value;
-	}
-}
-
-static std::string FormatTime(enum_field_types type, const MYSQL_TIME& mt)
-{
-	switch (type)
-	{
-	case MYSQL_TYPE_TIME: // hhh:mm:ss '-838:59:59' to '838:59:59'
-		return fmt::format("{}{:02d}:{:02d}:{:02d}", mt.neg ? "-" : "", mt.hour, mt.minute, mt.second);
-	case MYSQL_TYPE_DATE: // YYYY-MM-DD '1000-01-01' to '9999-12-31'
-		return fmt::format("{}-{:02d}-{:02d}", mt.year, mt.month, mt.day);
-	case MYSQL_TYPE_DATETIME:  // YYYY-MM-DD hh:mm:ss '1000-01-01 00:00:00' to '9999-12-31 23:59:59'
-	case MYSQL_TYPE_TIMESTAMP: // YYYY-MM-DD hh:mm:ss '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC
-		return fmt::format("{}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}", mt.year, mt.month, mt.day, mt.hour, mt.minute, mt.second);
-	default:
-		return std::string();
-	}
-}
-
-std::optional<std::string_view> StmtColumn::GetStrView() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return std::make_optional<std::string_view>(reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length);
-	default:
-		return std::nullopt;
-	}
-}
-
-std::optional<std::string> StmtColumn::GetStr() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_TINY:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint8_t>()).c_str() : fmt::format_int(BitCast<int8_t>()).c_str();
-	case MYSQL_TYPE_SHORT:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint16_t>()).c_str() : fmt::format_int(BitCast<int16_t>()).c_str();
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint32_t>()).c_str() : fmt::format_int(BitCast<int32_t>()).c_str();
-	case MYSQL_TYPE_LONGLONG:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint64_t>()).c_str() : fmt::format_int(BitCast<int64_t>()).c_str();
-	case MYSQL_TYPE_FLOAT:
-		return fmt::format("{}", BitCast<float>());
-	case MYSQL_TYPE_DOUBLE:
-		return fmt::format("{}", BitCast<double>());
-	case MYSQL_TYPE_TIME:
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP:
-		return FormatTime(m_col.buffer_type, BitCast<MYSQL_TIME>());
-	case MYSQL_TYPE_BIT:
-		return fmt::format_int(*Get<uint64_t>()).c_str();
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return std::make_optional<std::string>(reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length);
-	default:
-		return std::nullopt;
-	}
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtColumn::Get() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_TINY:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint8_t>()) : static_cast<T>(BitCast<int8_t>());
-	case MYSQL_TYPE_SHORT:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint16_t>()) : static_cast<T>(BitCast<int16_t>());
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint32_t>()) : static_cast<T>(BitCast<int32_t>());
-	case MYSQL_TYPE_LONGLONG:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint64_t>()) : static_cast<T>(BitCast<int64_t>());
-	case MYSQL_TYPE_FLOAT:
-		return static_cast<T>(BitCast<float>());
-	case MYSQL_TYPE_DOUBLE:
-		return static_cast<T>(BitCast<double>());
-	case MYSQL_TYPE_TIME: // return as total seconds
-		return static_cast<T>(MakeSeconds(BitCast<MYSQL_TIME>()));
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP: // return as epoch timestamp
-		return static_cast<T>(MakeTime(BitCast<MYSQL_TIME>()));
-	case MYSQL_TYPE_BIT:
-		return static_cast<T>(MakeBits({ m_col.buffer.data(), m_col.length }));
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return FromString<T>({ reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length });
-	default:
-		return std::nullopt;
-	}
-}
-
-// ---------------------------------------------------------------------------
-
-// explicit template instantiations for supported types
-template void PreparedStmt::BindInput(size_t, std::string_view);
-template void PreparedStmt::BindInput(size_t, std::nullptr_t);
-template StmtResult PreparedStmt::Execute(const std::vector<std::string_view>&);
-template StmtResult PreparedStmt::Execute(const std::vector<std::string>&);
-template StmtResult PreparedStmt::Execute(const std::vector<const char*>&);
-
-#define INSTANTIATE(T) \
-	template void PreparedStmt::BindInput(size_t, T); \
-	template StmtResult PreparedStmt::Execute(const std::vector<T>&); \
-	template std::optional<T> StmtRow::Get(size_t) const; \
-	template std::optional<T> StmtRow::Get(std::string_view) const; \
-	template std::optional<T> StmtColumn::Get() const;
-
-INSTANTIATE(bool);
-INSTANTIATE(int8_t);
-INSTANTIATE(uint8_t);
-INSTANTIATE(int16_t);
-INSTANTIATE(uint16_t);
-INSTANTIATE(int32_t);
-INSTANTIATE(uint32_t);
-INSTANTIATE(int64_t);
-INSTANTIATE(uint64_t);
-INSTANTIATE(float);
-INSTANTIATE(double);
-
-} // namespace mysql

common/mysql_stmt.h

@@ -1,221 +0,0 @@
-#pragma once
-
-#include "mysql.h"
-#include <cassert>
-#include <cstring>
-#include <memory>
-#include <optional>
-#include <span>
-#include <string>
-#include <string_view>
-#include <variant>
-#include <vector>
-
-class Mutex;
-
-namespace mysql
-{
-
-// support MySQL 8.0.1+ API which removed the my_bool type
-#if !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80001
-using my_bool = bool;
-#endif
-
-template <typename>
-inline constexpr bool false_v = false;
-
-namespace impl
-{
-
-struct Bind
-{
-	std::vector<uint8_t> buffer;
-	unsigned long length = 0;
-	my_bool is_null = false;
-	my_bool error = false;
-};
-
-struct BindColumn : Bind
-{
-	int index = 0;
-	std::string name;
-	bool is_unsigned = false;
-	enum_field_types buffer_type = {};
-};
-
-} // namespace impl
-
-// ---------------------------------------------------------------------------
-
-struct StmtOptions
-{
-	// Enable buffering (storing) entire result set after executing a statement
-	bool buffer_results = true;
-
-	// Enable MySQL to update max_length of fields in execute result set (requires buffering)
-	bool use_max_length = true;
-};
-
-// ---------------------------------------------------------------------------
-
-// Holds ownership of bound column value buffer
-class StmtColumn
-{
-public:
-	int Index() const { return m_col.index; }
-	bool IsNull() const { return m_col.is_null; }
-	bool IsUnsigned() const { return m_col.is_unsigned; }
-	enum_field_types Type() const { return m_col.buffer_type; }
-	const std::string& Name() const { return m_col.name; }
-
-	// Get view of column value buffer
-	std::span<const uint8_t> GetBuf() const { return { m_col.buffer.data(), m_col.length }; }
-
-	// Get view of column string value. Returns nullopt if value is NULL or not a string
-	std::optional<std::string_view> GetStrView() const;
-
-	// Get column value as string. Returns nullopt if value is NULL or field type unsupported
-	std::optional<std::string> GetStr() const;
-
-	// Get column value as numeric T. Returns nullopt if value NULL or field type unsupported
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get() const;
-
-private:
-	// uses memcpy for type punning buffer data to avoid UB with strict aliasing
-	template <typename T>
-	T BitCast() const
-	{
-		T val;
-		assert(sizeof(T) == m_col.length);
-		memcpy(&val, m_col.buffer.data(), sizeof(T));
-		return val;
-	}
-
-	friend class PreparedStmt; // access to allocate and bind buffers
-	friend class StmtResult; // access to resize truncated buffers
-	impl::BindColumn m_col;
-};
-
-// ---------------------------------------------------------------------------
-
-// Provides a non-owning view of PreparedStmt column value buffers
-// Evaluates false if it does not contain a valid row
-class StmtRow
-{
-public:
-	StmtRow() = default;
-	StmtRow(std::span<const StmtColumn> columns) : m_columns(columns) {};
-
-	explicit operator bool() const noexcept { return !m_columns.empty(); }
-
-	int ColumnCount() const { return static_cast<int>(m_columns.size()); }
-	const StmtColumn* GetColumn(size_t index) const;
-	const StmtColumn* GetColumn(std::string_view name) const;
-
-	// Get specified column value as string
-	// Returns nullopt if column invalid, value is NULL, or field type unsupported
-	std::optional<std::string> operator[](size_t index) const;
-	std::optional<std::string> operator[](std::string_view name) const;
-	std::optional<std::string> GetStr(size_t index) const;
-	std::optional<std::string> GetStr(std::string_view name) const;
-
-	// Get specified column value as numeric T
-	// Returns nullopt if column invalid, value is NULL, or field type unsupported
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get(size_t index) const;
-
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get(std::string_view name) const;
-
-	auto begin() const { return m_columns.begin(); }
-	auto end()   const { return m_columns.end(); }
-
-private:
-	std::span<const StmtColumn> m_columns;
-};
-
-// ---------------------------------------------------------------------------
-
-// Result meta data for an executed prepared statement
-class StmtResult
-{
-public:
-	StmtResult() = default;
-	StmtResult(MYSQL_STMT* stmt, size_t columns);
-
-	int ColumnCount() const { return m_num_cols; }
-	uint64_t RowCount() const { return m_num_rows; }
-	uint64_t RowsAffected() const { return m_affected; }
-	uint64_t LastInsertID() const { return m_insert_id; }
-
-private:
-	int m_num_cols = 0;
-	uint64_t m_num_rows = 0;
-	uint64_t m_affected = 0;
-	uint64_t m_insert_id = 0;
-};
-
-// ---------------------------------------------------------------------------
-
-class PreparedStmt
-{
-public:
-	// Supported argument types for execute
-	using param_t = std::variant<int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
-		int64_t, uint64_t, float, double, bool, std::string_view, std::nullptr_t>;
-
-	PreparedStmt() = delete;
-	PreparedStmt(MYSQL& mysql, std::string query, Mutex* mutex, StmtOptions opts = {});
-
-	const std::string& GetQuery() const { return m_query; }
-	StmtOptions GetOptions() const { return m_options; }
-	void SetOptions(StmtOptions options) { m_options = options; }
-	void FreeResult() { mysql_stmt_free_result(m_stmt.get()); }
-
-	// Execute the prepared statement with specified arguments
-	// Throws exception on error
-	template <typename T>
-	StmtResult Execute(const std::vector<T>& args);
-	StmtResult Execute(const std::vector<param_t>& args);
-	StmtResult Execute();
-
-	// Fetch the next row into column buffers (overwrites previous row values)
-	// Return value evaluates false if no more rows to fetch
-	// Throws exception on error
-	StmtRow Fetch();
-
-private:
-	void CheckArgs(size_t argc);
-	StmtResult DoExecute();
-	void BindResults();
-	void FetchTruncated();
-	int GetResultBufferSize(const MYSQL_FIELD& field) const;
-	void ThrowError(const std::string& error);
-	std::string GetStmtError();
-
-	// bind an input value to a query parameter by index
-	template <typename T>
-	void BindInput(size_t index, T value);
-	void BindInput(size_t index, const char* str);
-	void BindInput(size_t index, const std::string& str);
-
-	struct StmtDeleter
-	{
-		Mutex* mutex = nullptr;
-		void operator()(MYSQL_STMT* stmt) noexcept;
-	};
-
-private:
-	std::unique_ptr<MYSQL_STMT, StmtDeleter> m_stmt;
-	std::vector<MYSQL_BIND> m_params;  // input binds
-	std::vector<MYSQL_BIND> m_results; // result binds
-	std::vector<impl::Bind> m_inputs;  // execute buffers (addresses bound)
-	std::vector<StmtColumn> m_columns; // fetch buffers (addresses bound)
-	std::string m_query;
-	StmtOptions m_options = {};
-	bool m_need_bind = true;
-	Mutex* m_mutex = nullptr; // connection mutex
-};
-
-} // namespace mysql

common/patches/rof.cpp

@@ -4538,14 +4538,10 @@ namespace RoF
 		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
 		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
 
-		IN(type)
-		IN(id);
+		IN(npc_id);
 		IN(client_pos.x);
 		IN(client_pos.y);
 		IN(client_pos.z);
-		IN(target_pos.x);
-		IN(target_pos.y);
-		IN(target_pos.z);
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/rof2.cpp

@@ -5517,14 +5517,10 @@ namespace RoF2
 		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
 		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
 
-		IN(type)
-		IN(id);
+		IN(npc_id);
 		IN(client_pos.x);
 		IN(client_pos.y);
 		IN(client_pos.z);
-		IN(target_pos.x);
-		IN(target_pos.y);
-		IN(target_pos.z);
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/rof2_structs.h

@@ -4016,13 +4016,14 @@ struct FindPerson_Point {
 };
 
 struct FindPersonRequest_Struct {
-/*00*/	FindLocationType type;
-/*04*/	int32 id;
-/*08*/	int32 unknown08;
-/*12*/	int32 unknown12;
+/*00*/	uint32	unknown00;
+/*04*/	uint32	npc_id;
+/*08*/	uint32	unknown08;
+/*12*/	uint32	unknown12;
 /*16*/	FindPerson_Point client_pos;
-/*28*/	FindPerson_Point target_pos;
-/*40*/
+/*28*/	uint32	unknown28;
+/*32*/	uint32	unknown32;
+/*36*/	uint32	unknown36;
 };
 
 //variable length packet of points

common/patches/rof_structs.h

@@ -3779,13 +3779,14 @@ struct FindPerson_Point {
 };
 
 struct FindPersonRequest_Struct {
-	/*00*/	FindLocationType type;
-	/*04*/	int32 id;
-	/*08*/	int32 unknown08;
-	/*12*/	int32 unknown12;
-	/*16*/	FindPerson_Point client_pos;
-	/*28*/	FindPerson_Point target_pos;
-	/*40*/
+/*00*/	uint32	unknown00;
+/*04*/	uint32	npc_id;
+/*08*/	uint32	unknown08;
+/*12*/	uint32	unknown12;
+/*16*/	FindPerson_Point client_pos;
+/*28*/	uint32	unknown28;
+/*32*/	uint32	unknown32;
+/*36*/	uint32	unknown36;
 };
 
 //variable length packet of points

common/patches/sod.cpp

@@ -3150,8 +3150,7 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
 		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
 
-		emu->type = FindLocationType::LocationPlayer;
-		emu->id = eq->npc_id;
+		IN(npc_id);
 		IN(client_pos.x);
 		IN(client_pos.y);
 		IN(client_pos.z);

common/patches/sof.cpp

@@ -2605,8 +2605,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
 		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
 
-		emu->type = FindLocationType::LocationPlayer;
-		emu->id = eq->npc_id;
+		IN(npc_id);
 		IN(client_pos.x);
 		IN(client_pos.y);
 		IN(client_pos.z);

common/patches/titanium.cpp

@@ -3327,20 +3327,6 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_FindPersonRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
-		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
-
-		emu->type = FindLocationType::LocationPlayer;
-		emu->id = eq->npc_id;
-		IN(client_pos.x);
-		IN(client_pos.y);
-		IN(client_pos.z);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 // file scope helper methods
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) {
 		const char *protection      = "\\\\\\\\\\";

common/patches/titanium_ops.h

@@ -132,7 +132,6 @@ D(OP_TradeSkillCombine)
 D(OP_TributeItem)
 D(OP_WearChange)
 D(OP_WhoAllRequest)
-D(OP_FindPersonRequest)
 
 #undef E
 #undef D

common/patches/uf.cpp

@@ -3982,8 +3982,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::FindPersonRequest_Struct);
 		SETUP_DIRECT_DECODE(FindPersonRequest_Struct, structs::FindPersonRequest_Struct);
 
-		emu->type = FindLocationType::LocationPlayer;
-		emu->id = eq->npc_id;
+		IN(npc_id);
 		IN(client_pos.x);
 		IN(client_pos.y);
 		IN(client_pos.z);

common/path_manager.cpp

@@ -74,11 +74,6 @@ void PathManager::LoadPaths()
 		m_patch_path = fs::relative(fs::path{m_server_path + "/" + c->PatchDir}).string();
 	}
 
-	// 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();
-	}
-
 	// 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();
@@ -94,7 +89,6 @@ void PathManager::LoadPaths()
 	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);
@@ -135,11 +129,6 @@ const std::string &PathManager::GetPatchPath() const
 	return m_patch_path;
 }
 
-const std::string &PathManager::GetOpcodePath() const
-{
-	return m_opcode_path;
-}
-
 const std::string &PathManager::GetLuaModulesPath() const
 {
 	return m_lua_modules_path;

common/path_manager.h

@@ -13,7 +13,6 @@ public:
 	[[nodiscard]] const std::string &GetLuaModulesPath() const;
 	[[nodiscard]] const std::string &GetMapsPath() const;
 	[[nodiscard]] const std::string &GetPatchPath() const;
-	[[nodiscard]] const std::string &GetOpcodePath() const;
 	[[nodiscard]] const std::string &GetPluginsPath() const;
 	[[nodiscard]] const std::string &GetQuestsPath() const;
 	[[nodiscard]] const std::string &GetServerPath() const;
@@ -25,7 +24,6 @@ private:
 	std::string m_lua_modules_path;
 	std::string m_maps_path;
 	std::string m_patch_path;
-	std::string m_opcode_path;
 	std::string m_plugins_path;
 	std::string m_quests_path;
 	std::string m_server_path;

common/pch/pch-containers.h

@@ -0,0 +1,13 @@
+#ifndef EQEMU_CONTAINERS_PCH_H
+#define EQEMU_CONTAINERS_PCH_H
+
+// containers
+#include <iterator>
+#include <set>
+#include <unordered_set>
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <vector>
+
+#endif

common/pch/pch-emu-common.h

@@ -0,0 +1,20 @@
+#ifndef EQEMU_EMU_COMMON_PCH_H
+#define EQEMU_EMU_COMMON_PCH_H
+
+#include "mysql.h"
+
+// emu
+#include "../../common/types.h"
+#include "../../common/database.h"
+#include "../../common/timer.h"
+#include "../../common/strings.h"
+#include "../../common/http/httplib.h"
+#include "../../common/base_packet.h"
+#include "../../common/database.h"
+#include "../../common/emu_constants.h"
+#include "../../common/servertalk.h"
+#include "../../common/global_define.h"
+#include "../../common/eqemu_logsys.h"
+#include "../../common/linked_list.h"
+
+#endif

common/pch/pch-fmt.h

@@ -0,0 +1,9 @@
+#ifndef EQEMU_FMT_PCH_H
+#define EQEMU_FMT_PCH_H
+
+// fmt
+#include <fmt/format.h>
+#include <fmt/core.h>
+#include <cereal/archives/json.hpp>
+
+#endif

common/pch/pch-repositories.h

@@ -0,0 +1,229 @@
+#ifndef EQEMU_REPOSITORIES_PCH_H
+#define EQEMU_REPOSITORIES_PCH_H
+
+#include "../../common/repositories/discovered_items_repository.h"
+#include "../../common/repositories/lootdrop_repository.h"
+#include "../../common/repositories/spells_new_repository.h"
+#include "../../common/repositories/aa_rank_effects_repository.h"
+#include "../../common/repositories/titles_repository.h"
+#include "../../common/repositories/character_bandolier_repository.h"
+#include "../../common/repositories/completed_shared_tasks_repository.h"
+#include "../../common/repositories/faction_list_mod_repository.h"
+#include "../../common/repositories/merc_templates_repository.h"
+#include "../../common/repositories/spawngroup_repository.h"
+#include "../../common/repositories/character_bind_repository.h"
+#include "../../common/repositories/npc_types_tint_repository.h"
+#include "../../common/repositories/merc_armorinfo_repository.h"
+#include "../../common/repositories/adventure_template_entry_flavor_repository.h"
+#include "../../common/repositories/character_pet_info_repository.h"
+#include "../../common/repositories/raid_details_repository.h"
+#include "../../common/repositories/guild_tributes_repository.h"
+#include "../../common/repositories/tasksets_repository.h"
+#include "../../common/repositories/character_inspect_messages_repository.h"
+#include "../../common/repositories/merc_spell_list_entries_repository.h"
+#include "../../common/repositories/npc_types_repository.h"
+#include "../../common/repositories/bot_buffs_repository.h"
+#include "../../common/repositories/shared_task_activity_state_repository.h"
+#include "../../common/repositories/forage_repository.h"
+#include "../../common/repositories/global_loot_repository.h"
+#include "../../common/repositories/adventure_members_repository.h"
+#include "../../common/repositories/merc_subtypes_repository.h"
+#include "../../common/repositories/aa_ranks_repository.h"
+#include "../../common/repositories/character_auras_repository.h"
+#include "../../common/repositories/loottable_repository.h"
+#include "../../common/repositories/bot_timers_repository.h"
+#include "../../common/repositories/graveyard_repository.h"
+#include "../../common/repositories/expedition_lockouts_repository.h"
+#include "../../common/repositories/bot_group_members_repository.h"
+#include "../../common/repositories/spawn_conditions_repository.h"
+#include "../../common/repositories/character_disciplines_repository.h"
+#include "../../common/repositories/npc_faction_entries_repository.h"
+#include "../../common/repositories/pets_equipmentset_entries_repository.h"
+#include "../../common/repositories/bot_inspect_messages_repository.h"
+#include "../../common/repositories/char_create_combinations_repository.h"
+#include "../../common/repositories/guild_ranks_repository.h"
+#include "../../common/repositories/character_stats_record_repository.h"
+#include "../../common/repositories/adventure_stats_repository.h"
+#include "../../common/repositories/buyer_trade_items_repository.h"
+#include "../../common/repositories/buyer_buy_lines_repository.h"
+#include "../../common/repositories/timers_repository.h"
+#include "../../common/repositories/lfguild_repository.h"
+#include "../../common/repositories/character_potionbelt_repository.h"
+#include "../../common/repositories/ground_spawns_repository.h"
+#include "../../common/repositories/npc_spells_effects_repository.h"
+#include "../../common/repositories/guild_relations_repository.h"
+#include "../../common/repositories/merc_stats_repository.h"
+#include "../../common/repositories/petitions_repository.h"
+#include "../../common/repositories/chatchannels_repository.h"
+#include "../../common/repositories/character_parcels_repository.h"
+#include "../../common/repositories/zone_flags_repository.h"
+#include "../../common/repositories/merc_merchant_templates_repository.h"
+#include "../../common/repositories/criteria/content_filter_criteria.h"
+#include "../../common/repositories/login_server_admins_repository.h"
+#include "../../common/repositories/character_pet_inventory_repository.h"
+#include "../../common/repositories/merc_name_types_repository.h"
+#include "../../common/repositories/character_peqzone_flags_repository.h"
+#include "../../common/repositories/spawnentry_repository.h"
+#include "../../common/repositories/player_titlesets_repository.h"
+#include "../../common/repositories/gm_ips_repository.h"
+#include "../../common/repositories/character_spells_repository.h"
+#include "../../common/repositories/rule_sets_repository.h"
+#include "../../common/repositories/character_alt_currency_repository.h"
+#include "../../common/repositories/aa_ability_repository.h"
+#include "../../common/repositories/command_subsettings_repository.h"
+#include "../../common/repositories/items_repository.h"
+#include "../../common/repositories/login_api_tokens_repository.h"
+#include "../../common/repositories/bot_stances_repository.h"
+#include "../../common/repositories/spell_globals_repository.h"
+#include "../../common/repositories/pets_equipmentset_repository.h"
+#include "../../common/repositories/starting_items_repository.h"
+#include "../../common/repositories/bot_create_combinations_repository.h"
+#include "../../common/repositories/inventory_snapshots_repository.h"
+#include "../../common/repositories/ldon_trap_templates_repository.h"
+#include "../../common/repositories/guild_members_repository.h"
+#include "../../common/repositories/expeditions_repository.h"
+#include "../../common/repositories/level_exp_mods_repository.h"
+#include "../../common/repositories/pets_beastlord_data_repository.h"
+#include "../../common/repositories/merc_stance_entries_repository.h"
+#include "../../common/repositories/doors_repository.h"
+#include "../../common/repositories/tool_game_objects_repository.h"
+#include "../../common/repositories/npc_spells_entries_repository.h"
+#include "../../common/repositories/bot_heal_rotation_targets_repository.h"
+#include "../../common/repositories/shared_tasks_repository.h"
+#include "../../common/repositories/tradeskill_recipe_repository.h"
+#include "../../common/repositories/char_create_point_allocations_repository.h"
+#include "../../common/repositories/bot_spells_entries_repository.h"
+#include "../../common/repositories/raid_members_repository.h"
+#include "../../common/repositories/character_languages_repository.h"
+#include "../../common/repositories/merchantlist_repository.h"
+#include "../../common/repositories/object_repository.h"
+#include "../../common/repositories/login_world_servers_repository.h"
+#include "../../common/repositories/character_parcels_containers_repository.h"
+#include "../../common/repositories/bot_starting_items_repository.h"
+#include "../../common/repositories/adventure_template_entry_repository.h"
+#include "../../common/repositories/alternate_currency_repository.h"
+#include "../../common/repositories/tributes_repository.h"
+#include "../../common/repositories/bug_reports_repository.h"
+#include "../../common/repositories/account_repository.h"
+#include "../../common/repositories/quest_globals_repository.h"
+#include "../../common/repositories/merc_types_repository.h"
+#include "../../common/repositories/completed_tasks_repository.h"
+#include "../../common/repositories/object_contents_repository.h"
+#include "../../common/repositories/dynamic_zone_members_repository.h"
+#include "../../common/repositories/aa_rank_prereqs_repository.h"
+#include "../../common/repositories/bot_pet_buffs_repository.h"
+#include "../../common/repositories/character_activities_repository.h"
+#include "../../common/repositories/character_corpse_items_repository.h"
+#include "../../common/repositories/spawn2_repository.h"
+#include "../../common/repositories/bot_owner_options_repository.h"
+#include "../../common/repositories/bot_heal_rotations_repository.h"
+#include "../../common/repositories/content_flags_repository.h"
+#include "../../common/repositories/ip_exemptions_repository.h"
+#include "../../common/repositories/completed_shared_task_members_repository.h"
+#include "../../common/repositories/character_material_repository.h"
+#include "../../common/repositories/grid_repository.h"
+#include "../../common/repositories/db_str_repository.h"
+#include "../../common/repositories/character_skills_repository.h"
+#include "../../common/repositories/guild_bank_repository.h"
+#include "../../common/repositories/reports_repository.h"
+#include "../../common/repositories/instance_list_player_repository.h"
+#include "../../common/repositories/character_tribute_repository.h"
+#include "../../common/repositories/ldon_trap_entries_repository.h"
+#include "../../common/repositories/bot_pets_repository.h"
+#include "../../common/repositories/merc_buffs_repository.h"
+#include "../../common/repositories/skill_caps_repository.h"
+#include "../../common/repositories/character_data_repository.h"
+#include "../../common/repositories/account_ip_repository.h"
+#include "../../common/repositories/traps_repository.h"
+#include "../../common/repositories/dynamic_zone_templates_repository.h"
+#include "../../common/repositories/mail_repository.h"
+#include "../../common/repositories/group_leaders_repository.h"
+#include "../../common/repositories/respawn_times_repository.h"
+#include "../../common/repositories/task_activities_repository.h"
+#include "../../common/repositories/blocked_spells_repository.h"
+#include "../../common/repositories/rule_values_repository.h"
+#include "../../common/repositories/tradeskill_recipe_entries_repository.h"
+#include "../../common/repositories/spawn_events_repository.h"
+#include "../../common/repositories/player_event_log_settings_repository.h"
+#include "../../common/repositories/completed_shared_task_activity_state_repository.h"
+#include "../../common/repositories/inventory_repository.h"
+#include "../../common/repositories/perl_event_export_settings_repository.h"
+#include "../../common/repositories/zone_points_repository.h"
+#include "../../common/repositories/character_memmed_spells_repository.h"
+#include "../../common/repositories/spawn_condition_values_repository.h"
+#include "../../common/repositories/login_server_list_types_repository.h"
+#include "../../common/repositories/npc_emotes_repository.h"
+#include "../../common/repositories/veteran_reward_templates_repository.h"
+#include "../../common/repositories/merc_weaponinfo_repository.h"
+#include "../../common/repositories/data_buckets_repository.h"
+#include "../../common/repositories/fishing_repository.h"
+#include "../../common/repositories/books_repository.h"
+#include "../../common/repositories/character_alternate_abilities_repository.h"
+#include "../../common/repositories/bot_spell_casting_chances_repository.h"
+#include "../../common/repositories/login_accounts_repository.h"
+#include "../../common/repositories/tribute_levels_repository.h"
+#include "../../common/repositories/merchantlist_temp_repository.h"
+#include "../../common/repositories/account_rewards_repository.h"
+#include "../../common/repositories/lootdrop_entries_repository.h"
+#include "../../common/repositories/server_scheduled_events_repository.h"
+#include "../../common/repositories/bot_groups_repository.h"
+#include "../../common/repositories/shared_task_dynamic_zones_repository.h"
+#include "../../common/repositories/zone_repository.h"
+#include "../../common/repositories/horses_repository.h"
+#include "../../common/repositories/character_pet_buffs_repository.h"
+#include "../../common/repositories/dynamic_zones_repository.h"
+#include "../../common/repositories/start_zones_repository.h"
+#include "../../common/repositories/keyring_repository.h"
+#include "../../common/repositories/merc_merchant_template_entries_repository.h"
+#include "../../common/repositories/character_item_recast_repository.h"
+#include "../../common/repositories/merc_inventory_repository.h"
+#include "../../common/repositories/merc_npc_types_repository.h"
+#include "../../common/repositories/pets_repository.h"
+#include "../../common/repositories/damageshieldtypes_repository.h"
+#include "../../common/repositories/char_recipe_list_repository.h"
+#include "../../common/repositories/instance_list_repository.h"
+#include "../../common/repositories/bot_guild_members_repository.h"
+#include "../../common/repositories/character_tasks_repository.h"
+#include "../../common/repositories/npc_spells_effects_entries_repository.h"
+#include "../../common/repositories/auras_repository.h"
+#include "../../common/repositories/character_task_timers_repository.h"
+#include "../../common/repositories/merc_spell_lists_repository.h"
+#include "../../common/repositories/npc_faction_repository.h"
+#include "../../common/repositories/friends_repository.h"
+#include "../../common/repositories/bot_spell_settings_repository.h"
+#include "../../common/repositories/player_event_logs_repository.h"
+#include "../../common/repositories/bot_data_repository.h"
+#include "../../common/repositories/character_leadership_abilities_repository.h"
+#include "../../common/repositories/grid_entries_repository.h"
+#include "../../common/repositories/bot_inventories_repository.h"
+#include "../../common/repositories/tasks_repository.h"
+#include "../../common/repositories/name_filter_repository.h"
+#include "../../common/repositories/character_instance_safereturns_repository.h"
+#include "../../common/repositories/faction_association_repository.h"
+#include "../../common/repositories/logsys_categories_repository.h"
+#include "../../common/repositories/buyer_repository.h"
+#include "../../common/repositories/character_currency_repository.h"
+#include "../../common/repositories/discord_webhooks_repository.h"
+#include "../../common/repositories/guild_permissions_repository.h"
+#include "../../common/repositories/chatchannel_reserved_names_repository.h"
+#include "../../common/repositories/character_expedition_lockouts_repository.h"
+#include "../../common/repositories/loottable_entries_repository.h"
+#include "../../common/repositories/bot_pet_inventories_repository.h"
+#include "../../common/repositories/npc_spells_repository.h"
+#include "../../common/repositories/faction_list_repository.h"
+#include "../../common/repositories/group_id_repository.h"
+#include "../../common/repositories/character_buffs_repository.h"
+#include "../../common/repositories/faction_values_repository.h"
+#include "../../common/repositories/variables_repository.h"
+#include "../../common/repositories/guilds_repository.h"
+#include "../../common/repositories/bot_heal_rotation_members_repository.h"
+#include "../../common/repositories/spell_buckets_repository.h"
+#include "../../common/repositories/spawn2_disabled_repository.h"
+#include "../../common/repositories/saylink_repository.h"
+#include "../../common/repositories/trader_repository.h"
+#include "../../common/repositories/shared_task_members_repository.h"
+#include "../../common/repositories/merc_merchant_entries_repository.h"
+#include "../../common/repositories/character_corpses_repository.h"
+#include "../../common/repositories/adventure_details_repository.h"
+
+#endif

common/pch/pch-types.h

@@ -0,0 +1,11 @@
+#ifndef EQEMU_TYPES_PCH_H
+#define EQEMU_TYPES_PCH_H
+
+// types
+#include <limits>
+#include <string>
+#include <cctype>
+#include <sstream>
+#include <type_traits>
+
+#endif

common/pch/pch-utilities.h

@@ -0,0 +1,20 @@
+#ifndef EQEMU_UTILITIES_PCH_H
+#define EQEMU_UTILITIES_PCH_H
+
+// utilities
+#include <iostream>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <functional>
+#include <algorithm>
+#include <utility>
+#include <tuple>
+#include <fstream>
+#include <chrono>
+#include <cstdio>
+#include <stdio.h>
+#include <mutex>
+#include <filesystem>
+
+#endif

common/pch/pch.h

@@ -1,34 +0,0 @@
-// types
-#include <limits>
-#include <string>
-#include <cctype>
-#include <sstream>
-
-// containers
-#include <iterator>
-#include <set>
-#include <unordered_set>
-#include <map>
-#include <unordered_map>
-#include <list>
-#include <vector>
-
-// utilities
-#include <iostream>
-#include <cassert>
-#include <cmath>
-#include <memory>
-#include <functional>
-#include <algorithm>
-#include <utility>
-#include <tuple>
-#include <fstream>
-#include <cstdio>
-
-// fmt
-#include <fmt/format.h>
-
-// lua
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-#include <luabind/object.hpp>

common/repositories/base/base_findable_location_repository.h

@@ -1,547 +0,0 @@
-/**
- * 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_FINDABLE_LOCATION_REPOSITORY_H
-#define EQEMU_BASE_FINDABLE_LOCATION_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseFindableLocationRepository {
-public:
-	struct FindableLocation {
-		uint32_t    id;
-		std::string zone;
-		int32_t     version;
-		int32_t     findable_id;
-		int32_t     findable_sub_id;
-		int32_t     type;
-		int32_t     zone_id;
-		int32_t     zone_id_index;
-		float       x;
-		float       y;
-		float       z;
-		int8_t      min_expansion;
-		int8_t      max_expansion;
-		std::string content_flags;
-		std::string content_flags_disabled;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"zone",
-			"version",
-			"findable_id",
-			"findable_sub_id",
-			"type",
-			"zone_id",
-			"zone_id_index",
-			"x",
-			"y",
-			"z",
-			"min_expansion",
-			"max_expansion",
-			"content_flags",
-			"content_flags_disabled",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"zone",
-			"version",
-			"findable_id",
-			"findable_sub_id",
-			"type",
-			"zone_id",
-			"zone_id_index",
-			"x",
-			"y",
-			"z",
-			"min_expansion",
-			"max_expansion",
-			"content_flags",
-			"content_flags_disabled",
-		};
-	}
-
-	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("findable_location");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static FindableLocation NewEntity()
-	{
-		FindableLocation e{};
-
-		e.id                     = 0;
-		e.zone                   = "";
-		e.version                = 0;
-		e.findable_id            = 0;
-		e.findable_sub_id        = 0;
-		e.type                   = 0;
-		e.zone_id                = 0;
-		e.zone_id_index          = 0;
-		e.x                      = 0;
-		e.y                      = 0;
-		e.z                      = 0;
-		e.min_expansion          = -1;
-		e.max_expansion          = -1;
-		e.content_flags          = "";
-		e.content_flags_disabled = "";
-
-		return e;
-	}
-
-	static FindableLocation GetFindableLocation(
-		const std::vector<FindableLocation> &findable_locations,
-		int findable_location_id
-	)
-	{
-		for (auto &findable_location : findable_locations) {
-			if (findable_location.id == findable_location_id) {
-				return findable_location;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static FindableLocation FindOne(
-		Database& db,
-		int findable_location_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				findable_location_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			FindableLocation e{};
-
-			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.zone                   = row[1] ? row[1] : "";
-			e.version                = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.findable_id            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.findable_sub_id        = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.type                   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.zone_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.zone_id_index          = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.x                      = row[8] ? strtof(row[8], nullptr) : 0;
-			e.y                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.z                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
-			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int findable_location_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				findable_location_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const FindableLocation &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.zone) + "'");
-		v.push_back(columns[2] + " = " + std::to_string(e.version));
-		v.push_back(columns[3] + " = " + std::to_string(e.findable_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.findable_sub_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.type));
-		v.push_back(columns[6] + " = " + std::to_string(e.zone_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.zone_id_index));
-		v.push_back(columns[8] + " = " + std::to_string(e.x));
-		v.push_back(columns[9] + " = " + std::to_string(e.y));
-		v.push_back(columns[10] + " = " + std::to_string(e.z));
-		v.push_back(columns[11] + " = " + std::to_string(e.min_expansion));
-		v.push_back(columns[12] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[13] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static FindableLocation InsertOne(
-		Database& db,
-		FindableLocation e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.zone) + "'");
-		v.push_back(std::to_string(e.version));
-		v.push_back(std::to_string(e.findable_id));
-		v.push_back(std::to_string(e.findable_sub_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.zone_id_index));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-		v.push_back(std::to_string(e.min_expansion));
-		v.push_back(std::to_string(e.max_expansion));
-		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
-		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				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<FindableLocation> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.zone) + "'");
-			v.push_back(std::to_string(e.version));
-			v.push_back(std::to_string(e.findable_id));
-			v.push_back(std::to_string(e.findable_sub_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.zone_id_index));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-			v.push_back(std::to_string(e.min_expansion));
-			v.push_back(std::to_string(e.max_expansion));
-			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
-			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<FindableLocation> All(Database& db)
-	{
-		std::vector<FindableLocation> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			FindableLocation e{};
-
-			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.zone                   = row[1] ? row[1] : "";
-			e.version                = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.findable_id            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.findable_sub_id        = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.type                   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.zone_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.zone_id_index          = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.x                      = row[8] ? strtof(row[8], nullptr) : 0;
-			e.y                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.z                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
-			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<FindableLocation> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<FindableLocation> 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) {
-			FindableLocation e{};
-
-			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.zone                   = row[1] ? row[1] : "";
-			e.version                = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.findable_id            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.findable_sub_id        = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.type                   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.zone_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.zone_id_index          = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.x                      = row[8] ? strtof(row[8], nullptr) : 0;
-			e.y                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.z                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
-			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
-
-			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 FindableLocation &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.zone) + "'");
-		v.push_back(std::to_string(e.version));
-		v.push_back(std::to_string(e.findable_id));
-		v.push_back(std::to_string(e.findable_sub_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.zone_id_index));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-		v.push_back(std::to_string(e.min_expansion));
-		v.push_back(std::to_string(e.max_expansion));
-		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
-		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<FindableLocation> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.zone) + "'");
-			v.push_back(std::to_string(e.version));
-			v.push_back(std::to_string(e.findable_id));
-			v.push_back(std::to_string(e.findable_sub_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.zone_id_index));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-			v.push_back(std::to_string(e.min_expansion));
-			v.push_back(std::to_string(e.max_expansion));
-			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
-			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_FINDABLE_LOCATION_REPOSITORY_H

common/repositories/buyer_buy_lines_repository.h

@@ -236,10 +236,6 @@ public:
 				)
 			);
 
-			if (buyers.empty()) {
-				return all_entries;
-			}
-
 			std::vector<std::string> char_ids{};
 			for (auto const &bl : buyers) {
 				char_ids.push_back((std::to_string(bl.char_id)));

common/repositories/buyer_repository.h

@@ -120,10 +120,6 @@ public:
 			}
 
 			DeleteWhere(db, fmt::format("`char_id` = '{}';", char_id));
-			if (buy_line_ids.empty()) {
-				return false;
-			}
-
 			BaseBuyerBuyLinesRepository::DeleteWhere(
 				db,
 				fmt::format("`id` IN({})", Strings::Implode(", ", buy_line_ids))

common/repositories/findable_location_repository.h

@@ -1,50 +0,0 @@
-#ifndef EQEMU_FINDABLE_LOCATION_REPOSITORY_H
-#define EQEMU_FINDABLE_LOCATION_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_findable_location_repository.h"
-
-class FindableLocationRepository: public BaseFindableLocationRepository {
-public:
-
-    /**
-     * This file was auto generated and can be modified and extended upon
-     *
-     * Base repository methods are automatically
-     * generated in the "base" version of this repository. The base repository
-     * is immutable and to be left untouched, while methods in this class
-     * are used as extension methods for more specific persistence-layer
-     * accessors or mutators.
-     *
-     * Base Methods (Subject to be expanded upon in time)
-     *
-     * Note: Not all tables are designed appropriately to fit functionality with all base methods
-     *
-     * InsertOne
-     * UpdateOne
-     * DeleteOne
-     * FindOne
-     * GetWhere(std::string where_filter)
-     * DeleteWhere(std::string where_filter)
-     * InsertMany
-     * All
-     *
-     * Example custom methods in a repository
-     *
-     * FindableLocationRepository::GetByZoneAndVersion(int zone_id, int zone_version)
-     * FindableLocationRepository::GetWhereNeverExpires()
-     * FindableLocationRepository::GetWhereXAndY()
-     * FindableLocationRepository::DeleteWhereXAndY()
-     *
-     * Most of the above could be covered by base methods, but if you as a developer
-     * find yourself re-using logic for other parts of the code, its best to just make a
-     * method that can be re-used easily elsewhere especially if it can use a base repository
-     * method and encapsulate filters there
-     */
-
-	// Custom extended repository methods here
-
-};
-
-#endif //EQEMU_FINDABLE_LOCATION_REPOSITORY_H

common/repositories/trader_repository.h

@@ -164,35 +164,37 @@ public:
 		return UpdateOne(db, m);
 	}
 
-	static Trader GetItemBySerialNumber(Database &db, uint32 serial_number, uint32 trader_id)
+	static Trader GetItemBySerialNumber(Database &db, uint32 serial_number)
 	{
 		Trader     e{};
 		const auto trader_item = GetWhere(
 			db,
-			fmt::format("`char_id` = '{}' AND `item_sn` = '{}' LIMIT 1", trader_id, serial_number)
+			fmt::format("`item_sn` = '{}' LIMIT 1", serial_number)
 		);
 
 		if (trader_item.empty()) {
 			return e;
 		}
-
-		return trader_item.at(0);
+		else {
+			return trader_item.at(0);
+		}
 	}
 
-	static Trader GetItemBySerialNumber(Database &db, std::string serial_number, uint32 trader_id)
+	static Trader GetItemBySerialNumber(Database &db, std::string serial_number)
 	{
 		Trader     e{};
 		auto       sn          = Strings::ToUnsignedBigInt(serial_number);
 		const auto trader_item = GetWhere(
 			db,
-			fmt::format("`char_id` = '{}' AND `item_sn` = '{}' LIMIT 1", trader_id, sn)
+			fmt::format("`item_sn` = '{}' LIMIT 1", sn)
 		);
 
 		if (trader_item.empty()) {
 			return e;
 		}
-
-		return trader_item.at(0);
+		else {
+			return trader_item.at(0);
+		}
 	}
 
 	static int UpdateActiveTransaction(Database &db, uint32 id, bool status)
@@ -215,10 +217,6 @@ public:
 			delete_ids.push_back(std::to_string(e.id));
 		}
 
-		if (delete_ids.empty()) {
-			return 0;
-		}
-
 		return DeleteWhere(db, fmt::format("`id` IN({})", Strings::Implode(",", delete_ids)));
 	}
 };

common/ruletypes.h

@@ -338,8 +338,6 @@ RULE_STRING(World, IPExemptionZones, "", "Comma-delimited list of zones to exclu
 RULE_STRING(World, MOTD, "", "Server MOTD sent on login, change from empty to have this be used instead of variables table 'motd' value")
 RULE_STRING(World, Rules, "", "Server Rules, change from empty to have this be used instead of variables table 'rules' value, lines are pipe (|) separated, example: A|B|C")
 RULE_BOOL(World, EnableAutoLogin, false, "Enables or disables auto login of characters, allowing people to log characters in directly from loginserver to ingame")
-RULE_BOOL(World, EnablePVPRegions, true, "Enables or disables PVP Regions automatically setting your PVP flag")
-RULE_STRING(World, SupportedClients, "", "Comma-delimited list of clients to restrict to. Supported values are Titanium | SoF | SoD | UF | RoF | RoF2. Example: Titanium,RoF2")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Zone)
@@ -477,6 +475,7 @@ RULE_BOOL(Spells, OldRainTargets, false, "Use old incorrectly implemented maximu
 RULE_REAL(Spells, CallOfTheHeroAggroClearDist, 250.0, "Distance at which CoTH will wipe aggro. To disable and always enable aggro wipe on any distance of CoTH, set to 0.")
 RULE_BOOL(Spells, NPCSpellPush, false, "Enable spell push on NPCs")
 RULE_BOOL(Spells, July242002PetResists, true, "Enable Pets using PCs resist change from July 24 2002")
+RULE_INT(Spells, AOEMaxTargets, 0, "Max number of targets a Targeted AOE spell can cast on. Set to 0 for no limit.")
 RULE_BOOL(Spells, CazicTouchTargetsPetOwner, true, "If True, causes Cazic Touch to swap targets from pet to pet owner if a pet is tanking.")
 RULE_BOOL(Spells, PreventFactionWarOnCharmBreak, false, "Enable spell interupts and dot removal on charm break to prevent faction wars.")
 RULE_BOOL(Spells, AllowDoubleInvis, true, "Allows you to cast invisibility spells on a player that is already invisible, live like behavior.")
@@ -516,10 +515,6 @@ RULE_BOOL(Spells, UseClassicSpellFocus, false, "Enabling will tell the server to
 RULE_BOOL(Spells, ManaTapsOnAnyClass, false, "Enabling this will allow you to cast mana taps on any class, this will bypass ManaTapsRequireNPCMana rule.")
 RULE_INT(Spells, HealAmountMessageFilterThreshold, 100, "Lifetaps below this threshold will not have a message sent to the client (Heal will still process) 0 to Disable.")
 RULE_BOOL(Spells, SnareOverridesSpeedBonuses, false, "Enabling will allow snares to override any speed bonuses the entity may have. Default: False")
-RULE_INT(Spells, TargetedAOEMaxTargets, 4, "Max number of targets a Targeted AOE spell can cast on. Set to 0 for no limit.")
-RULE_INT(Spells, PointBlankAOEMaxTargets, 0, "Max number of targets a Point-Blank AOE spell can cast on. Set to 0 for no limit.")
-RULE_INT(Spells, DefaultAOEMaxTargets, 0, "Max number of targets that an AOE spell which does not meet other descriptions can cast on. Set to 0 for no limit.")
-RULE_BOOL(Spells, AllowFocusOnSkillDamageSpells, false, "Allow focus effects 185, 459, and 482 to enhance SkillAttack spell effect 193")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Combat)
@@ -681,7 +676,6 @@ RULE_BOOL(NPC, DisableLastNames, false, "Enable to disable NPC Last Names")
 RULE_BOOL(NPC, NPCIgnoreLevelBasedHasteCaps, false, "Ignores hard coded level based haste caps.")
 RULE_INT(NPC, NPCHasteCap, 150, "Haste cap for non-v3(over haste) haste")
 RULE_INT(NPC, NPCHastev3Cap, 25, "Haste cap for v3(over haste) haste")
-RULE_STRING(NPC, ExcludedFaceTargetRaces, "52,72,73,141,233,328,329,372,376,377,378,379,380,381,382,383,404,422,423,424,425,426,428,429,445,449,460,462,463,500,501,502,503,504,505,506,507,508,509,510,511,513,514,515,516,533,534,535,536,537,538,539,540,541,542,543,544,545,546,550,551,552,553,554,555,556,557,567,573,577,586,589,590,591,592,593,595,596,599,601,616,619,621,628,629,630,633,634,635,636,665,683,684,685,691,692,693,694,702,703,705,706,707,710,711,714,720,2250,2254", "Race IDs excluded from facing target when hailed")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Aggro)

common/servertalk.h

@@ -282,7 +282,6 @@
 #define ServerOP_ReloadBaseData 0x4128
 #define ServerOP_ReloadSkillCaps 0x4129
 #define ServerOP_ReloadNPCSpells 0x4130
-#define ServerOP_ReloadFindableLocations 0x4131
 
 #define ServerOP_CZDialogueWindow 0x4500
 #define ServerOP_CZLDoNUpdate 0x4501
@@ -1946,7 +1945,6 @@ struct ServerOP_GuildMessage_Struct {
 struct TraderMessaging_Struct {
 	uint32 action;
 	uint32 zone_id;
-	uint32 instance_id;
 	uint32 trader_id;
 	uint32 entity_id;
 	char   trader_name[64];

common/shareddb.cpp

@@ -47,7 +47,6 @@
 #include "repositories/character_corpses_repository.h"
 #include "repositories/skill_caps_repository.h"
 #include "repositories/inventory_repository.h"
-#include "repositories/books_repository.h"
 
 namespace ItemField
 {
@@ -1392,28 +1391,30 @@ const EQ::ItemData* SharedDatabase::IterateItems(uint32* id) const
 	return nullptr;
 }
 
-Book_Struct SharedDatabase::GetBook(const std::string& text_file)
+std::string SharedDatabase::GetBook(const char *txtfile, int16 *language)
 {
-	const auto& l = BooksRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`name` = '{}'",
-			Strings::Escape(text_file)
-		)
-	);
+	char txtfile2[20];
+	std::string txtout;
+	strcpy(txtfile2, txtfile);
 
-	Book_Struct b;
-
-	if (l.empty()) {
-		return b;
+	const std::string query = StringFormat("SELECT txtfile, language FROM books WHERE name = '%s'", txtfile2);
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		txtout.assign(" ",1);
+		return txtout;
 	}
 
-	const auto& e = l.front();
+    if (results.RowCount() == 0) {
+        LogError("No book to send, ({})", txtfile);
+        txtout.assign(" ",1);
+        return txtout;
+    }
 
-	b.language = e.language;
-	b.text     = e.txtfile;
+    auto& row = results.begin();
+    txtout.assign(row[0],strlen(row[0]));
+    *language = static_cast<int16>(Strings::ToInt(row[1]));
 
-	return b;
+    return txtout;
 }
 
 // Create appropriate EQ::ItemInstance class

common/shareddb.h

@@ -41,7 +41,8 @@ struct NPCFactionList;
 struct FactionAssociations;
 
 
-namespace EQ {
+namespace EQ
+{
 
 	struct ItemData;
 	class ItemInstance;
@@ -49,12 +50,6 @@ namespace EQ {
 	class MemoryMappedFile;
 }
 
-struct Book_Struct
-{
-	uint8       language;
-	std::string text;
-};
-
 /*
     This object is inherited by world and zone's DB object,
     and is mainly here to facilitate shared memory, and other
@@ -119,7 +114,7 @@ public:
 		int admin
 	);
 
-	Book_Struct GetBook(const std::string& text_file);
+	std::string GetBook(const char *txtfile, int16 *language);
 
 	/**
 	 * items

common/skills.cpp

@@ -249,6 +249,7 @@ const std::vector<EQ::skills::SkillType>& EQ::skills::GetExtraDamageSkills()
 		EQ::skills::SkillFlyingKick,
 		EQ::skills::SkillKick,
 		EQ::skills::SkillRoundKick,
+		EQ::skills::SkillRoundKick,
 		EQ::skills::SkillTigerClaw,
 		EQ::skills::SkillFrenzy
 	};

common/tasks.h

@@ -83,8 +83,7 @@ struct ActivityInformation {
 		if (zone_ids.empty()) {
 			return true;
 		}
-		bool found_zone = std::any_of(zone_ids.begin(), zone_ids.end(),
-			[zone_id](int id) { return id <= 0 || id == zone_id; });
+		bool found_zone = std::find(zone_ids.begin(), zone_ids.end(), zone_id) != zone_ids.end();
 
 		return found_zone && (zone_version == version || zone_version == -1);
 	}
@@ -101,7 +100,7 @@ struct ActivityInformation {
 			out.WriteInt32(activity_type == TaskActivityType::GiveCash ? 1 : goal_count);
 			out.WriteLengthString(skill_list); // used in SkillOn objective type string, "-1" for none
 			out.WriteLengthString(spell_list); // used in CastOn objective type string, "0" for none
-			out.WriteString(zones);            // used in ui zone columns and task select "begins in" (may have multiple, invalid id for "Unknown Zone", empty for "ALL")
+			out.WriteString(zones);            // used in objective zone column and task select "begins in" (may have multiple, "0" for "unknown zone", empty for "ALL")
 		}
 		else
 		{
@@ -115,7 +114,7 @@ struct ActivityInformation {
 		out.WriteString(description_override);
 
 		if (client_version >= EQ::versions::ClientVersion::RoF) {
-			out.WriteString(zones); // target zone version internal id (unused client side)
+			out.WriteString(zones); // serialized again after description (seems unused)
 		}
 	}
 

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.56.3-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 9285
+#define CURRENT_BINARY_DATABASE_VERSION 9283
 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9045
 
 #endif

libs/perlbind/include/perlbind/scalar.h

@@ -251,6 +251,4 @@ private:
   scalar m_value;
 };
 
-using ref = reference;
-
 } // namespace perlbind

libs/perlbind/include/perlbind/stack_push.h

@@ -28,8 +28,8 @@ struct pusher
     ++m_pushed;
   }
   void push(const std::string& value) { mPUSHp(value.c_str(), value.size()); ++m_pushed; }
-  void push(scalar value) { mPUSHs(value.release()); ++m_pushed; }
-  void push(reference value) { mPUSHs(value.release()); ++m_pushed; }
+  void push(scalar value) { mPUSHs(value.release()); ++m_pushed; };
+  void push(reference value) { mPUSHs(value.release()); ++m_pushed; };
 
   void push(array value)
   {
@@ -38,8 +38,7 @@ struct pusher
     for (int i = 0; i < count; ++i)
     {
       // mortalizes one reference to array element to avoid copying
-      SV** sv = av_fetch(static_cast<AV*>(value), i, true);
-      mPUSHs(SvREFCNT_inc(*sv));
+      PUSHs(sv_2mortal(SvREFCNT_inc(value[i].sv())));
     }
     m_pushed += count;
   }

libs/perlbind/include/perlbind/stack_read.h

@@ -242,7 +242,7 @@ struct read_as<hash>
   static bool check(PerlInterpreter* my_perl, int i, int ax, int items)
   {
     int remaining = items - i;
-    return remaining > 0 && remaining % 2 == 0 && SvTYPE(ST(i)) < SVt_PVAV;
+    return remaining > 0 && remaining % 2 == 0 && SvTYPE(ST(i)) == SVt_PV;
   }
 
   static hash get(PerlInterpreter* my_perl, int i, int ax, int items)

libs/perlbind/include/perlbind/version.h

@@ -1,7 +1,7 @@
 #pragma once
 
 constexpr int perlbind_version_major = 1;
-constexpr int perlbind_version_minor = 1;
+constexpr int perlbind_version_minor = 0;
 constexpr int perlbind_version_patch = 0;
 
 constexpr int perlbind_version()

loginserver/client.h

@@ -138,13 +138,6 @@ public:
 	 */
 	unsigned int GetPlaySequence() const { return m_play_sequence_id; }
 
-	/**
-	 * Gets the client version
-	 *
-	 * @return
-	 */
-	LSClientVersion GetClientVersion() const { return m_client_version; }
-
 	/**
 	 * Gets the connection for this client
 	 *

loginserver/client_manager.cpp

@@ -7,79 +7,6 @@ extern bool        run_server;
 #include "../common/eqemu_logsys.h"
 #include "../common/misc.h"
 #include "../common/path_manager.h"
-#include "../common/file.h"
-
-void CheckTitaniumOpcodeFile(const std::string &path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0021\n");
-		fprintf(f, "OP_ChatMessage=0x0016\n");
-		fprintf(f, "OP_LoginAccepted=0x0017\n");
-		fprintf(f, "OP_ServerListResponse=0x0018\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fclose(f);
-	}
-}
-
-void CheckSoDOpcodeFile(const std::string& path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0022\n");
-		fprintf(f, "OP_ChatMessage=0x0017\n");
-		fprintf(f, "OP_LoginAccepted=0x0018\n");
-		fprintf(f, "OP_ServerListResponse=0x0019\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_LoginExpansionPacketData=0x0031\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fclose(f);
-	}
-}
-
-void CheckLarionOpcodeFile(const std::string& path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0022\n");
-		fprintf(f, "OP_ChatMessage=0x0017\n");
-		fprintf(f, "OP_LoginAccepted=0x0018\n");
-		fprintf(f, "OP_ServerListResponse=0x0019\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fprintf(f, "OP_SystemFingerprint=0x0016\n");
-		fprintf(f, "OP_ExpansionList=0x0030\n");
-		fclose(f);
-	}
-}
 
 ClientManager::ClientManager()
 {
@@ -92,12 +19,14 @@ ClientManager::ClientManager()
 
 	std::string opcodes_path = fmt::format(
 		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes.conf"
+		path.GetServerPath(),
+		server.config.GetVariableString(
+			"client_configuration",
+			"titanium_opcodes",
+			"login_opcodes.conf"
+		)
 	);
 
-	CheckTitaniumOpcodeFile(opcodes_path);
-
 	if (!titanium_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
 			"ClientManager fatal error: couldn't load opcodes for Titanium file [{0}]",
@@ -129,12 +58,14 @@ ClientManager::ClientManager()
 
 	opcodes_path = fmt::format(
 		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes_sod.conf"
+		path.GetServerPath(),
+		server.config.GetVariableString(
+			"client_configuration",
+			"sod_opcodes",
+			"login_opcodes.conf"
+		)
 	);
 
-	CheckSoDOpcodeFile(opcodes_path);
-
 	if (!sod_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
 			"ClientManager fatal error: couldn't load opcodes for SoD file {0}",
@@ -157,44 +88,6 @@ ClientManager::ClientManager()
 			clients.push_back(c);
 		}
 	);
-
-	int larion_port = server.config.GetVariableInt("client_configuration", "larion_port", 15900);
-
-	EQStreamManagerInterfaceOptions larion_opts(larion_port, false, false);
-
-	larion_stream = new EQ::Net::EQStreamManager(larion_opts);
-	larion_ops = new RegularOpcodeManager;
-
-	opcodes_path = fmt::format(
-		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes_larion.conf"
-	);
-
-	CheckLarionOpcodeFile(opcodes_path);
-
-	if (!larion_ops->LoadOpcodes(opcodes_path.c_str())) {
-		LogError(
-			"ClientManager fatal error: couldn't load opcodes for Larion file [{0}]",
-			server.config.GetVariableString("client_configuration", "larion_opcodes", "login_opcodes.conf")
-		);
-
-		run_server = false;
-	}
-
-	larion_stream->OnNewConnection(
-		[this](std::shared_ptr<EQ::Net::EQStream> stream) {
-			LogInfo(
-				"New Larion client connection from [{0}:{1}]",
-				long2ip(stream->GetRemoteIP()),
-				stream->GetRemotePort()
-			);
-
-			stream->SetOpcodeManager(&larion_ops);
-			Client* c = new Client(stream, cv_larion);
-			clients.push_back(c);
-		}
-	);
 }
 
 ClientManager::~ClientManager()

loginserver/client_manager.h

@@ -55,8 +55,6 @@ private:
 	EQ::Net::EQStreamManager *titanium_stream;
 	OpcodeManager            *sod_ops;
 	EQ::Net::EQStreamManager *sod_stream;
-	OpcodeManager            *larion_ops;
-	EQ::Net::EQStreamManager* larion_stream;
 };
 
 #endif

loginserver/login_types.h

@@ -83,8 +83,7 @@ struct PlayEverquestResponse_Struct {
 
 enum LSClientVersion {
 	cv_titanium,
-	cv_sod,
-	cv_larion
+	cv_sod
 };
 
 enum LSClientStatus {

loginserver/login_util/login_opcodes_larion.conf

@@ -1,14 +0,0 @@
-#EQEmu Public Login Server OPCodes
-OP_SessionReady=0x0001
-OP_Login=0x0002
-OP_ServerListRequest=0x0004
-OP_PlayEverquestRequest=0x000d
-OP_PlayEverquestResponse=0x0022
-OP_ChatMessage=0x0017
-OP_LoginAccepted=0x0018
-OP_ServerListResponse=0x0019
-OP_Poll=0x0029
-OP_EnterChat=0x000f
-OP_PollResponse=0x0011
-OP_SystemFingerprint=0x0016
-OP_ExpansionList=0x0030

loginserver/server_manager.cpp

@@ -137,7 +137,7 @@ std::unique_ptr<EQApplicationPacket> ServerManager::CreateServerListPacket(Clien
 			use_local_ip ? "Local" : "Remote"
 		);
 
-		world_server->SerializeForClientServerList(buf, use_local_ip, client->GetClientVersion());
+		world_server->SerializeForClientServerList(buf, use_local_ip);
 	}
 
 	return std::make_unique<EQApplicationPacket>(OP_ServerListResponse, buf);

loginserver/world_server.cpp

@@ -977,7 +977,7 @@ bool WorldServer::ValidateWorldServerAdminLogin(
 	return false;
 }
 
-void WorldServer::SerializeForClientServerList(SerializeBuffer& out, bool use_local_ip, LSClientVersion version) const
+void WorldServer::SerializeForClientServerList(SerializeBuffer &out, bool use_local_ip) const
 {
 	// see LoginClientServerData_Struct
 	if (use_local_ip) {
@@ -987,31 +987,19 @@ void WorldServer::SerializeForClientServerList(SerializeBuffer& out, bool use_lo
 		out.WriteString(GetRemoteIP());
 	}
 
-	if (version == cv_larion) {
-		out.WriteUInt32(9000);
-	}
-
 	switch (GetServerListID()) {
-	case LS::ServerType::Legends:
-		out.WriteInt32(LS::ServerTypeFlags::Legends);
-		break;
-	case LS::ServerType::Preferred:
-		out.WriteInt32(LS::ServerTypeFlags::Preferred);
-		break;
-	default:
-		out.WriteInt32(LS::ServerTypeFlags::Standard);
-		break;
-	}
-	if (version == cv_larion) {
-		auto server_id = GetServerId();
-		//if this is 0, the client will not show the server in the list
-		out.WriteUInt32(1);
-		out.WriteUInt32(server_id);
-	}
-	else {
-		out.WriteUInt32(GetServerId());
+		case LS::ServerType::Legends:
+			out.WriteInt32(LS::ServerTypeFlags::Legends);
+			break;
+		case LS::ServerType::Preferred:
+			out.WriteInt32(LS::ServerTypeFlags::Preferred);
+			break;
+		default:
+			out.WriteInt32(LS::ServerTypeFlags::Standard);
+			break;
 	}
 
+	out.WriteUInt32(GetServerId());
 	out.WriteString(GetServerLongName());
 	out.WriteString("us"); // country code
 	out.WriteString("en"); // language code

loginserver/world_server.h

@@ -7,7 +7,6 @@
 #include "../common/packet_dump.h"
 #include "database.h"
 #include "../common/event/timer.h"
-#include "login_types.h"
 #include <string>
 #include <memory>
 
@@ -150,7 +149,7 @@ public:
 	bool HandleNewLoginserverRegisteredOnly(Database::DbWorldRegistration &world_registration);
 	bool HandleNewLoginserverInfoUnregisteredAllowed(Database::DbWorldRegistration &world_registration);
 
-	void SerializeForClientServerList(class SerializeBuffer& out, bool use_local_ip, LSClientVersion version) const;
+	void SerializeForClientServerList(class SerializeBuffer& out, bool use_local_ip) const;
 
 private:
 

package.json

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

utils/patches/patch_RoF2.conf

@@ -311,7 +311,6 @@ OP_SetGroupTarget=0x2814
 OP_Charm=0x5d92
 OP_Stun=0x36a4
 OP_SendFindableNPCs=0x4613
-OP_SendFindableLocations=0x6a68
 OP_FindPersonRequest=0x5cea
 OP_FindPersonReply=0x7e58
 OP_Sound=0x1a30

utils/scripts/build/linux-build.sh

@@ -12,6 +12,7 @@ perl utils/scripts/build/tag-version.pl
 mkdir -p build && cd build && \
   cmake -DEQEMU_BUILD_TESTS=ON \
       -DEQEMU_BUILD_STATIC=ON \
+      -DEQEMU_BUILD_PCH=ON \
       -DEQEMU_BUILD_LOGIN=ON \
       -DEQEMU_BUILD_LUA=ON \
       -DEQEMU_BUILD_PERL=ON \

utils/sql/findable_locations_wip.sql

@@ -1,33 +0,0 @@
-CREATE TABLE `findable_location` (
-	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`zone` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`version` INT(11) NOT NULL DEFAULT '0',
-	`findable_id` INT(11) NOT NULL DEFAULT '0',
-	`findable_sub_id` INT(11) NOT NULL DEFAULT '0',
-	`type` INT(11) NOT NULL DEFAULT '0',
-	`zone_id` INT(11) NOT NULL DEFAULT '0',
-	`zone_id_index` INT(11) NOT NULL DEFAULT '0',
-	`x` FLOAT NOT NULL DEFAULT '0',
-	`y` FLOAT NOT NULL DEFAULT '0',
-	`z` FLOAT NOT NULL DEFAULT '0',
-	`min_expansion` TINYINT(4) NOT NULL DEFAULT '-1',
-	`max_expansion` TINYINT(4) NOT NULL DEFAULT '-1',
-	`content_flags` VARCHAR(100) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
-	`content_flags_disabled` VARCHAR(100) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `zone_version` (`zone`, `version`) USING BTREE
-);
-
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 77, -1, 6, 202, 0, 484.484130859375, 183.69752502441406, 0.0020000000949949026);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 16, 0, 7, 45, 1, 342.86285400390625, 188.9244384765625, -181.92721557617188);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 17, 0, 7, 1, 1, -6.997137069702148, -174.92999267578125, 15.993850708007812);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 18, 0, 7, 1, 2, 356.8572692871094, -48.98040771484375, 15.993560791015625);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 19, 0, 7, 4, 1, 566.7733154296875, 1699.3203125, 54.97816467285156);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 19, 2, 7, 4, 2, 230.90762329101562, 1699.3203125, 59.97674560546875);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 20, 0, 7, 4, 3, 141.9432373046875, 1699.3203125, 20.986679077148438);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 21, 0, 7, 4, 4, -3.9984021186828613, 1699.3203125, 20.986663818359375);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 21, 3, 7, 4, 5, -333.866455078125, 1699.3203125, 59.97560119628906);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 22, 0, 7, 4, 6, 899.6401977539062, 1699.3203125, 54.97816467285156);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 23, 0, 7, 4, 7, -799.6800537109375, 1699.3203125, 54.97825622558594);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 53, 0, 7, 45, 2, 76.9692153930664, 174.9300537109375, -34.986000061035156);
-INSERT INTO `findable_location` (zone, version, findable_id, findable_sub_id, type, zone_id, zone_id_index, x, y, z) VALUES ('qeynos2', 0, 54, 0, 7, 45, 3, -160.9356231689453, 300.879638671875, -139.94403076171875);

world/CMakeLists.txt

@@ -78,8 +78,12 @@ ADD_EXECUTABLE(world ${world_sources} ${world_headers})
 
 INSTALL(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch.h)
+IF (EQEMU_BUILD_PCH)
+    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch-emu-common.h)
+    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch-containers.h)
+    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch-utilities.h)
+    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch-types.h)
+    TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch-fmt.h)
 ENDIF ()
 
 ADD_DEFINITIONS(-DWORLD)

world/cli/copy_character.cpp

@@ -1,4 +1,4 @@
-#include "../../common/eqemu_logsys_log_aliases.h"
+#include "../../common/eqemu_logsys.h"
 #include "../worlddb.h"
 
 void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std::string &description)

world/client.cpp

@@ -526,27 +526,9 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app)
 		SendEnterWorld(cle->name());
 		SendPostEnterWorld();
 		if (!is_player_zoning) {
-			const auto supported_clients = RuleS(World, SupportedClients);
-			bool skip_char_info = false;
-			if (!supported_clients.empty()) {
-				const std::string& name = EQ::versions::ClientVersionName(m_ClientVersion);
-				const auto& clients = Strings::Split(supported_clients, ",");
-				if (std::find(clients.begin(), clients.end(), name) == clients.end()) {
-					SendUnsupportedClientPacket(
-						fmt::format(
-							"Client Not In Supported List [{}]",
-							supported_clients
-						)
-					);
-					skip_char_info = true;
-				}
-			}
-
-			if (!skip_char_info) {
-				SendExpansionInfo();
-				SendCharInfo();
-				database.LoginIP(cle->AccountID(), long2ip(GetIP()));
-			}
+			SendExpansionInfo();
+			SendCharInfo();
+			database.LoginIP(cle->AccountID(), long2ip(GetIP()));
 		}
 
 		cle->SetIP(GetIP());
@@ -2471,34 +2453,3 @@ void Client::SendGuildTributeOptInToggle(const GuildTributeMemberToggle *in)
 	QueuePacket(outapp);
 	safe_delete(outapp);
 }
-
-void Client::SendUnsupportedClientPacket(const std::string& message)
-{
-	EQApplicationPacket packet(OP_SendCharInfo, sizeof(CharacterSelect_Struct) + sizeof(CharacterSelectEntry_Struct));
-
-	unsigned char* buff_ptr = packet.pBuffer;
-	auto cs = (CharacterSelect_Struct*) buff_ptr;
-
-	cs->CharCount  = 1;
-	cs->TotalChars = 1;
-
-	buff_ptr += sizeof(CharacterSelect_Struct);
-
-	auto e = (CharacterSelectEntry_Struct*) buff_ptr;
-
-	strcpy(e->Name, message.c_str());
-
-	e->Race        = Race::Human;
-	e->Class       = Class::Warrior;
-	e->Level       = 1;
-	e->ShroudClass = e->Class;
-	e->ShroudRace  = e->Race;
-	e->Zone        = std::numeric_limits<uint16>::max();
-	e->Instance    = 0;
-	e->Gender      = Gender::Male;
-	e->GoHome      = 0;
-	e->Tutorial    = 0;
-	e->Enabled     = 0;
-
-	QueuePacket(&packet);
-}

world/client.h

@@ -120,7 +120,6 @@ private:
 	EQStreamInterface* eqs;
 	bool CanTradeFVNoDropItem();
 	void RecordPossibleHack(const std::string& message);
-	void SendUnsupportedClientPacket(const std::string& message);
 };
 
 bool CheckCharCreateInfoSoF(CharCreate_Struct *cc);

world/eqemu_api_world_data_service.cpp

@@ -140,7 +140,6 @@ std::vector<Reload> reload_types = {
 	Reload{.command = "aa", .opcode = ServerOP_ReloadAAData, .desc = "Alternate Advancement"},
 	Reload{.command = "alternate_currencies", .opcode = ServerOP_ReloadAlternateCurrencies, .desc = "Alternate Currencies"},
 	Reload{.command = "base_data", .opcode = ServerOP_ReloadBaseData, .desc = "Base Data"},
-	Reload{.command = "finable_locations", .opcode = ServerOP_ReloadFindableLocations, .desc = "Findable Locations"},
 	Reload{.command = "blocked_spells", .opcode = ServerOP_ReloadBlockedSpells, .desc = "Blocked Spells"},
 	Reload{.command = "commands", .opcode = ServerOP_ReloadCommands, .desc = "Commands"},
 	Reload{.command = "content_flags", .opcode = ServerOP_ReloadContentFlags, .desc = "Content Flags"},

world/login_server.cpp

@@ -315,13 +315,6 @@ void LoginServer::ProcessLSFatalError(uint16_t opcode, EQ::Net::Packet &p)
 		error,
 		reason
 	);
-
-	if (m_legacy_client) {
-		m_legacy_client.release();
-	}
-	else if (m_client) {
-		m_client.release();
-	}
 }
 
 void LoginServer::ProcessSystemwideMessage(uint16_t opcode, EQ::Net::Packet &p)
@@ -605,11 +598,6 @@ bool LoginServer::Connect()
 
 void LoginServer::SendInfo()
 {
-	if (m_client == nullptr && m_legacy_client == nullptr) {
-		LogDebug("No client to send info to loginserver");
-		return;
-	}
-
 	const WorldConfig *Config = WorldConfig::get();
 
 	auto pack = new ServerPacket;
@@ -655,11 +643,6 @@ void LoginServer::SendInfo()
 
 void LoginServer::SendStatus()
 {
-	if (m_client == nullptr && m_legacy_client == nullptr) {
-		LogDebug("No client to send status to loginserver");
-		return;
-	}
-
 	auto pack = new ServerPacket;
 	pack->opcode  = ServerOP_LSStatus;
 	pack->size    = sizeof(ServerLSStatus_Struct);
@@ -688,21 +671,20 @@ void LoginServer::SendStatus()
  */
 void LoginServer::SendPacket(ServerPacket *pack)
 {
-	if (m_legacy_client) {
-		m_legacy_client->SendPacket(pack);
+	if (m_is_legacy) {
+		if (m_legacy_client) {
+			m_legacy_client->SendPacket(pack);
+		}
 	}
-	else if (m_client) {
-		m_client->SendPacket(pack);
+	else {
+		if (m_client) {
+			m_client->SendPacket(pack);
+		}
 	}
 }
 
 void LoginServer::SendAccountUpdate(ServerPacket *pack)
 {
-	if (m_client == nullptr && m_legacy_client == nullptr) {
-		LogDebug("No client to send account update to loginserver");
-		return;
-	}
-
 	auto *ls_account_update = (ServerLSAccountUpdate_Struct *) pack->pBuffer;
 	if (CanUpdate()) {
 		LogInfo(

world/world_boot.cpp

@@ -294,13 +294,6 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
 	database.ClearBuyerDetails();
 	LogInfo("Clearing buyer table details");
 
-	if (RuleB(Bots, Enabled)) {
-		LogInfo("Clearing [bot_pet_buffs] table of stale entries");
-		database.QueryDatabase(
-			"DELETE FROM bot_pet_buffs WHERE NOT EXISTS (SELECT * FROM bot_pets WHERE bot_pets.pets_index = bot_pet_buffs.pets_index)"
-		);
-	}
-
 	if (!content_db.LoadItems(hotfix_name)) {
 		LogError("Error: Could not load item data. But ignoring");
 	}

world/zoneserver.cpp

@@ -1401,7 +1401,6 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		case ServerOP_ReloadAAData:
 		case ServerOP_ReloadAlternateCurrencies:
 		case ServerOP_ReloadBaseData:
-		case ServerOP_ReloadFindableLocations:
 		case ServerOP_ReloadBlockedSpells:
 		case ServerOP_ReloadCommands:
 		case ServerOP_ReloadDoors:
@@ -1756,11 +1755,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				return;
 			}
 
-			auto trader = client_list.FindCLEByCharacterID(in->trader_buy_struct.trader_id);
-			if (trader) {
-				zoneserver_list.SendPacket(trader->zone(), trader->instance(), pack);
-			}
-
+			zoneserver_list.SendPacket(Zones::BAZAAR, pack);
 			break;
 		}
 		case ServerOP_BuyerMessaging: {
@@ -1780,20 +1775,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 					break;
 				}
 				case Barter_SellItem: {
-					auto buyer = client_list.FindCharacter(in->buyer_name);
-					if (buyer) {
-						zoneserver_list.SendPacket(buyer->zone(), buyer->instance(), pack);
-					}
-
+					zoneserver_list.SendPacket(Zones::BAZAAR, pack);
 					break;
 				}
 				case Barter_FailedTransaction:
 				case Barter_BuyerTransactionComplete: {
-					auto seller = client_list.FindCharacter(in->seller_name);
-					if (seller) {
-						zoneserver_list.SendPacket(seller->zone(), seller->instance(), pack);
-					}
-
+					zoneserver_list.SendPacket(in->zone_id, pack);
 					break;
 				}
 				default:

zone/CMakeLists.txt

@@ -54,7 +54,6 @@ SET(zone_sources
     lua_buff.cpp
     lua_corpse.cpp
     lua_client.cpp
-    lua_database.cpp
     lua_door.cpp
     lua_encounter.cpp
     lua_entity.cpp
@@ -66,7 +65,6 @@ SET(zone_sources
     lua_inventory.cpp
     lua_item.cpp
     lua_iteminst.cpp
-    lua_merc.cpp
     lua_mob.cpp
     lua_mod.cpp
     lua_npc.cpp
@@ -111,14 +109,12 @@ SET(zone_sources
     perl_bot.cpp
     perl_buff.cpp
     perl_client.cpp
-    perl_database.cpp
     perl_doors.cpp
     perl_entity.cpp
     perl_expedition.cpp
     perl_groups.cpp
     perl_hateentry.cpp
     perl_inventory.cpp
-    perl_merc.cpp
     perl_mob.cpp
     perl_npc.cpp
     perl_object.cpp
@@ -137,7 +133,6 @@ SET(zone_sources
     qglobals.cpp
     queryserv.cpp
     questmgr.cpp
-    quest_db.cpp
     quest_parser_collection.cpp
     raids.cpp
     raycast_mesh.cpp
@@ -170,7 +165,6 @@ SET(zone_sources
     zonedb.cpp
     zone_base_data.cpp
     zone_event_scheduler.cpp
-	zone_finable_locations.cpp
     zone_npc_factions.cpp
     zone_reload.cpp
     zoning.cpp
@@ -219,7 +213,6 @@ SET(zone_headers
     lua_buff.h
     lua_client.h
     lua_corpse.h
-    lua_database.h
     lua_door.h
     lua_encounter.h
     lua_entity.h
@@ -231,7 +224,6 @@ SET(zone_headers
     lua_inventory.h
     lua_item.h
     lua_iteminst.h
-    lua_merc.h
     lua_mob.h
     lua_mod.h
     lua_npc.h
@@ -256,7 +248,6 @@ SET(zone_headers
     pathfinder_interface.h
     pathfinder_nav_mesh.h
     pathfinder_null.h
-    perl_database.h
     perlpacket.h
     petitions.h
     pets.h
@@ -266,7 +257,6 @@ SET(zone_headers
     queryserv.h
     quest_interface.h
     questmgr.h
-    quest_db.h
     quest_parser_collection.h
     raids.h
     raycast_mesh.h
@@ -299,10 +289,14 @@ ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers})
 
 INSTALL(TARGETS zone RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch.h)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/types.h ../common/eqemu_logsys.h ../common/eqemu_logsys_log_aliases.h ../common/features.h ../common/global_define.h)
-    TARGET_PRECOMPILE_HEADERS(zone PRIVATE mob.h npc.h corpse.h doors.h bot.h entity.h client.h zone.h)
+IF (EQEMU_BUILD_PCH)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-emu-common.h)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-containers.h)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-utilities.h)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-types.h)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-fmt.h)
+#    TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/pch-repositories.h)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE pch/pch.h)
 ENDIF()
 
 ADD_DEFINITIONS(-DZONE)

zone/attack.cpp

@@ -1550,18 +1550,17 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts, boo
 			hit.damage_done = 0;
 		}
 
-		parse->EventBotMerc(
-			EVENT_USE_SKILL,
-			this,
-			nullptr,
-			[&]() {
-				return fmt::format(
+		if (IsBot()) {
+			if (parse->BotHasQuestSub(EVENT_USE_SKILL)) {
+				const auto& export_string = fmt::format(
 					"{} {}",
 					hit.skill,
 					GetSkill(hit.skill)
 				);
+
+				parse->EventBot(EVENT_USE_SKILL, CastToBot(), nullptr, export_string, 0);
 			}
-		);
+		}
 	}
 }
 
@@ -1923,9 +1922,11 @@ bool Client::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::Skil
 	}
 
 	if (killer_mob) {
-		parse->EventBotMercNPC(EVENT_SLAY, killer_mob, this);
-
 		if (killer_mob->IsNPC()) {
+			if (parse->HasQuestSub(killer_mob->GetNPCTypeID(), EVENT_SLAY)) {
+				parse->EventNPC(EVENT_SLAY, killer_mob->CastToNPC(), this, "", 0);
+			}
+
 			killed_by = KilledByTypes::Killed_NPC;
 
 			auto emote_id = killer_mob->GetEmoteID();
@@ -1933,6 +1934,12 @@ bool Client::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::Skil
 				killer_mob->CastToNPC()->DoNPCEmote(EQ::constants::EmoteEventTypes::KilledPC, emoteid, this);
 			}
 
+			killer_mob->TrySpellOnKill(killed_level, spell);
+		} else if (killer_mob->IsBot()) {
+			if (parse->BotHasQuestSub(EVENT_SLAY)) {
+				parse->EventBot(EVENT_SLAY, killer_mob->CastToBot(), this, "", 0);
+			}
+
 			killer_mob->TrySpellOnKill(killed_level, spell);
 		}
 
@@ -2451,10 +2458,14 @@ void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillTyp
 		spell_id = SPELL_UNKNOWN;
 
 	//handle EVENT_ATTACK. Resets after we have not been attacked for 12 seconds
-	if (attacked_timer.Check()) {
-		parse->EventMercNPC(EVENT_ATTACK, this, other);
-	}
+	if (attacked_timer.Check())
+	{
+		if (parse->HasQuestSub(GetNPCTypeID(), EVENT_ATTACK)) {
+			LogCombat("Triggering EVENT_ATTACK due to attack by [{}]", other ? other->GetName() : "nullptr");
 
+			parse->EventNPC(EVENT_ATTACK, this, other, "", 0);
+		}
+	}
 	attacked_timer.Start(CombatEventTimer_expire);
 
 	if (!IsEngaged())
@@ -2495,22 +2506,41 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
 
 	Mob* owner_or_self = killer_mob ? killer_mob->GetOwnerOrSelf() : nullptr;
 
-	auto exports = [&]() {
-		return fmt::format(
-			"{} {} {} {}",
-			killer_mob ? killer_mob->GetID() : 0,
-			damage,
-			spell,
-			static_cast<int>(attack_skill)
-		);
-	};
+	if (IsNPC()) {
+		if (parse->HasQuestSub(GetNPCTypeID(), EVENT_DEATH)) {
+			const auto& export_string = fmt::format(
+				"{} {} {} {}",
+				killer_mob ? killer_mob->GetID() : 0,
+				damage,
+				spell,
+				static_cast<int>(attack_skill)
+			);
 
-	if (parse->EventBotMercNPC(EVENT_DEATH, this, owner_or_self, exports) != 0) {
-		if (GetHP() < 0) {
-			SetHP(0);
+			if (parse->EventNPC(EVENT_DEATH, this, owner_or_self, export_string, 0) != 0) {
+				if (GetHP() < 0) {
+					SetHP(0);
+				}
+
+				return false;
+			}
 		}
+	} else if (IsBot()) {
+		if (parse->BotHasQuestSub(EVENT_DEATH)) {
+			const auto& export_string = fmt::format(
+				"{} {} {} {}",
+				killer_mob ? killer_mob->GetID() : 0,
+				damage,
+				spell,
+				static_cast<int>(attack_skill)
+			);
+			if (parse->EventBot(EVENT_DEATH, CastToBot(), owner_or_self, export_string, 0) != 0) {
+				if (GetHP() < 0) {
+					SetHP(0);
+				}
 
-		return false;
+				return false;
+			}
+		}
 	}
 
 	if (killer_mob && killer_mob->IsOfClientBot() && IsValidSpell(spell) && damage > 0) {
@@ -3047,8 +3077,10 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
 		}
 	}
 
-	if (killer_mob) {
-		parse->EventBotMerc(EVENT_NPC_SLAY, killer_mob, this);
+	if (killer_mob && killer_mob->IsBot()) {
+		if (parse->BotHasQuestSub(EVENT_NPC_SLAY)) {
+			parse->EventBot(EVENT_NPC_SLAY, killer_mob->CastToBot(), this, "", 0);
+		}
 
 		killer_mob->TrySpellOnKill(killed_level, spell);
 	}
@@ -3076,29 +3108,24 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
 		}
 	}
 
-	std::vector<std::any> args = { corpse };
+	if (parse->HasQuestSub(GetNPCTypeID(), EVENT_DEATH_COMPLETE)) {
+		const auto& export_string = fmt::format(
+			"{} {} {} {} {} {} {} {} {}",
+			killer_mob ? killer_mob->GetID() : 0,
+			damage,
+			spell,
+			static_cast<int>(attack_skill),
+			entity_id,
+			m_combat_record.GetStartTime(),
+			m_combat_record.GetEndTime(),
+			m_combat_record.GetDamageReceived(),
+			m_combat_record.GetHealingReceived()
+		);
 
-	parse->EventMercNPC(
-		EVENT_DEATH_COMPLETE,
-		this,
-		owner_or_self,
-		[&]() {
-			return fmt::format(
-				"{} {} {} {} {} {} {} {} {}",
-				killer_mob ? killer_mob->GetID() : 0,
-				damage,
-				spell,
-				static_cast<int>(attack_skill),
-				entity_id,
-				m_combat_record.GetStartTime(),
-				m_combat_record.GetEndTime(),
-				m_combat_record.GetDamageReceived(),
-				m_combat_record.GetHealingReceived()
-			);
-		},
-		0,
-		&args
-	);
+		std::vector<std::any> args = { corpse };
+
+		parse->EventNPC(EVENT_DEATH_COMPLETE, this, owner_or_self, export_string, 0, &args);
+	}
 
 	// Zone controller process EVENT_DEATH_ZONE (Death events)
 	if (parse->HasQuestSub(ZONE_CONTROLLER_NPC_ID, EVENT_DEATH_ZONE)) {
@@ -4258,60 +4285,100 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
 		//final damage has been determined.
 		int old_hp_ratio = (int)GetHPRatio();
 
+		const auto has_bot_given_event = parse->BotHasQuestSub(EVENT_DAMAGE_GIVEN);
+
+		const auto has_bot_taken_event = parse->BotHasQuestSub(EVENT_DAMAGE_TAKEN);
+
+		const auto has_npc_given_event = (
+			(
+				IsNPC() &&
+				parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_DAMAGE_GIVEN)
+			) ||
+			(
+				attacker &&
+				attacker->IsNPC() &&
+				parse->HasQuestSub(attacker->CastToNPC()->GetNPCTypeID(), EVENT_DAMAGE_GIVEN)
+			)
+		);
+
+		const auto has_npc_taken_event = (
+			(
+				IsNPC() &&
+				parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_DAMAGE_TAKEN)
+			) ||
+			(
+				attacker &&
+				attacker->IsNPC() &&
+				parse->HasQuestSub(attacker->CastToNPC()->GetNPCTypeID(), EVENT_DAMAGE_TAKEN)
+			)
+		);
+
+		const auto has_player_given_event = parse->PlayerHasQuestSub(EVENT_DAMAGE_GIVEN);
+
+		const auto has_player_taken_event = parse->PlayerHasQuestSub(EVENT_DAMAGE_TAKEN);
+
+		const auto has_given_event = (
+			has_bot_given_event ||
+			has_npc_given_event ||
+			has_player_given_event
+		);
+
+		const auto has_taken_event = (
+			has_bot_taken_event ||
+			has_npc_taken_event ||
+			has_player_taken_event
+		);
 
 		std::vector<std::any> args;
-
 		int64 damage_override = 0;
 
-		if (attacker) {
-			args = { this };
-
-			parse->EventMob(
-				EVENT_DAMAGE_GIVEN,
-				attacker,
-				this,
-				[&]() {
-					return fmt::format(
-						"{} {} {} {} {} {} {} {} {}",
-						GetID(),
-						damage,
-						spell_id,
-						static_cast<int>(skill_used),
-						FromDamageShield ? 1 : 0,
-						avoidable ? 1 : 0,
-						buffslot,
-						iBuffTic ? 1 : 0,
-						static_cast<int>(special)
-					);
-				},
-				0,
-				&args
+		if (has_given_event && attacker) {
+			const auto export_string = fmt::format(
+				"{} {} {} {} {} {} {} {} {}",
+				GetID(),
+				damage,
+				spell_id,
+				static_cast<int>(skill_used),
+				FromDamageShield ? 1 : 0,
+				avoidable ? 1 : 0,
+				buffslot,
+				iBuffTic ? 1 : 0,
+				static_cast<int>(special)
 			);
+
+			if (attacker->IsBot() && has_bot_given_event) {
+				parse->EventBot(EVENT_DAMAGE_GIVEN, attacker->CastToBot(), this, export_string, 0);
+			} else if (attacker->IsClient() && has_player_given_event) {
+				args.push_back(this);
+				parse->EventPlayer(EVENT_DAMAGE_GIVEN, attacker->CastToClient(), export_string, 0, &args);
+			} else if (attacker->IsNPC() && has_npc_given_event) {
+				parse->EventNPC(EVENT_DAMAGE_GIVEN, attacker->CastToNPC(), this, export_string, 0);
+			}
 		}
 
-		args = { attacker };
+		if (has_taken_event) {
+			const auto export_string = fmt::format(
+				"{} {} {} {} {} {} {} {} {}",
+				attacker ? attacker->GetID() : 0,
+				damage,
+				spell_id,
+				static_cast<int>(skill_used),
+				FromDamageShield ? 1 : 0,
+				avoidable ? 1 : 0,
+				buffslot,
+				iBuffTic ? 1 : 0,
+				static_cast<int>(special)
+			);
 
-		damage_override = parse->EventMob(
-			EVENT_DAMAGE_TAKEN,
-			this,
-			attacker,
-			[&]() {
-				return fmt::format(
-					"{} {} {} {} {} {} {} {} {}",
-					attacker ? attacker->GetID() : 0,
-					damage,
-					spell_id,
-					static_cast<int>(skill_used),
-					FromDamageShield ? 1 : 0,
-					avoidable ? 1 : 0,
-					buffslot,
-					iBuffTic ? 1 : 0,
-					static_cast<int>(special)
-				);
-			},
-			0,
-			&args
-		);
+			if (IsBot() && has_bot_taken_event) {
+				damage_override = parse->EventBot(EVENT_DAMAGE_TAKEN, CastToBot(), attacker ? attacker : nullptr, export_string, 0);
+			} else if (IsClient() && has_player_taken_event) {
+				args.push_back(attacker ? attacker : nullptr);
+				damage_override = parse->EventPlayer(EVENT_DAMAGE_TAKEN, CastToClient(), export_string, 0, &args);
+			} else if (IsNPC() && has_npc_taken_event) {
+				damage_override = parse->EventNPC(EVENT_DAMAGE_TAKEN, CastToNPC(), attacker ? attacker : nullptr, export_string, 0);
+			}
+		}
 
 		if (damage_override > 0) {
 			damage = damage_override;

zone/bot.cpp

@@ -1578,10 +1578,7 @@ bool Bot::Process()
 		return false;
 	}
 
-	if (m_scan_close_mobs_timer.Check()) {
-		entity_list.ScanCloseMobs(this);
-	}
-
+	ScanCloseMobProcess();
 	SpellProcess();
 
 	if (tic_timer.Check()) {

zone/bot_commands/bot.cpp

@@ -857,7 +857,7 @@ void bot_command_spawn(Client *c, const Seperator *sep)
 		c->Message(
 			Chat::White,
 			fmt::format(
-				"Usage: {} [bot_name] [optional: silent]",
+				"Usage: {} [bot_name]",
 				sep->arg[0]
 			).c_str()
 		);
@@ -1045,17 +1045,9 @@ void bot_command_spawn(Client *c, const Seperator *sep)
 		message_index = VALIDATECLASSID(my_bot->GetClass());
 	}
 
-	std::string silent_confirm = sep->arg[2];
-	bool silentTell = false;
-
-	if (!silent_confirm.compare("silent")) {
-		silentTell = true;
-	}
-
-	if (!silentTell && c->GetBotOption(Client::booSpawnMessageSay)) {
+	if (c->GetBotOption(Client::booSpawnMessageSay)) {
 		Bot::BotGroupSay(my_bot, bot_spawn_message[message_index].c_str());
-	}
-	else if (!silentTell && c->GetBotOption(Client::booSpawnMessageTell)) {
+	} else if (c->GetBotOption(Client::booSpawnMessageTell)) {
 		my_bot->OwnerMessage(bot_spawn_message[message_index]);
 	}
 }

zone/bot_database.cpp

@@ -828,7 +828,7 @@ bool BotDatabase::LoadTimers(Bot* b)
 	BotTimer_Struct t{ };
 
 	for (const auto& e : l) {
-		if (e.timer_value < (Timer::GetCurrentTime() + e.recast_time)) {
+		if (t.timer_value < (Timer::GetCurrentTime() + t.recast_time)) {
 			t.timer_id    = e.timer_id;
 			t.timer_value = e.timer_value;
 			t.recast_time = e.recast_time;
@@ -1451,7 +1451,7 @@ bool BotDatabase::DeletePetBuffs(const uint32 bot_id)
 		return true;
 	}
 
-	BotPetBuffsRepository::DeleteWhere(database, fmt::format("pets_index = {}", saved_pet_index));
+	BotPetBuffsRepository::DeleteOne(database, saved_pet_index);
 
 	return true;
 }

zone/bot_raid.cpp

@@ -312,12 +312,10 @@ void Client::SpawnRaidBotsOnConnect(Raid* raid) {
 	for (const auto& m: r_members) {
 		if (strlen(m.member_name) != 0) {
 
-			for (const auto& b : bots_list) {
+			for (const auto& b: bots_list) {
 				if (strcmp(m.member_name, b.bot_name) == 0) {
 					std::string buffer = "^spawn ";
 					buffer.append(m.member_name);
-					std::string silent = " silent";
-					buffer.append(silent);
 					bot_command_real_dispatch(this, buffer.c_str());
 					auto bot = entity_list.GetBotByBotName(m.member_name);
 

zone/client.cpp

@@ -1243,28 +1243,45 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 			entity_list.ProcessProximitySay(message, this, language);
 		}
 
-		Mob* t = GetTarget();
-
 		if (
-			t &&
-			!IsInvisible(t) &&
-			DistanceNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)
+			GetTarget() &&
+			GetTarget()->IsNPC() &&
+			!IsInvisible(GetTarget())
 		) {
-			const bool is_engaged = t->IsEngaged();
+			auto* t = GetTarget()->CastToNPC();
+			if (!t->IsEngaged()) {
+				CheckLDoNHail(t);
+				CheckEmoteHail(t, message);
 
-			if (is_engaged) {
-				parse->EventBotMercNPC(EVENT_AGGRO_SAY, t, this, [&]() { return message; }, language);
+				if (DistanceNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) {
+					if (parse->HasQuestSub(t->GetNPCTypeID(), EVENT_SAY)) {
+						parse->EventNPC(EVENT_SAY, t, this, message, language);
+					}
+
+					if (RuleB(TaskSystem, EnableTaskSystem)) {
+						if (UpdateTasksOnSpeakWith(t)) {
+							t->DoQuestPause(this);
+						}
+					}
+				}
 			} else {
-				parse->EventBotMercNPC(EVENT_SAY, t, this, [&]() { return message; }, language);
+				if (parse->HasQuestSub(t->GetNPCTypeID(), EVENT_AGGRO_SAY)) {
+					if (DistanceSquaredNoZ(m_Position, t->GetPosition()) <= RuleI(Range, Say)) {
+						parse->EventNPC(EVENT_AGGRO_SAY, t, this, message, language);
+					}
+				}
 			}
 
-			if (t->IsNPC() && !is_engaged) {
-				CheckLDoNHail(t->CastToNPC());
-				CheckEmoteHail(t->CastToNPC(), message);
-
-				if (RuleB(TaskSystem, EnableTaskSystem)) {
-					if (UpdateTasksOnSpeakWith(t->CastToNPC())) {
-						t->CastToNPC()->DoQuestPause(this);
+		}
+		else if (GetTarget() && GetTarget()->IsBot() && !IsInvisible(GetTarget())) {
+			if (DistanceNoZ(m_Position, GetTarget()->GetPosition()) <= RuleI(Range, Say)) {
+				if (GetTarget()->IsEngaged()) {
+					if (parse->BotHasQuestSub(EVENT_AGGRO_SAY)) {
+						parse->EventBot(EVENT_AGGRO_SAY, GetTarget()->CastToBot(), this, message, language);
+					}
+				} else {
+					if (parse->BotHasQuestSub(EVENT_SAY)) {
+						parse->EventBot(EVENT_SAY, GetTarget()->CastToBot(), this, message, language);
 					}
 				}
 			}
@@ -2282,67 +2299,52 @@ void Client::SetGM(bool toggle) {
 	UpdateWho();
 }
 
-void Client::ReadBook(BookRequest_Struct* book)
-{
-	const std::string& text_file = book->txtfile;
+void Client::ReadBook(BookRequest_Struct *book) {
+	int16 book_language=0;
+	char *txtfile = book->txtfile;
 
-	if (text_file.empty()) {
+	if(txtfile[0] == '0' && txtfile[1] == '\0') {
+		//invalid book... coming up on non-book items.
 		return;
 	}
 
-	auto b = content_db.GetBook(text_file);
+	std::string booktxt2 = content_db.GetBook(txtfile, &book_language);
+	int length = booktxt2.length();
 
-	if (!b.text.empty()) {
-		auto outapp = new EQApplicationPacket(OP_ReadBook, b.text.size() + sizeof(BookText_Struct));
-		auto inst = const_cast<EQ::ItemInstance*>(m_inv[book->invslot]);
+	if (booktxt2[0] != '\0') {
+#if EQDEBUG >= 6
+		LogInfo("Client::ReadBook() textfile:[{}] Text:[{}]", txtfile, booktxt2.c_str());
+#endif
+		auto outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct));
 
-		auto t = (BookText_Struct*) outapp->pBuffer;
+		BookText_Struct *out = (BookText_Struct *) outapp->pBuffer;
+		out->window = book->window;
+		out->type = book->type;
+		out->invslot = book->invslot;
+		out->target_id = book->target_id;
+		out->can_cast = 0; // todo: implement
+		out->can_scribe = false;
 
-		t->window     = book->window;
-		t->type       = book->type;
-		t->invslot    = book->invslot;
-		t->target_id  = book->target_id;
-		t->can_cast   = 0; // todo: implement
-		t->can_scribe = false;
-
-		if (ClientVersion() >= EQ::versions::ClientVersion::SoF && book->invslot <= EQ::invbag::GENERAL_BAGS_END) {
-			if (inst && inst->GetItem()) {
-				auto recipe = TradeskillRecipeRepository::GetWhere(
-					content_db,
-					fmt::format(
-						"learned_by_item_id = {} LIMIT 1",
-						inst->GetItem()->ID
-					)
-				);
-
-				t->type       = inst->GetItem()->Book;
-				t->can_scribe = !recipe.empty();
+		if (ClientVersion() >= EQ::versions::ClientVersion::SoF && book->invslot <= EQ::invbag::GENERAL_BAGS_END)
+		{
+			const EQ::ItemInstance* inst = m_inv[book->invslot];
+			if (inst && inst->GetItem())
+			{
+				auto recipe = TradeskillRecipeRepository::GetWhere(content_db,
+					fmt::format("learned_by_item_id = {} LIMIT 1", inst->GetItem()->ID));
+				out->type = inst->GetItem()->Book;
+				out->can_scribe = !recipe.empty();
 			}
 		}
 
-		memcpy(t->booktext, b.text.c_str(), b.text.size());
+		memcpy(out->booktext, booktxt2.c_str(), length);
 
-		if (EQ::ValueWithin(b.language, Language::CommonTongue, Language::Unknown27)) {
-			if (m_pp.languages[b.language] < Language::MaxValue) {
-				GarbleMessage(t->booktext, (Language::MaxValue - m_pp.languages[b.language]));
+		if (EQ::ValueWithin(book_language, Language::CommonTongue, Language::Unknown27)) {
+			if (m_pp.languages[book_language] < Language::MaxValue) {
+				GarbleMessage(out->booktext, (Language::MaxValue - m_pp.languages[book_language]));
 			}
 		}
 
-		// Send only books and scrolls to this event
-		if (parse->PlayerHasQuestSub(EVENT_READ_ITEM) && t->type != BookType::ItemInfo) {
-			std::vector<std::any> args = {
-				b.text,
-				t->can_cast,
-				t->can_scribe,
-				t->invslot,
-				t->target_id,
-				t->type,
-				inst
-			};
-
-			parse->EventPlayer(EVENT_READ_ITEM, this, book->txtfile, inst ? inst->GetID() : 0, &args);
-		}
-
 		QueuePacket(outapp);
 		safe_delete(outapp);
 	}
@@ -8677,16 +8679,14 @@ int Client::GetAccountAge() {
 
 void Client::CheckRegionTypeChanges()
 {
-	if (!zone->HasWaterMap()) {
+	if (!zone->HasWaterMap())
 		return;
-	}
 
 	auto new_region = zone->watermap->ReturnRegionType(glm::vec3(m_Position));
 
 	// still same region, do nothing
-	if (last_region_type == new_region) {
+	if (last_region_type == new_region)
 		return;
-	}
 
 	// If we got out of water clear any water aggro for water only npcs
 	if (last_region_type == RegionTypeWater) {
@@ -8697,15 +8697,13 @@ void Client::CheckRegionTypeChanges()
 	last_region_type = new_region;
 
 	// PVP is the only state we need to keep track of, so we can just return now for PVP servers
-	if (RuleI(World, PVPSettings) > 0) {
+	if (RuleI(World, PVPSettings) > 0)
 		return;
-	}
 
-	if (last_region_type == RegionTypePVP && RuleB(World, EnablePVPRegions)) {
+	if (last_region_type == RegionTypePVP)
 		temp_pvp = true;
-	} else if (temp_pvp) {
+	else if (temp_pvp)
 		temp_pvp = false;
-	}
 }
 
 void Client::ProcessAggroMeter()
@@ -10918,24 +10916,23 @@ void Client::SetIPExemption(int exemption_amount)
 
 void Client::ReadBookByName(std::string book_name, uint8 book_type)
 {
-	auto b = content_db.GetBook(book_name);
+	int16 book_language = 0;
+	std::string book_text = content_db.GetBook(book_name.c_str(), &book_language);
+	int length = book_text.length();
 
-	if (!b.text.empty()) {
-		LogDebug("Book Name: [{}] Text: [{}]", book_name, b.text);
+	if (book_text[0] != '\0') {
+		LogDebug("Client::ReadBookByName() Book Name: [{}] Text: [{}]", book_name, book_text.c_str());
+		auto outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct));
+		BookText_Struct *out = (BookText_Struct *) outapp->pBuffer;
+		out->window = 0xFF;
+		out->type = book_type;
+		out->invslot = 0;
 
-		auto outapp = new EQApplicationPacket(OP_ReadBook, b.text.size() + sizeof(BookText_Struct));
+		memcpy(out->booktext, book_text.c_str(), length);
 
-		auto o = (BookText_Struct *) outapp->pBuffer;
-
-		o->window  = std::numeric_limits<uint8>::max();
-		o->type    = book_type;
-		o->invslot = 0;
-
-		memcpy(o->booktext, b.text.c_str(), b.text.size());
-
-		if (EQ::ValueWithin(b.language, Language::CommonTongue, Language::Unknown27)) {
-			if (m_pp.languages[b.language] < Language::MaxValue) {
-				GarbleMessage(o->booktext, (Language::MaxValue - m_pp.languages[b.language]));
+		if (EQ::ValueWithin(book_language, Language::CommonTongue, Language::Unknown27)) {
+			if (m_pp.languages[book_language] < Language::MaxValue) {
+				GarbleMessage(out->booktext, (Language::MaxValue - m_pp.languages[book_language]));
 			}
 		}
 
@@ -11995,13 +11992,15 @@ void Client::MaxSkills()
 	}
 }
 
-void Client::SendPath(Mob* target) {
+void Client::SendPath(Mob* target)
+{
 	if (!target) {
 		EQApplicationPacket outapp(OP_FindPersonReply, 0);
 		QueuePacket(&outapp);
 		return;
 	}
 
+
 	if (
 		!RuleB(Pathing, Find) &&
 		RuleB(Bazaar, EnableWarpToTrader) &&
@@ -12009,7 +12008,7 @@ void Client::SendPath(Mob* target) {
 		(
 			target->CastToClient()->IsTrader() ||
 			target->CastToClient()->IsBuyer()
-			)
+		)
 		) {
 		Message(
 			Chat::Yellow,
@@ -12029,17 +12028,6 @@ void Client::SendPath(Mob* target) {
 		return;
 	}
 
-	glm::vec3 target_loc(
-		target->GetX(),
-		target->GetY(),
-		target->GetZ() + (target->GetSize() < 6.0 ? 6 : target->GetSize()) * HEAD_POSITION
-	);
-
-	SendPath(target_loc);
-}
-
-void Client::SendPath(const glm::vec3& loc)
-{
 	std::vector<FindPerson_Point> points;
 
 	if (!RuleB(Pathing, Find) || !zone->pathing) {
@@ -12050,9 +12038,9 @@ void Client::SendPath(const glm::vec3& loc)
 		a.x = GetX();
 		a.y = GetY();
 		a.z = GetZ();
-		b.x = loc.x;
-		b.y = loc.y;
-		b.z = loc.z;
+		b.x = target->GetX();
+		b.y = target->GetY();
+		b.z = target->GetZ();
 
 		points.push_back(a);
 		points.push_back(b);
@@ -12065,9 +12053,9 @@ void Client::SendPath(const glm::vec3& loc)
 		);
 
 		glm::vec3 path_end(
-			loc.x,
-			loc.y,
-			loc.z
+			target->GetX(),
+			target->GetY(),
+			target->GetZ() + (target->GetSize() < 6.0 ? 6 : target->GetSize()) * HEAD_POSITION
 		);
 
 		bool partial   = false;
@@ -12090,6 +12078,18 @@ void Client::SendPath(const glm::vec3& loc)
 
 		bool leads_to_teleporter = false;
 
+		auto v = path_list.back();
+
+		p.x = v.pos.x;
+		p.y = v.pos.y;
+		p.z = v.pos.z;
+		points.push_back(p);
+
+		p.x = GetX();
+		p.y = GetY();
+		p.z = GetZ();
+		points.push_back(p);
+
 		for (const auto &n: path_list) {
 			if (n.teleport) {
 				leads_to_teleporter = true;
@@ -12105,6 +12105,14 @@ void Client::SendPath(const glm::vec3& loc)
 
 			++point_number;
 		}
+
+		if (!leads_to_teleporter) {
+			p.x = target->GetX();
+			p.y = target->GetY();
+			p.z = target->GetZ();
+
+			points.push_back(p);
+		}
 	}
 
 	SendPathPacket(points);
@@ -12309,248 +12317,6 @@ void Client::PlayerTradeEventLog(Trade *t, Trade *t2)
 	RecordPlayerEventLogWithClient(trader2, PlayerEvent::TRADE, e);
 }
 
-void Client::NPCHandinEventLog(Trade* t, NPC* n)
-{
-	Client* c = t->GetOwner()->CastToClient();
-
-	std::vector<PlayerEvent::HandinEntry> hi = {};
-	std::vector<PlayerEvent::HandinEntry> ri = {};
-	PlayerEvent::HandinMoney              hm{};
-	PlayerEvent::HandinMoney              rm{};
-
-	if (
-		c->EntityVariableExists("HANDIN_ITEMS") &&
-		c->EntityVariableExists("HANDIN_MONEY") &&
-		c->EntityVariableExists("RETURN_ITEMS") &&
-		c->EntityVariableExists("RETURN_MONEY")
-	) {
-		const std::string& handin_items = c->GetEntityVariable("HANDIN_ITEMS");
-		const std::string& return_items = c->GetEntityVariable("RETURN_ITEMS");
-		const std::string& handin_money = c->GetEntityVariable("HANDIN_MONEY");
-		const std::string& return_money = c->GetEntityVariable("RETURN_MONEY");
-
-		// Handin Items
-		if (!handin_items.empty()) {
-			if (Strings::Contains(handin_items, ",")) {
-				const auto handin_data = Strings::Split(handin_items, ",");
-				for (const auto& h : handin_data) {
-					const auto item_data = Strings::Split(h, "|");
-					if (
-						item_data.size() == 3 &&
-						Strings::IsNumber(item_data[0]) &&
-						Strings::IsNumber(item_data[1]) &&
-						Strings::IsNumber(item_data[2])
-					) {
-						const uint32 item_id = Strings::ToUnsignedInt(item_data[0]);
-						if (item_id != 0) {
-							const auto* item = database.GetItem(item_id);
-
-							if (item) {
-								hi.emplace_back(
-									PlayerEvent::HandinEntry{
-										.item_id = item_id,
-										.item_name = item->Name,
-										.charges = static_cast<uint16>(Strings::ToUnsignedInt(item_data[1])),
-										.attuned = Strings::ToInt(item_data[2]) ? true : false
-									}
-								);
-							}
-						}
-					}
-				}
-			} else if (Strings::Contains(handin_items, "|")) {
-				const auto item_data = Strings::Split(handin_items, "|");
-				if (
-					item_data.size() == 3 &&
-					Strings::IsNumber(item_data[0]) &&
-					Strings::IsNumber(item_data[1]) &&
-					Strings::IsNumber(item_data[2])
-				) {
-					const uint32 item_id = Strings::ToUnsignedInt(item_data[0]);
-					const auto*  item    = database.GetItem(item_id);
-
-					if (item) {
-						hi.emplace_back(
-							PlayerEvent::HandinEntry{
-								.item_id = item_id,
-								.item_name = item->Name,
-								.charges = static_cast<uint16>(Strings::ToUnsignedInt(item_data[1])),
-								.attuned = Strings::ToInt(item_data[2]) ? true : false
-							}
-						);
-					}
-				}
-			}
-		}
-
-		// Handin Money
-		if (!handin_money.empty()) {
-			const auto hms = Strings::Split(handin_money, "|");
-
-			hm.copper   = Strings::ToUnsignedInt(hms[0]);
-			hm.silver   = Strings::ToUnsignedInt(hms[1]);
-			hm.gold     = Strings::ToUnsignedInt(hms[2]);
-			hm.platinum = Strings::ToUnsignedInt(hms[3]);
-		}
-
-		// Return Items
-		if (!return_items.empty()) {
-			if (Strings::Contains(return_items, ",")) {
-				const auto return_data = Strings::Split(return_items, ",");
-				for (const auto& r : return_data) {
-					const auto item_data = Strings::Split(r, "|");
-					if (
-						item_data.size() == 3 &&
-						Strings::IsNumber(item_data[0]) &&
-						Strings::IsNumber(item_data[1]) &&
-						Strings::IsNumber(item_data[2])
-					) {
-						const uint32 item_id = Strings::ToUnsignedInt(item_data[0]);
-						const auto*  item    = database.GetItem(item_id);
-
-						if (item) {
-							ri.emplace_back(
-								PlayerEvent::HandinEntry{
-									.item_id = item_id,
-									.item_name = item->Name,
-									.charges = static_cast<uint16>(Strings::ToUnsignedInt(item_data[1])),
-									.attuned = Strings::ToInt(item_data[2]) ? true : false
-								}
-							);
-						}
-					}
-				}
-			} else if (Strings::Contains(return_items, "|")) {
-				const auto item_data = Strings::Split(return_items, "|");
-				if (
-					item_data.size() == 3 &&
-					Strings::IsNumber(item_data[0]) &&
-					Strings::IsNumber(item_data[1]) &&
-					Strings::IsNumber(item_data[2])
-				) {
-					const uint32 item_id = Strings::ToUnsignedInt(item_data[0]);
-					const auto*  item    = database.GetItem(item_id);
-
-					if (item) {
-						ri.emplace_back(
-							PlayerEvent::HandinEntry{
-								.item_id = item_id,
-								.item_name = item->Name,
-								.charges = static_cast<uint16>(Strings::ToUnsignedInt(item_data[1])),
-								.attuned = Strings::ToInt(item_data[2]) ? true : false
-							}
-						);
-					}
-				}
-			}
-		}
-
-		// Return Money
-		if (!return_money.empty()) {
-			const auto rms = Strings::Split(return_money, "|");
-			rm.copper   = static_cast<uint32>(Strings::ToUnsignedInt(rms[0]));
-			rm.silver   = static_cast<uint32>(Strings::ToUnsignedInt(rms[1]));
-			rm.gold     = static_cast<uint32>(Strings::ToUnsignedInt(rms[2]));
-			rm.platinum = static_cast<uint32>(Strings::ToUnsignedInt(rms[3]));
-		}
-
-		c->DeleteEntityVariable("HANDIN_ITEMS");
-		c->DeleteEntityVariable("HANDIN_MONEY");
-		c->DeleteEntityVariable("RETURN_ITEMS");
-		c->DeleteEntityVariable("RETURN_MONEY");
-
-		const bool handed_in_money = hm.platinum > 0 || hm.gold > 0 || hm.silver > 0 || hm.copper > 0;
-
-		const bool event_has_data_to_record = (
-			!hi.empty() || handed_in_money
-		);
-
-		if (player_event_logs.IsEventEnabled(PlayerEvent::NPC_HANDIN) && event_has_data_to_record) {
-			auto e = PlayerEvent::HandinEvent{
-				.npc_id = n->GetNPCTypeID(),
-				.npc_name = n->GetCleanName(),
-				.handin_items = hi,
-				.handin_money = hm,
-				.return_items = ri,
-				.return_money = rm,
-				.is_quest_handin = true
-			};
-
-			RecordPlayerEventLogWithClient(c, PlayerEvent::NPC_HANDIN, e);
-		}
-
-		return;
-	}
-
-	uint8 item_count = 0;
-
-	hm.platinum = t->pp;
-	hm.gold     = t->gp;
-	hm.silver   = t->sp;
-	hm.copper   = t->cp;
-
-	for (uint16 i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_NPC_END; i++) {
-		if (c->GetInv().GetItem(i)) {
-			item_count++;
-		}
-	}
-
-	hi.reserve(item_count);
-
-	if (item_count > 0) {
-		for (uint16 i = EQ::invslot::TRADE_BEGIN; i <= EQ::invslot::TRADE_NPC_END; i++) {
-			const EQ::ItemInstance* inst = c->GetInv().GetItem(i);
-			if (inst) {
-				hi.emplace_back(
-					PlayerEvent::HandinEntry{
-						.item_id = inst->GetItem()->ID,
-						.item_name = inst->GetItem()->Name,
-						.charges = static_cast<uint16>(inst->GetCharges()),
-						.attuned = inst->IsAttuned()
-					}
-				);
-
-				if (inst->IsClassBag()) {
-					for (uint8 j = EQ::invbag::SLOT_BEGIN; j <= EQ::invbag::SLOT_END; j++) {
-						inst = c->GetInv().GetItem(i, j);
-						if (inst) {
-							hi.emplace_back(
-								PlayerEvent::HandinEntry{
-									.item_id = inst->GetItem()->ID,
-									.item_name = inst->GetItem()->Name,
-									.charges = static_cast<uint16>(inst->GetCharges()),
-									.attuned = inst->IsAttuned()
-								}
-							);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	const bool handed_in_money = hm.platinum > 0 || hm.gold > 0 || hm.silver > 0 || hm.copper > 0;
-
-	ri = hi;
-	rm = hm;
-
-	const bool event_has_data_to_record = !hi.empty() || handed_in_money;
-
-	if (player_event_logs.IsEventEnabled(PlayerEvent::NPC_HANDIN) && event_has_data_to_record) {
-		auto e = PlayerEvent::HandinEvent{
-			.npc_id = n->GetNPCTypeID(),
-			.npc_name = n->GetCleanName(),
-			.handin_items = hi,
-			.handin_money = hm,
-			.return_items = ri,
-			.return_money = rm,
-			.is_quest_handin = false
-		};
-
-		RecordPlayerEventLogWithClient(c, PlayerEvent::NPC_HANDIN, e);
-	}
-}
-
 void Client::ShowSpells(Client* c, ShowSpellType show_spell_type)
 {
 	std::string spell_string;

zone/client.h

@@ -196,7 +196,6 @@ struct RespawnOption
 	float heading;
 };
 
-
 // do not ask what all these mean because I have no idea!
 // named from the client's CEverQuest::GetInnateDesc, they're missing some
 enum eInnateSkill {
@@ -869,7 +868,6 @@ public:
 	int GetAccountAge();
 
 	void SendPath(Mob* target);
-	void SendPath(const glm::vec3 &loc);
 
 	bool IsDiscovered(uint32 itemid);
 	void DiscoverItem(uint32 itemid);
@@ -2228,7 +2226,6 @@ private:
 	bool CanTradeFVNoDropItem();
 	void SendMobPositions();
 	void PlayerTradeEventLog(Trade *t, Trade *t2);
-	void NPCHandinEventLog(Trade* t, NPC* n);
 
 	// full and partial mail key cache
 	std::string m_mail_key_full;

zone/client_packet.cpp

@@ -858,9 +858,6 @@ void Client::CompleteConnect()
 	if (ClientVersion() >= EQ::versions::ClientVersion::SoD)
 		entity_list.SendFindableNPCList(this);
 
-	if (ClientVersion() >= EQ::versions::ClientVersion::RoF2)
-		zone->SendFindableLocations(this);
-
 	if (IsInAGuild()) {
 		if (firstlogon == 1) {
 			guild_mgr.UpdateDbMemberOnline(CharacterID(), true);
@@ -2734,14 +2731,6 @@ void Client::Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app)
 		return;
 	}
 
-	if (IsTrader()) {
-		TraderEndTrader();
-	}
-
-	if (IsBuyer()) {
-		ToggleBuyerMode(false);
-	}
-
 	/* Item to Currency Storage */
 	if (reclaim->reclaim_flag == 1) {
 		uint32 removed = NukeItem(item_id, invWhereWorn | invWherePersonal | invWhereCursor);
@@ -5024,11 +5013,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	SetMoving(!(cy == m_Position.y && cx == m_Position.x));
 
 	CheckClientToNpcAggroTimer();
-
-	if (m_mob_check_moving_timer.Check()) {
-		CheckScanCloseMobsMovingTimer();
-	}
-
+	CheckScanCloseMobsMovingTimer();
 	CheckSendBulkClientPositionUpdate();
 
 	int32 new_animation = ppu->animation;
@@ -6477,40 +6462,9 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 	else {
 		auto* t = (FindPersonRequest_Struct*)app->pBuffer;
 
-		switch (t->type) {
-		case FindLocationType::LocationPlayer: {
-			auto* m = entity_list.GetMob(t->id);
-			SendPath(m);
-			break;
-		}
-		case FindLocationType::LocationSwitch:
-		{
-			auto *d = entity_list.GetDoorsByDoorID(t->id);
-			if (d == nullptr) {
-				Message(Chat::Red, "Switch for find not found.");
-				return;
-			}
+		auto* m = entity_list.GetMob(t->npc_id);
 
-			glm::vec3 door_loc;
-			door_loc.x = d->GetX();
-			door_loc.y = d->GetY();
-			door_loc.z = d->GetZ();
-			SendPath(door_loc);
-			break;
-		}
-		case FindLocationType::LocationLocation:
-		{
-			glm::vec3 target_pos;
-			target_pos.x = t->target_pos.x;
-			target_pos.y = t->target_pos.y;
-			target_pos.z = t->target_pos.z;
-
-			SendPath(target_pos);
-			break;
-		}
-		default:
-			break;
-		}
+		SendPath(m);
 	}
 }
 
@@ -12030,7 +11984,15 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 
 	auto t = GetTarget();
 	if (t) {
-		parse->EventBotMercNPC(EVENT_POPUP_RESPONSE, t, this, [&]() { return std::to_string(popup_response->popupid); });
+		if (t->IsNPC()) {
+			if (parse->HasQuestSub(t->GetNPCTypeID(), EVENT_POPUP_RESPONSE)) {
+				parse->EventNPC(EVENT_POPUP_RESPONSE, t->CastToNPC(), this, std::to_string(popup_response->popupid), 0);
+			}
+		} else if (t->IsBot()) {
+			if (parse->BotHasQuestSub(EVENT_POPUP_RESPONSE)) {
+				parse->EventBot(EVENT_POPUP_RESPONSE, t->CastToBot(), this, std::to_string(popup_response->popupid), 0);
+			}
+		}
 	}
 }
 
@@ -13084,14 +13046,14 @@ void Client::Handle_OP_ReadBook(const EQApplicationPacket *app)
 		LogError("Wrong size: OP_ReadBook, size=[{}], expected [{}]", app->size, sizeof(BookRequest_Struct));
 		return;
 	}
-
-	auto b = (BookRequest_Struct*) app->pBuffer;
-	ReadBook(b);
-
-	if (ClientVersion() >= EQ::versions::ClientVersion::SoF) {
-		EQApplicationPacket end_of_book(OP_FinishWindow, 0);
-		QueuePacket(&end_of_book);
+	BookRequest_Struct* book = (BookRequest_Struct*)app->pBuffer;
+	ReadBook(book);
+	if (ClientVersion() >= EQ::versions::ClientVersion::SoF)
+	{
+		EQApplicationPacket EndOfBook(OP_FinishWindow, 0);
+		QueuePacket(&EndOfBook);
 	}
+	return;
 }
 
 void Client::Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app)

zone/client_process.cpp

@@ -281,9 +281,7 @@ bool Client::Process() {
 			}
 		}
 
-		if (m_scan_close_mobs_timer.Check()) {
-			entity_list.ScanCloseMobs(this);
-		}
+		ScanCloseMobProcess();
 
 		if (RuleB(Inventory, LazyLoadBank)) {
 			// poll once a second to see if we are close to a banker and we haven't loaded the bank yet

zone/command.cpp

@@ -40,7 +40,7 @@ extern FastMath g_Math;
 void CatchSignal(int sig_num);
 
 
-int command_count; // how many commands we have
+int                                                           command_count; // how many commands we have
 
 // this is the pointer to the dispatch function, updated once
 // init has been performed to point at the real function
@@ -96,7 +96,7 @@ int command_init(void)
 		command_add("augmentitem", "Force augments an item. Must have the augment item window open.", AccountStatus::GMImpossible, command_augmentitem) ||
 		command_add("ban", "[Character Name] [Reason] - Ban by character name", AccountStatus::GMLeadAdmin, command_ban) ||
 		command_add("bugs", "[Close|Delete|Review|Search|View] - Handles player bug reports", AccountStatus::QuestTroupe, command_bugs) ||
-		(RuleB(Bots, Enabled) && command_add("bot", "Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", AccountStatus::Player, command_bot)) ||
+		command_add("bot", "Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", AccountStatus::Player, command_bot) ||
 		command_add("camerashake", "[Duration (Milliseconds)] [Intensity (1-10)] - Shakes the camera on everyone's screen globally.", AccountStatus::QuestTroupe, command_camerashake) ||
 		command_add("castspell", "[Spell ID] [Instant (0 = False, 1 = True, Default is 1 if Unused)] - Cast a spell", AccountStatus::Guide, command_castspell) ||
 		command_add("chat", "[Channel ID] [Message] - Send a channel message to all zones", AccountStatus::GMMgmt, command_chat) ||

zone/effects.cpp

@@ -1096,7 +1096,7 @@ void EntityList::AESpell(
 		max_targets = nullptr;
 	}
 
-	int max_targets_allowed = RuleI(Spells, DefaultAOEMaxTargets);;
+	int max_targets_allowed = RuleI(Range, AOEMaxTargets); // unlimited
 	if (max_targets) { // rains pass this in since they need to preserve the count through waves
 		max_targets_allowed = *max_targets;
 	} else if (spells[spell_id].aoe_max_targets) {
@@ -1108,13 +1108,7 @@ void EntityList::AESpell(
 		!IsEffectInSpell(spell_id, SE_Lull) &&
 		!IsEffectInSpell(spell_id, SE_Mez)
 	) {
-		max_targets_allowed = RuleI(Spells, TargetedAOEMaxTargets);
-	} else if (
-		IsPBAENukeSpell(spell_id) &&
-		IsDetrimentalSpell &&
-		!is_npc
-	) {
-		max_targets_allowed = RuleI(Spells, PointBlankAOEMaxTargets);
+		max_targets_allowed = 4;
 	}
 
 	int   target_hit_counter = 0;

zone/embparser.cpp

@@ -57,8 +57,6 @@ void perl_register_expedition();
 void perl_register_expedition_lock_messages();
 void perl_register_bot();
 void perl_register_buff();
-void perl_register_merc();
-void perl_register_database();
 #endif // EMBPERL_XS_CLASSES
 #endif // EMBPERL_XS
 
@@ -205,7 +203,6 @@ const char* QuestEventSubroutines[_LargestEventID] = {
 	"EVENT_ENTITY_VARIABLE_UPDATE",
 	"EVENT_AA_LOSS",
 	"EVENT_SPELL_BLOCKED",
-	"EVENT_READ_ITEM",
 
 	// Add new events before these or Lua crashes
 	"EVENT_SPELL_EFFECT_BOT",
@@ -219,8 +216,6 @@ PerlembParser::PerlembParser() : perl(nullptr)
 	global_player_quest_status_ = questUnloaded;
 	bot_quest_status_           = questUnloaded;
 	global_bot_quest_status_    = questUnloaded;
-	merc_quest_status_          = questUnloaded;
-	global_merc_quest_status_   = questUnloaded;
 }
 
 PerlembParser::~PerlembParser()
@@ -262,8 +257,6 @@ void PerlembParser::ReloadQuests()
 	global_player_quest_status_ = questUnloaded;
 	bot_quest_status_           = questUnloaded;
 	global_bot_quest_status_    = questUnloaded;
-	merc_quest_status_          = questUnloaded;
-	global_merc_quest_status_   = questUnloaded;
 
 	item_quest_status_.clear();
 	spell_quest_status_.clear();
@@ -291,8 +284,6 @@ int PerlembParser::EventCommon(
 	bool is_global_npc_quest    = false;
 	bool is_bot_quest           = false;
 	bool is_global_bot_quest    = false;
-	bool is_merc_quest          = false;
-	bool is_global_merc_quest   = false;
 	bool is_item_quest          = false;
 	bool is_spell_quest         = false;
 
@@ -303,8 +294,6 @@ int PerlembParser::EventCommon(
 		is_global_player_quest,
 		is_bot_quest,
 		is_global_bot_quest,
-		is_merc_quest,
-		is_global_merc_quest,
 		is_global_npc_quest,
 		is_item_quest,
 		is_spell_quest,
@@ -320,8 +309,6 @@ int PerlembParser::EventCommon(
 		is_global_player_quest,
 		is_bot_quest,
 		is_global_bot_quest,
-		is_merc_quest,
-		is_global_merc_quest,
 		is_global_npc_quest,
 		is_item_quest,
 		is_spell_quest,
@@ -351,8 +338,6 @@ int PerlembParser::EventCommon(
 			is_global_player_quest,
 			is_bot_quest,
 			is_global_bot_quest,
-			is_merc_quest,
-			is_global_merc_quest,
 			is_global_npc_quest,
 			is_item_quest,
 			is_spell_quest,
@@ -370,8 +355,6 @@ int PerlembParser::EventCommon(
 			is_global_player_quest,
 			is_bot_quest,
 			is_global_bot_quest,
-			is_merc_quest,
-			is_global_merc_quest,
 			is_global_npc_quest,
 			is_item_quest,
 			is_spell_quest,
@@ -398,7 +381,7 @@ int PerlembParser::EventCommon(
 
 	if (is_player_quest || is_global_player_quest) {
 		return SendCommands(package_name.c_str(), QuestEventSubroutines[event_id], 0, mob, mob, nullptr, nullptr);
-	} else if (is_bot_quest || is_global_bot_quest || is_merc_quest || is_global_merc_quest) {
+	} else if (is_bot_quest || is_global_bot_quest) {
 		return SendCommands(package_name.c_str(), QuestEventSubroutines[event_id], 0, npc_mob, mob, nullptr, nullptr);
 	} else if (is_item_quest) {
 		return SendCommands(package_name.c_str(), QuestEventSubroutines[event_id], 0, mob, mob, inst, nullptr);
@@ -1025,22 +1008,41 @@ int PerlembParser::SendCommands(
 #ifdef EMBPERL_XS_CLASSES
 		dTHX;
 		{
-			const std::vector<std::string>& suffixes = {
-				"bot",
-				"client",
-				"entity_list",
-				"merc",
-				"npc",
-				"questitem",
-				"spell"
-			};
+			std::string cl  = fmt::format("${}::client", prefix);
+			std::string np  = fmt::format("${}::npc", prefix);
+			std::string qi  = fmt::format("${}::questitem", prefix);
+			std::string sp  = fmt::format("${}::spell", prefix);
+			std::string enl = fmt::format("${}::entity_list", prefix);
+			std::string bot = fmt::format("${}::bot", prefix);
 
-			for (const auto& suffix : suffixes) {
-				const std::string& key = fmt::format("${}::{}", prefix, suffix);
-				if (clear_vars_.find(suffix) != clear_vars_.end()) {
-					auto e = fmt::format("{} = undef;", key);
-					perl->eval(e.c_str());
-				}
+			if (clear_vars_.find(cl) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", cl);
+				perl->eval(e.c_str());
+			}
+
+			if (clear_vars_.find(np) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", np);
+				perl->eval(e.c_str());
+			}
+
+			if (clear_vars_.find(qi) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", qi);
+				perl->eval(e.c_str());
+			}
+
+			if (clear_vars_.find(sp) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", sp);
+				perl->eval(e.c_str());
+			}
+
+			if (clear_vars_.find(enl) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", enl);
+				perl->eval(e.c_str());
+			}
+
+			if (clear_vars_.find(bot) != clear_vars_.end()) {
+				auto e = fmt::format("{} = undef;", bot);
+				perl->eval(e.c_str());
 			}
 		}
 
@@ -1057,23 +1059,21 @@ int PerlembParser::SendCommands(
 			sv_setsv(client, _empty_sv);
 		}
 
-		if (other->IsBot()) {
-			Bot* b = quest_manager.GetBot();
-			buf = fmt::format("{}::bot", prefix);
-			SV* bot = get_sv(buf.c_str(), true);
-			sv_setref_pv(bot, "Bot", b);
-		} else if (other->IsMerc()) {
-			Merc* m = quest_manager.GetMerc();
-			buf = fmt::format("{}::merc", prefix);
-			SV* merc = get_sv(buf.c_str(), true);
-			sv_setref_pv(merc, "Merc", m);
-		} else if (other->IsNPC()) {
+		//only export NPC if it's a npc quest
+		if (!other->IsClient() && other->IsNPC()) {
 			NPC* n = quest_manager.GetNPC();
 			buf = fmt::format("{}::npc", prefix);
 			SV* npc = get_sv(buf.c_str(), true);
 			sv_setref_pv(npc, "NPC", n);
 		}
 
+		if (!other->IsClient() && other->IsBot()) {
+			Bot* b = quest_manager.GetBot();
+			buf = fmt::format("{}::bot", prefix);
+			SV* bot = get_sv(buf.c_str(), true);
+			sv_setref_pv(bot, "Bot", b);
+		}
+
 		//only export QuestItem if it's an inst quest
 		if (inst) {
 			auto i = quest_manager.GetQuestItem();
@@ -1097,25 +1097,23 @@ int PerlembParser::SendCommands(
 #endif
 
 		//now call the requested sub
-		const std::string& sub_key = fmt::format("{}::{}", prefix, event_id);
-		ret_value = perl->dosub(sub_key.c_str());
+		ret_value = perl->dosub(std::string(prefix).append("::").append(event_id).c_str());
 
 #ifdef EMBPERL_XS_CLASSES
 		{
-			const std::vector<std::string>& suffixes = {
-				"bot",
-				"client",
-				"entity_list",
-				"merc",
-				"npc",
-				"questitem",
-				"spell"
-			};
+			std::string cl  = fmt::format("${}::client", prefix);
+			std::string np  = fmt::format("${}::npc", prefix);
+			std::string qi  = fmt::format("${}::questitem", prefix);
+			std::string sp  = fmt::format("${}::spell", prefix);
+			std::string enl = fmt::format("${}::entity_list", prefix);
+			std::string bot = fmt::format("${}::bot", prefix);
 
-			for (const auto& suffix : suffixes) {
-				const std::string& key = fmt::format("${}::{}", prefix, suffix);
-				clear_vars_[key] = 1;
-			}
+			clear_vars_[cl]  = 1;
+			clear_vars_[np]  = 1;
+			clear_vars_[qi]  = 1;
+			clear_vars_[sp]  = 1;
+			clear_vars_[enl] = 1;
+			clear_vars_[bot] = 1;
 		}
 #endif
 
@@ -1185,8 +1183,6 @@ void PerlembParser::MapFunctions()
 	perl_register_expedition_lock_messages();
 	perl_register_bot();
 	perl_register_buff();
-	perl_register_merc();
-	perl_register_database();
 #endif // EMBPERL_XS_CLASSES
 }
 
@@ -1195,8 +1191,6 @@ void PerlembParser::GetQuestTypes(
 	bool& is_global_player_quest,
 	bool& is_bot_quest,
 	bool& is_global_bot_quest,
-	bool& is_merc_quest,
-	bool& is_global_merc_quest,
 	bool& is_global_npc_quest,
 	bool& is_item_quest,
 	bool& is_spell_quest,
@@ -1224,14 +1218,10 @@ void PerlembParser::GetQuestTypes(
 				if (is_global) {
 					if (npc_mob->IsBot()) {
 						is_global_bot_quest = true;
-					} else if (npc_mob->IsMerc()) {
-						is_global_merc_quest = true;
 					}
 				} else {
 					if (npc_mob->IsBot()) {
 						is_bot_quest = true;
-					} else if (npc_mob->IsMerc()) {
-						is_merc_quest = true;
 					}
 				}
 			} else {
@@ -1260,8 +1250,6 @@ void PerlembParser::GetQuestPackageName(
 	bool& is_global_player_quest,
 	bool& is_bot_quest,
 	bool& is_global_bot_quest,
-	bool& is_merc_quest,
-	bool& is_global_merc_quest,
 	bool& is_global_npc_quest,
 	bool& is_item_quest,
 	bool& is_spell_quest,
@@ -1279,8 +1267,6 @@ void PerlembParser::GetQuestPackageName(
 		!is_global_player_quest &&
 		!is_bot_quest &&
 		!is_global_bot_quest &&
-		!is_merc_quest &&
-		!is_global_merc_quest &&
 		!is_item_quest &&
 		!is_spell_quest
 	) {
@@ -1304,10 +1290,6 @@ void PerlembParser::GetQuestPackageName(
 		package_name = "qst_bot";
 	} else if (is_global_bot_quest) {
 		package_name = "qst_global_bot";
-	} else if (is_merc_quest) {
-		package_name = "qst_merc";
-	} else if (is_global_merc_quest) {
-		package_name = "qst_global_merc";
 	} else {
 		package_name = fmt::format("qst_spell_{}", object_id);
 	}
@@ -1333,8 +1315,6 @@ void PerlembParser::ExportQGlobals(
 	bool is_global_player_quest,
 	bool is_bot_quest,
 	bool is_global_bot_quest,
-	bool is_merc_quest,
-	bool is_global_merc_quest,
 	bool is_global_npc_quest,
 	bool is_item_quest,
 	bool is_spell_quest,
@@ -1350,8 +1330,6 @@ void PerlembParser::ExportQGlobals(
 		!is_global_player_quest &&
 		!is_bot_quest &&
 		!is_global_bot_quest &&
-		!is_merc_quest &&
-		!is_global_merc_quest &&
 		!is_item_quest &&
 		!is_spell_quest
 	) {
@@ -1487,8 +1465,6 @@ void PerlembParser::ExportMobVariables(
 	bool is_global_player_quest,
 	bool is_bot_quest,
 	bool is_global_bot_quest,
-	bool is_merc_quest,
-	bool is_global_merc_quest,
 	bool is_global_npc_quest,
 	bool is_item_quest,
 	bool is_spell_quest,
@@ -1514,8 +1490,6 @@ void PerlembParser::ExportMobVariables(
 		!is_global_player_quest &&
 		!is_bot_quest &&
 		!is_global_bot_quest &&
-		!is_merc_quest &&
-		!is_global_merc_quest &&
 		!is_item_quest
 	) {
 		if (mob && mob->IsClient() && npc_mob && npc_mob->IsNPC()) {
@@ -1546,8 +1520,6 @@ void PerlembParser::ExportMobVariables(
 		!is_global_player_quest &&
 		!is_bot_quest &&
 		!is_global_bot_quest &&
-		!is_merc_quest &&
-		!is_global_merc_quest &&
 		!is_item_quest &&
 		!is_spell_quest
 	) {
@@ -1736,7 +1708,7 @@ void PerlembParser::ExportEventVariables(
 		case EVENT_PAYLOAD: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "payload_id", sep.arg[0]);
-			ExportVar(package_name.c_str(), "payload_value", sep.argplus[1]);
+			ExportVar(package_name.c_str(), "payload_value", sep.arg[1]);
 			break;
 		}
 
@@ -2108,8 +2080,7 @@ void PerlembParser::ExportEventVariables(
 						"killed_bot_id",
 						killed->IsBot() ? killed->CastToBot()->GetBotID() : 0
 					);
-					ExportVar(package_name.c_str(), "killed_merc_id", killed->IsMerc() ? killed->CastToMerc()->GetMercenaryID() : 0);
-					ExportVar(package_name.c_str(), "killed_npc_id", !killed->IsMerc() && killed->IsNPC() ? killed->GetNPCTypeID() : 0);
+					ExportVar(package_name.c_str(), "killed_npc_id", killed->IsNPC() ? killed->GetNPCTypeID() : 0);
 				}
 			}
 			break;
@@ -2385,7 +2356,6 @@ void PerlembParser::ExportEventVariables(
 		case EVENT_DESPAWN: {
 			ExportVar(package_name.c_str(), "despawned_entity_id", npc_mob->GetID());
 			ExportVar(package_name.c_str(), "despawned_bot_id", npc_mob->IsBot() ? npc_mob->CastToBot()->GetBotID() : 0);
-			ExportVar(package_name.c_str(), "despawned_merc_id", npc_mob->IsMerc() ? npc_mob->CastToMerc()->GetMercenaryID() : 0);
 			ExportVar(package_name.c_str(), "despawned_npc_id", npc_mob->IsNPC() ? npc_mob->GetNPCTypeID() : 0);
 			break;
 		}
@@ -2518,28 +2488,6 @@ void PerlembParser::ExportEventVariables(
 			break;
 		}
 
-		case EVENT_READ_ITEM: {;
-			ExportVar(package_name.c_str(), "item_id", extra_data);
-			ExportVar(package_name.c_str(), "text_file", data);
-
-			if (extra_pointers && extra_pointers->size() == 7) {
-				ExportVar(package_name.c_str(), "book_text", std::any_cast<std::string>(extra_pointers->at(0)).c_str());
-				ExportVar(package_name.c_str(), "can_cast", std::any_cast<int8>(extra_pointers->at(1)));
-				ExportVar(package_name.c_str(), "can_scribe", std::any_cast<int8>(extra_pointers->at(2)));
-				ExportVar(package_name.c_str(), "slot_id", std::any_cast<int16>(extra_pointers->at(3)));
-				ExportVar(package_name.c_str(), "target_id", std::any_cast<int>(extra_pointers->at(4)));
-				ExportVar(package_name.c_str(), "type", std::any_cast<uint8>(extra_pointers->at(5)));
-				ExportVar(
-					package_name.c_str(),
-					"item",
-					"QuestItem",
-					std::any_cast<EQ::ItemInstance*>(extra_pointers->at(6))
-				);
-			}
-
-			break;
-		}
-
 		default: {
 			break;
 		}
@@ -2666,124 +2614,4 @@ int PerlembParser::EventGlobalBot(
 	);
 }
 
-void PerlembParser::LoadMercScript(std::string filename)
-{
-	if (!perl || merc_quest_status_ != questUnloaded) {
-		return;
-	}
-
-	try {
-		perl->eval_file("qst_merc", filename.c_str());
-	} catch (std::string e) {
-		AddError(
-			fmt::format(
-				"Error Compiling Merc Quest File [{}] Error [{}]",
-				filename,
-				e
-			)
-		);
-
-		merc_quest_status_ = questFailedToLoad;
-		return;
-	}
-
-	merc_quest_status_ = questLoaded;
-}
-
-void PerlembParser::LoadGlobalMercScript(std::string filename)
-{
-	if (!perl || global_merc_quest_status_ != questUnloaded) {
-		return;
-	}
-
-	try {
-		perl->eval_file("qst_global_merc", filename.c_str());
-	} catch (std::string e) {
-		AddError(
-			fmt::format(
-				"Error Compiling Global Merc Quest File [{}] Error [{}]",
-				filename,
-				e
-			)
-		);
-
-		global_merc_quest_status_ = questFailedToLoad;
-		return;
-	}
-
-	global_merc_quest_status_ = questLoaded;
-}
-
-bool PerlembParser::MercHasQuestSub(QuestEventID event_id)
-{
-	if (
-		!perl ||
-		merc_quest_status_ != questLoaded ||
-		event_id >= _LargestEventID
-	) {
-		return false;
-	}
-
-	return perl->SubExists("qst_merc", QuestEventSubroutines[event_id]);
-}
-
-bool PerlembParser::GlobalMercHasQuestSub(QuestEventID event_id)
-{
-	if (
-		!perl ||
-		global_merc_quest_status_ != questLoaded ||
-		event_id >= _LargestEventID
-		) {
-		return false;
-	}
-
-	return (perl->SubExists("qst_global_merc", QuestEventSubroutines[event_id]));
-}
-
-int PerlembParser::EventMerc(
-	QuestEventID event_id,
-	Merc* merc,
-	Mob* mob,
-	std::string data,
-	uint32 extra_data,
-	std::vector<std::any>* extra_pointers
-)
-{
-	return EventCommon(
-		event_id,
-		0,
-		data.c_str(),
-		merc,
-		nullptr,
-		nullptr,
-		mob,
-		extra_data,
-		false,
-		extra_pointers
-	);
-}
-
-int PerlembParser::EventGlobalMerc(
-	QuestEventID event_id,
-	Merc* merc,
-	Mob* mob,
-	std::string data,
-	uint32 extra_data,
-	std::vector<std::any>* extra_pointers
-)
-{
-	return EventCommon(
-		event_id,
-		0,
-		data.c_str(),
-		merc,
-		nullptr,
-		nullptr,
-		mob,
-		extra_data,
-		true,
-		extra_pointers
-	);
-}
-
 #endif

zone/embparser.h

@@ -118,24 +118,6 @@ public:
 		std::vector<std::any>* extra_pointers
 	);
 
-	virtual int EventMerc(
-		QuestEventID event_id,
-		Merc* merc,
-		Mob* init,
-		std::string data,
-		uint32 extra_data,
-		std::vector<std::any>* extra_pointers
-	);
-
-	virtual int EventGlobalMerc(
-		QuestEventID event_id,
-		Merc* merc,
-		Mob* init,
-		std::string data,
-		uint32 extra_data,
-		std::vector<std::any>* extra_pointers
-	);
-
 	virtual bool HasQuestSub(uint32 npc_id, QuestEventID event_id);
 	virtual bool HasGlobalQuestSub(QuestEventID event_id);
 	virtual bool PlayerHasQuestSub(QuestEventID event_id);
@@ -144,8 +126,6 @@ public:
 	virtual bool ItemHasQuestSub(EQ::ItemInstance* inst, QuestEventID event_id);
 	virtual bool BotHasQuestSub(QuestEventID event_id);
 	virtual bool GlobalBotHasQuestSub(QuestEventID event_id);
-	virtual bool MercHasQuestSub(QuestEventID event_id);
-	virtual bool GlobalMercHasQuestSub(QuestEventID event_id);
 
 	virtual void LoadNPCScript(std::string filename, int npc_id);
 	virtual void LoadGlobalNPCScript(std::string filename);
@@ -155,8 +135,6 @@ public:
 	virtual void LoadSpellScript(std::string filename, uint32 spell_id);
 	virtual void LoadBotScript(std::string filename);
 	virtual void LoadGlobalBotScript(std::string filename);
-	virtual void LoadMercScript(std::string filename);
-	virtual void LoadGlobalMercScript(std::string filename);
 
 	virtual void AddVar(std::string name, std::string val);
 	virtual std::string GetVar(std::string name);
@@ -204,8 +182,6 @@ private:
 		bool& is_global_player_quest,
 		bool& is_bot_quest,
 		bool& is_global_bot_quest,
-		bool& is_merc_quest,
-		bool& is_global_merc_quest,
 		bool& is_global_npc_quest,
 		bool& is_item_quest,
 		bool& is_spell_quest,
@@ -221,8 +197,6 @@ private:
 		bool& is_global_player_quest,
 		bool& is_bot_quest,
 		bool& is_global_bot_quest,
-		bool& is_merc_quest,
-		bool& is_global_merc_quest,
 		bool& is_global_npc_quest,
 		bool& is_item_quest,
 		bool& is_spell_quest,
@@ -242,8 +216,6 @@ private:
 		bool is_global_player_quest,
 		bool is_bot_quest,
 		bool is_global_bot_quest,
-		bool is_merc_quest,
-		bool is_global_merc_quest,
 		bool is_global_npc_quest,
 		bool is_item_quest,
 		bool is_spell_quest,
@@ -258,8 +230,6 @@ private:
 		bool is_global_player_quest,
 		bool is_bot_quest,
 		bool is_global_bot_quest,
-		bool is_merc_quest,
-		bool is_global_merc_quest,
 		bool is_global_npc_quest,
 		bool is_item_quest,
 		bool is_spell_quest,
@@ -293,8 +263,6 @@ private:
 	PerlQuestStatus global_player_quest_status_;
 	PerlQuestStatus bot_quest_status_;
 	PerlQuestStatus global_bot_quest_status_;
-	PerlQuestStatus merc_quest_status_;
-	PerlQuestStatus global_merc_quest_status_;
 
 	SV* _empty_sv;
 

zone/embparser_api.cpp

@@ -5978,16 +5978,6 @@ bool Perl__aretaskscompleted(perl::array task_ids)
 	return quest_manager.aretaskscompleted(v);
 }
 
-void Perl__SpawnCircle(uint32 npc_id, float x, float y, float z, float heading, float radius, uint32 points)
-{
-	quest_manager.SpawnCircle(npc_id, glm::vec4(x, y, z, heading), radius, points);
-}
-
-void Perl__SpawnGrid(uint32 npc_id, float x, float y, float z, float heading, float spacing, uint32 spawn_count)
-{
-	quest_manager.SpawnGrid(npc_id, glm::vec4(x, y, z, heading), spacing, spawn_count);
-}
-
 void perl_register_quest()
 {
 	perl::interpreter perl(PERL_GET_THX);
@@ -6297,8 +6287,6 @@ void perl_register_quest()
 	package.add("SendMail", &Perl__SendMail);
 	package.add("SetAutoLoginCharacterNameByAccountID", &Perl__SetAutoLoginCharacterNameByAccountID);
 	package.add("SetRunning", &Perl__SetRunning);
-	package.add("SpawnCircle", &Perl__SpawnCircle);
-	package.add("SpawnGrid", &Perl__SpawnGrid);
 	package.add("activespeakactivity", &Perl__activespeakactivity);
 	package.add("activespeaktask", &Perl__activespeaktask);
 	package.add("activetasksinset", &Perl__activetasksinset);

zone/embperl.h

@@ -21,8 +21,6 @@ Eglin
 #include <perlbind/perlbind.h>
 namespace perl = perlbind;
 
-#undef connect
-#undef bind
 #undef Null
 
 #ifdef WIN32

zone/entity.cpp

@@ -776,10 +776,6 @@ void EntityList::AddMerc(Merc *merc, bool SendSpawnPacket, bool dontqueue)
 
 		merc_list.emplace(std::pair<uint16, Merc *>(merc->GetID(), merc));
 		mob_list.emplace(std::pair<uint16, Mob *>(merc->GetID(), merc));
-
-		if (parse->MercHasQuestSub(EVENT_SPAWN)) {
-			parse->EventMerc(EVENT_SPAWN, merc, nullptr, "", 0);
-		}
 	}
 }
 
@@ -2945,22 +2941,8 @@ void EntityList::RemoveAuraFromMobs(Mob *aura)
 // entity list (zone wide)
 void EntityList::ScanCloseMobs(Mob *scanning_mob)
 {
-	if (!scanning_mob) {
-		return;
-	}
-
-	if (scanning_mob->GetID() <= 0) {
-		return;
-	}
-
 	float scan_range = RuleI(Range, MobCloseScanDistance) * 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.
-	if (scanning_mob->m_close_mobs.bucket_count() < mob_list.size()) {
-		scanning_mob->m_close_mobs.reserve(mob_list.size());
-	}
-
 	scanning_mob->m_close_mobs.clear();
 
 	for (auto &e : mob_list) {
@@ -2971,17 +2953,28 @@ void EntityList::ScanCloseMobs(Mob *scanning_mob)
 
 		float distance = DistanceSquared(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
-			if (mob->m_close_mobs.find(scanning_mob->GetID()) == mob->m_close_mobs.end()) {
-				mob->m_close_mobs[scanning_mob->GetID()] = scanning_mob;
+			scanning_mob->m_close_mobs.emplace(std::pair<uint16, Mob *>(mob->GetID(), mob));
+
+			// add self to other mobs close list
+			if (scanning_mob->GetID() > 0) {
+				bool has_mob = false;
+
+				for (auto &cm: mob->m_close_mobs) {
+					if (scanning_mob->GetID() == cm.first) {
+						has_mob = true;
+						break;
+					}
+				}
+
+				if (!has_mob) {
+					mob->m_close_mobs.insert(std::pair<uint16, Mob *>(scanning_mob->GetID(), scanning_mob));
+				}
 			}
-			scanning_mob->m_close_mobs[mob->GetID()] = mob;
 		}
 	}
 
-	LogAIScanClose(
-		"[{}] Scanning close list > list_size [{}] moving [{}]",
+	LogAIScanCloseDetail(
+		"[{}] Scanning Close List | list_size [{}] moving [{}]",
 		scanning_mob->GetCleanName(),
 		scanning_mob->m_close_mobs.size(),
 		scanning_mob->IsMoving() ? "true" : "false"
@@ -5944,39 +5937,3 @@ void EntityList::DamageArea(
 		}
 	}
 }
-
-std::vector<NPC*> EntityList::GetNPCsByIDs(std::vector<uint32> npc_ids)
-{
-	std::vector<NPC*> v;
-
-	for (const auto& e : GetNPCList()) {
-		const auto& n = std::find(npc_ids.begin(), npc_ids.end(), e.second->GetNPCTypeID());
-		if (e.second) {
-			if (n != npc_ids.end()) {
-				continue;
-			}
-
-			v.emplace_back(e.second);
-		}
-	}
-
-	return v;
-}
-
-std::vector<NPC*> EntityList::GetExcludedNPCsByIDs(std::vector<uint32> npc_ids)
-{
-	std::vector<NPC*> v;
-
-	for (const auto& e : GetNPCList()) {
-		const auto& n = std::find(npc_ids.begin(), npc_ids.end(), e.second->GetNPCTypeID());
-		if (e.second) {
-			if (n == npc_ids.end()) {
-				continue;
-			}
-
-			v.emplace_back(e.second);
-		}
-	}
-
-	return v;
-}

zone/entity.h

@@ -560,9 +560,6 @@ public:
 
 	std::unordered_map<uint16, Mob *> &GetCloseMobList(Mob *mob, float distance = 0.0f);
 
-	std::vector<NPC*> GetNPCsByIDs(std::vector<uint32> npc_ids);
-	std::vector<NPC*> GetExcludedNPCsByIDs(std::vector<uint32> npc_ids);
-
 	void	DepopAll(int NPCTypeID, bool StartSpawnTimer = true);
 
 	uint16 GetFreeID();

zone/event_codes.h

@@ -144,7 +144,6 @@ typedef enum {
 	EVENT_ENTITY_VARIABLE_UPDATE,
 	EVENT_AA_LOSS,
 	EVENT_SPELL_BLOCKED,
-	EVENT_READ_ITEM,
 
 	// Add new events before these or Lua crashes
 	EVENT_SPELL_EFFECT_BOT,

zone/gm_commands/set/motd.cpp

@@ -17,7 +17,7 @@ void SetMOTD(Client *c, const Seperator *sep)
 
 	auto m = (ServerMotd_Struct *) pack->pBuffer;
 	strn0cpy(m->myname, c->GetName(), sizeof(m->myname));
-	strn0cpy(m->motd, !message.empty() ? message.c_str() : "", sizeof(m->motd));
+	strn0cpy(m->motd, message.c_str(), sizeof(m->motd));
 
 	worldserver.SendPacket(pack);
 	safe_delete(pack);

zone/groups.cpp

@@ -2117,20 +2117,15 @@ void Group::UnDelegateMarkNPC(const char *OldNPCMarkerName)
 
 void Group::SaveGroupLeaderAA()
 {
-	const uint32 group_id = GetID();
+    // Stores the Group Leaders Leadership AA data from the Player Profile as a blob in the group_leaders table.
+    // This is done so that group members not in the same zone as the Leader still have access to this information.
 
-	if (!group_id) {
-		return;
-	}
+    std::string aa((char *) &LeaderAbilities, sizeof(GroupLeadershipAA_Struct));
+    auto        results = GroupLeadersRepository::UpdateLeadershipAA(database, aa, GetID());
 
-	// Stores the Group Leaders Leadership AA data from the Player Profile as a blob in the group_leaders table.
-	// This is done so that group members not in the same zone as the Leader still have access to this information.
-
-	std::string aa((char*) &LeaderAbilities, sizeof(GroupLeadershipAA_Struct));
-
-	if (!GroupLeadersRepository::UpdateLeadershipAA(database, aa, group_id)) {
-		LogError("Unable to store GroupLeadershipAA for group_id: [{}]", group_id);
-	}
+	if (!results) {
+        LogError("Unable to store GroupLeadershipAA for group_id: [{}]", GetID());
+    }
 }
 
 void Group::UnMarkNPC(uint16 ID)

zone/lua_database.cpp

@@ -1,214 +0,0 @@
-#ifdef LUA_EQEMU
-
-#include "lua_database.h"
-#include "zonedb.h"
-#include <luabind/luabind.hpp>
-#include <luabind/adopt_policy.hpp>
-
-// Luabind adopts the PreparedStmt wrapper object allocated with new and deletes it via GC
-// Lua GC is non-deterministic so handles should be closed explicitly to free db resources
-// Script errors/exceptions will hold resources until GC deletes the wrapper object
-
-Lua_MySQLPreparedStmt* Lua_Database::Prepare(lua_State* L, std::string query)
-{
-	return m_db ? new Lua_MySQLPreparedStmt(L, m_db->Prepare(std::move(query))) : nullptr;
-}
-
-void Lua_Database::Close()
-{
-	m_db.reset();
-}
-
-// ---------------------------------------------------------------------------
-
-void Lua_MySQLPreparedStmt::Close()
-{
-	m_stmt.reset();
-}
-
-void Lua_MySQLPreparedStmt::Execute(lua_State* L)
-{
-	if (m_stmt)
-	{
-		m_res = m_stmt->Execute();
-	}
-}
-
-void Lua_MySQLPreparedStmt::Execute(lua_State* L, luabind::object args)
-{
-	if (m_stmt)
-	{
-		std::vector<mysql::PreparedStmt::param_t> inputs;
-
-		// iterate table until nil like ipairs to guarantee traversal order
-		for (int i = 1, type; (type = luabind::type(args[i])) != LUA_TNIL; ++i)
-		{
-			switch (type)
-			{
-			case LUA_TBOOLEAN:
-				inputs.emplace_back(luabind::object_cast<bool>(args[i]));
-				break;
-			case LUA_TNUMBER: // all numbers are doubles in lua before 5.3
-				inputs.emplace_back(luabind::object_cast<lua_Number>(args[i]));
-				break;
-			case LUA_TSTRING:
-				inputs.emplace_back(luabind::object_cast<const char*>(args[i]));
-				break;
-			case LUA_TTABLE: // let tables substitute for null since nils can't exist
-				inputs.emplace_back(nullptr);
-				break;
-			default:
-				break;
-			}
-		}
-
-		m_res = m_stmt->Execute(inputs);
-	}
-}
-
-void Lua_MySQLPreparedStmt::SetOptions(luabind::object table)
-{
-	if (m_stmt)
-	{
-		mysql::StmtOptions opts = m_stmt->GetOptions();
-		if (luabind::type(table["buffer_results"]) == LUA_TBOOLEAN)
-		{
-			opts.buffer_results = luabind::object_cast<bool>(table["buffer_results"]);
-		}
-		if (luabind::type(table["use_max_length"]) == LUA_TBOOLEAN)
-		{
-			opts.use_max_length = luabind::object_cast<bool>(table["use_max_length"]);
-		}
-		m_stmt->SetOptions(opts);
-	}
-}
-
-static void PushValue(lua_State* L, const mysql::StmtColumn& col)
-{
-	if (col.IsNull())
-	{
-		lua_pushnil(L); // clear entry in cache from any previous row
-		return;
-	}
-
-	// 64-bit ints are pushed as strings since lua 5.1 only has 53-bit precision
-	switch (col.Type())
-	{
-	case MYSQL_TYPE_TINY:
-	case MYSQL_TYPE_SHORT:
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-	case MYSQL_TYPE_FLOAT:
-	case MYSQL_TYPE_DOUBLE:
-		lua_pushnumber(L, col.Get<lua_Number>().value());
-		break;
-	case MYSQL_TYPE_LONGLONG:
-	case MYSQL_TYPE_BIT:
-	case MYSQL_TYPE_TIME:
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP:
-		{
-			std::string str = col.GetStr().value();
-			lua_pushlstring(L, str.data(), str.size());
-		}
-		break;
-	default: // string types, push raw buffer to avoid copy
-		{
-			std::string_view str = col.GetStrView().value();
-			lua_pushlstring(L, str.data(), str.size());
-		}
-		break;
-	}
-}
-
-luabind::object Lua_MySQLPreparedStmt::FetchArray(lua_State* L)
-{
-	auto row = m_stmt ? m_stmt->Fetch() : mysql::StmtRow();
-	if (!row)
-	{
-		return luabind::object();
-	}
-
-	// perf: bypass luabind operator[]
-	m_row_array.push(L);
-	for (const mysql::StmtColumn& col : row)
-	{
-		PushValue(L, col);
-		lua_rawseti(L, -2, col.Index() + 1);
-	}
-	lua_pop(L, 1);
-
-	return m_row_array;
-}
-
-luabind::object Lua_MySQLPreparedStmt::FetchHash(lua_State* L)
-{
-	auto row = m_stmt ? m_stmt->Fetch() : mysql::StmtRow();
-	if (!row)
-	{
-		return luabind::object();
-	}
-
-	// perf: bypass luabind operator[]
-	m_row_hash.push(L);
-	for (const mysql::StmtColumn& col : row)
-	{
-		PushValue(L, col);
-		lua_setfield(L, -2, col.Name().c_str());
-	}
-	lua_pop(L, 1);
-
-	return m_row_hash;
-}
-
-int Lua_MySQLPreparedStmt::ColumnCount()
-{
-	return m_res.ColumnCount();
-}
-
-uint64_t Lua_MySQLPreparedStmt::LastInsertID()
-{
-	return m_res.LastInsertID();
-}
-
-uint64_t Lua_MySQLPreparedStmt::RowCount()
-{
-	return m_res.RowCount();
-}
-
-uint64_t Lua_MySQLPreparedStmt::RowsAffected()
-{
-	return m_res.RowsAffected();
-}
-
-luabind::scope lua_register_database()
-{
-	return luabind::class_<Lua_Database>("Database")
-		.enum_("constants")
-		[(
-			luabind::value("Default", static_cast<int>(QuestDB::Connection::Default)),
-			luabind::value("Content", static_cast<int>(QuestDB::Connection::Content))
-		)]
-		.def(luabind::constructor<>())
-		.def(luabind::constructor<QuestDB::Connection>())
-		.def(luabind::constructor<QuestDB::Connection, bool>())
-		.def(luabind::constructor<const char*, const char*, const char*, const char*, uint32_t>())
-		.def("close", &Lua_Database::Close)
-		.def("prepare", &Lua_Database::Prepare, luabind::adopt(luabind::result)),
-
-	luabind::class_<Lua_MySQLPreparedStmt>("MySQLPreparedStmt")
-		.def("close", &Lua_MySQLPreparedStmt::Close)
-		.def("execute", static_cast<void(Lua_MySQLPreparedStmt::*)(lua_State*)>(&Lua_MySQLPreparedStmt::Execute))
-		.def("execute", static_cast<void(Lua_MySQLPreparedStmt::*)(lua_State*, luabind::object)>(&Lua_MySQLPreparedStmt::Execute))
-		.def("fetch", &Lua_MySQLPreparedStmt::FetchArray)
-		.def("fetch_array", &Lua_MySQLPreparedStmt::FetchArray)
-		.def("fetch_hash", &Lua_MySQLPreparedStmt::FetchHash)
-		.def("insert_id", &Lua_MySQLPreparedStmt::LastInsertID)
-		.def("num_fields", &Lua_MySQLPreparedStmt::ColumnCount)
-		.def("num_rows", &Lua_MySQLPreparedStmt::RowCount)
-		.def("rows_affected", &Lua_MySQLPreparedStmt::RowsAffected)
-		.def("set_options", &Lua_MySQLPreparedStmt::SetOptions);
-}
-
-#endif // LUA_EQEMU

zone/lua_database.h

@@ -1,51 +0,0 @@
-#pragma once
-
-#ifdef LUA_EQEMU
-
-#include "quest_db.h"
-#include "../common/mysql_stmt.h"
-#include <luabind/object.hpp>
-
-namespace luabind { struct scope; }
-luabind::scope lua_register_database();
-
-class Lua_MySQLPreparedStmt;
-
-class Lua_Database : public QuestDB
-{
-public:
-	using QuestDB::QuestDB;
-
-	void Close();
-	Lua_MySQLPreparedStmt* Prepare(lua_State*, std::string query);
-};
-
-class Lua_MySQLPreparedStmt
-{
-public:
-	Lua_MySQLPreparedStmt(lua_State* L, mysql::PreparedStmt&& stmt)
-		: m_stmt(std::make_unique<mysql::PreparedStmt>(std::move(stmt)))
-		, m_row_array(luabind::newtable(L))
-		, m_row_hash(luabind::newtable(L)) {}
-
-	void Close();
-	void Execute(lua_State*);
-	void Execute(lua_State*, luabind::object args);
-	void SetOptions(luabind::object table_opts);
-	luabind::object FetchArray(lua_State*);
-	luabind::object FetchHash(lua_State*);
-
-	// StmtResult functions accessible through this class to simplify api
-	int ColumnCount();
-	uint64_t LastInsertID();
-	uint64_t RowCount();
-	uint64_t RowsAffected();
-
-private:
-	std::unique_ptr<mysql::PreparedStmt> m_stmt;
-	mysql::StmtResult m_res = {};
-	luabind::object m_row_array; // perf: table cache for fetches
-	luabind::object m_row_hash;
-};
-
-#endif // LUA_EQEMU

zone/lua_entity.cpp

@@ -12,7 +12,6 @@
 #include "lua_door.h"
 
 #include "lua_bot.h"
-#include "lua_merc.h"
 
 bool Lua_Entity::IsClient() {
 	Lua_Safe_Call_Bool();
@@ -141,12 +140,6 @@ Lua_Bot Lua_Entity::CastToBot() {
 	return Lua_Bot(b);
 }
 
-Lua_Merc Lua_Entity::CastToMerc() {
-	void *d = GetLuaPtrData();
-	Merc *m = reinterpret_cast<Merc*>(d);
-	return Lua_Merc(m);
-}
-
 luabind::scope lua_register_entity() {
 	return luabind::class_<Lua_Entity>("Entity")
 	.def(luabind::constructor<>())
@@ -156,7 +149,6 @@ luabind::scope lua_register_entity() {
 	.def("CastToClient", &Lua_Entity::CastToClient)
 	.def("CastToCorpse", &Lua_Entity::CastToCorpse)
 	.def("CastToDoor", &Lua_Entity::CastToDoor)
-	.def("CastToMerc", &Lua_Entity::CastToMerc)
 	.def("CastToMob", &Lua_Entity::CastToMob)
 	.def("CastToNPC", &Lua_Entity::CastToNPC)
 	.def("CastToObject", &Lua_Entity::CastToObject)

zone/lua_entity.h

@@ -7,7 +7,6 @@
 class Entity;
 class Lua_Client;
 class Lua_Bot;
-class Lua_Merc;
 class Lua_NPC;
 class Lua_Mob;
 struct Lua_HateList;
@@ -60,7 +59,6 @@ public:
 	Lua_Object CastToObject();
 	Lua_Door CastToDoor();
 	Lua_Bot CastToBot();
-	Lua_Merc CastToMerc();
 };
 
 #endif

zone/lua_entity_list.cpp

@@ -16,7 +16,6 @@
 #include "lua_spawn.h"
 
 #include "lua_bot.h"
-#include "lua_merc.h"
 
 struct Lua_Mob_List {
 	std::vector<Lua_Mob> entries;
@@ -765,66 +764,6 @@ void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_
 	self->MassGroupBuff(caster, center, spell_id, affect_caster);
 }
 
-Lua_NPC_List Lua_EntityList::GetNPCsByExcludedIDs(luabind::adl::object table)
-{
-	Lua_Safe_Call_Class(Lua_NPC_List);
-	Lua_NPC_List ret;
-
-	if (luabind::type(table) != LUA_TTABLE) {
-		return ret;
-	}
-
-	if (d_) {
-		auto self = reinterpret_cast<NativeType*>(d_);
-
-		std::vector<uint32> ids;
-
-		int index = 1;
-		while (luabind::type(table[index]) != LUA_TNIL) {
-			ids.emplace_back(luabind::object_cast<uint32>(table[index]));
-			index++;
-		}
-
-		const auto& l = self->GetExcludedNPCsByIDs(ids);
-
-		for (const auto& e : l) {
-			ret.entries.emplace_back(Lua_NPC(e));
-		}
-	}
-
-	return ret;
-}
-
-Lua_NPC_List Lua_EntityList::GetNPCsByIDs(luabind::adl::object table)
-{
-	Lua_Safe_Call_Class(Lua_NPC_List);
-	Lua_NPC_List ret;
-
-	if (luabind::type(table) != LUA_TTABLE) {
-		return ret;
-	}
-
-	if (d_) {
-		auto self = reinterpret_cast<NativeType*>(d_);
-
-		std::vector<uint32> ids;
-
-		int index = 1;
-		while (luabind::type(table[index]) != LUA_TNIL) {
-			ids.emplace_back(luabind::object_cast<uint32>(table[index]));
-			index++;
-		}
-
-		const auto& l = self->GetNPCsByIDs(ids);
-
-		for (const auto& e : l) {
-			ret.entries.emplace_back(Lua_NPC(e));
-		}
-	}
-
-	return ret;
-}
-
 luabind::scope lua_register_entity_list() {
 	return luabind::class_<Lua_EntityList>("EntityList")
 	.def(luabind::constructor<>())
@@ -890,8 +829,6 @@ luabind::scope lua_register_entity_list() {
 	.def("GetNPCByNPCTypeID", (Lua_NPC(Lua_EntityList::*)(int))&Lua_EntityList::GetNPCByNPCTypeID)
 	.def("GetNPCBySpawnID", (Lua_NPC(Lua_EntityList::*)(int))&Lua_EntityList::GetNPCBySpawnID)
 	.def("GetNPCList", (Lua_NPC_List(Lua_EntityList::*)(void))&Lua_EntityList::GetNPCList)
-	.def("GetNPCsByExcludedIDs", (Lua_NPC_List(Lua_EntityList::*)(luabind::adl::object))&Lua_EntityList::GetNPCsByExcludedIDs)
-	.def("GetNPCsByIDs", (Lua_NPC_List(Lua_EntityList::*)(luabind::adl::object))&Lua_EntityList::GetNPCsByIDs)
 	.def("GetObjectByDBID", (Lua_Object(Lua_EntityList::*)(uint32))&Lua_EntityList::GetObjectByDBID)
 	.def("GetObjectByID", (Lua_Object(Lua_EntityList::*)(int))&Lua_EntityList::GetObjectByID)
 	.def("GetObjectList", (Lua_Object_List(Lua_EntityList::*)(void))&Lua_EntityList::GetObjectList)