Add slot ID conversions

CHANGELOG.md

@@ -1,37 +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

common/database/database_update_manifest.cpp

@@ -5770,6 +5770,80 @@ MODIFY COLUMN `exp_modifier` float NOT NULL DEFAULT 1.0 AFTER `aa_modifier`;
 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);
+)"
+	},
+	ManifestEntry{
+		.version = 9286,
+		.description = "2024_10_24_sharedbank_guid_primary_key.sql",
+		.check = "SHOW COLUMN FROM `sharedbank` LIKE 'guid'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `sharedbank`
+CHANGE COLUMN `acctid` `account_id` int(11) UNSIGNED NOT NULL DEFAULT 0 FIRST,
+CHANGE COLUMN `slotid` `slot_id` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `account_id`,
+CHANGE COLUMN `itemid` `item_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `slot_id`,
+CHANGE COLUMN `augslot1` `augment_one` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `charges`,
+CHANGE COLUMN `augslot2` `augment_two` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_one`,
+CHANGE COLUMN `augslot3` `augment_three` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_two`,
+CHANGE COLUMN `augslot4` `augment_four` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_three`,
+CHANGE COLUMN `augslot5` `augment_five` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_four`,
+CHANGE COLUMN `augslot6` `augment_six` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_five`,
+MODIFY COLUMN `charges` smallint(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `item_id`,
+ADD COLUMN `color` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `charges`,
+ADD COLUMN `ornament_icon` int(11) UNSIGNED NOT NULL AFTER `custom_data`,
+ADD COLUMN `ornament_idfile` int(11) UNSIGNED NOT NULL AFTER `ornament_icon`,
+ADD COLUMN `ornament_hero_model` int(11) NOT NULL AFTER `ornament_idfile`,
+ADD COLUMN `guid` bigint(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `ornament_hero_model`,
+ADD PRIMARY KEY (`account_id`, `slot_id`);
+)"
+	},
+	ManifestEntry{
+		.version = 9287,
+		.description = "2024_10_24_inventory_changes.sql",
+		.check = "SHOW COLUMN FROM `inventory` LIKE 'charid'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `inventory`
+CHANGE COLUMN `charid` `character_id` int(11) UNSIGNED NOT NULL DEFAULT 0 FIRST,
+CHANGE COLUMN `slotid` `slot_id` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `character_id`,
+CHANGE COLUMN `itemid` `item_id` int(11) UNSIGNED NULL DEFAULT 0 AFTER `slot_id`,
+CHANGE COLUMN `augslot1` `augment_one` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `color`,
+CHANGE COLUMN `augslot2` `augment_two` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_one`,
+CHANGE COLUMN `augslot3` `augment_three` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_two`,
+CHANGE COLUMN `augslot4` `augment_four` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_three`,
+CHANGE COLUMN `augslot5` `augment_five` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_four`,
+CHANGE COLUMN `augslot6` `augment_six` mediumint(7) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_five`,
+CHANGE COLUMN `ornamenticon` `ornament_icon` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `custom_data`,
+CHANGE COLUMN `ornamentidfile` `ornament_idfile` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `ornament_icon`,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`character_id`, `slot_id`) USING BTREE;
+
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 251) + 4010) WHERE `slot_id` BETWEEN 251 AND 260; -- Bag 1
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 261) + 4210) WHERE `slot_id` BETWEEN 261 AND 270; -- Bag 2
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 271) + 4410) WHERE `slot_id` BETWEEN 271 AND 280; -- Bag 3
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 281) + 4610) WHERE `slot_id` BETWEEN 281 AND 290; -- Bag 4
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 291) + 4810) WHERE `slot_id` BETWEEN 291 AND 300; -- Bag 5
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 301) + 5010) WHERE `slot_id` BETWEEN 301 AND 310; -- Bag 6
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 311) + 5210) WHERE `slot_id` BETWEEN 311 AND 320; -- Bag 7
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 321) + 5410) WHERE `slot_id` BETWEEN 321 AND 330; -- Bag 8
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 331) + 5610) WHERE `slot_id` BETWEEN 331 AND 340; -- Bag 9
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 341) + 5810) WHERE `slot_id` BETWEEN 341 AND 350; -- Bag 10
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 351) + 6010) WHERE `slot_id` BETWEEN 351 AND 360; -- Cursor Bag
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2031) + 6210) WHERE `slot_id` BETWEEN 2031 AND 2270; -- Bank Bags
+UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2531) + 11010) WHERE `slot_id` BETWEEN 2531 AND 2550; -- Shared Bank Bags
+)"
+	},
+	ManifestEntry{
+		.version = 9288,
+		.description = "2024_10_24_merchantlist_temp_uncap.sql",
+		.check = "SHOW CREATE TABLE `merchantlist_temp`",
+		.condition = "contains",
+		.match = "`slot` tinyint(3)",
+		.sql = R"(
+ALTER TABLE `merchantlist_temp`
+MODIFY COLUMN `slot` int UNSIGNED NOT NULL DEFAULT 0 AFTER `npcid`;
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry

common/emu_constants.h

@@ -132,7 +132,7 @@ namespace EQ
 		using RoF2::invtype::KRONO_SIZE;
 		using RoF2::invtype::OTHER_SIZE;
 
-		using Titanium::invtype::TRADE_NPC_SIZE;
+		using RoF2::invtype::TRADE_NPC_SIZE;
 
 		using RoF2::invtype::TYPE_INVALID;
 		using RoF2::invtype::TYPE_BEGIN;
@@ -159,7 +159,7 @@ namespace EQ
 		using RoF2::invslot::SLOT_INVALID;
 		using RoF2::invslot::SLOT_BEGIN;
 
-		using Titanium::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE;
+		using RoF2::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE;
 
 		const int16 SLOT_AUGMENT_GENERIC_RETURN = 1001; // clients don't appear to use this method... (internal inventory return value)
 
@@ -179,28 +179,28 @@ namespace EQ
 		using RoF2::invslot::BONUS_STAT_END;
 		using RoF2::invslot::BONUS_SKILL_END;
 
-		using Titanium::invslot::BANK_BEGIN;
-		using SoF::invslot::BANK_END;
+		using RoF2::invslot::BANK_BEGIN;
+		using RoF2::invslot::BANK_END;
 
-		using Titanium::invslot::SHARED_BANK_BEGIN;
-		using Titanium::invslot::SHARED_BANK_END;
+		using RoF2::invslot::SHARED_BANK_BEGIN;
+		using RoF2::invslot::SHARED_BANK_END;
 
-		using Titanium::invslot::TRADE_BEGIN;
-		using Titanium::invslot::TRADE_END;
+		using RoF2::invslot::TRADE_BEGIN;
+		using RoF2::invslot::TRADE_END;
 
-		using Titanium::invslot::TRADE_NPC_END;
+		using RoF2::invslot::TRADE_NPC_END;
 
-		using Titanium::invslot::WORLD_BEGIN;
-		using Titanium::invslot::WORLD_END;
+		using RoF2::invslot::WORLD_BEGIN;
+		using RoF2::invslot::WORLD_END;
 
-		using Titanium::invslot::TRIBUTE_BEGIN;
-		using Titanium::invslot::TRIBUTE_END;
+		using RoF2::invslot::TRIBUTE_BEGIN;
+		using RoF2::invslot::TRIBUTE_END;
 
-		using Titanium::invslot::GUILD_TRIBUTE_BEGIN;
-		using Titanium::invslot::GUILD_TRIBUTE_END;
+		using RoF2::invslot::GUILD_TRIBUTE_BEGIN;
+		using RoF2::invslot::GUILD_TRIBUTE_END;
 
 		const int16 CORPSE_BEGIN = invslot::slotGeneral1;
-		const int16 CORPSE_END = CORPSE_BEGIN + invslot::slotCursor;
+		const int16 CORPSE_END   = CORPSE_BEGIN + invslot::slotCursor;
 
 		using RoF2::invslot::EQUIPMENT_BITMASK;
 		using RoF2::invslot::GENERAL_BITMASK;
@@ -214,38 +214,40 @@ namespace EQ
 	} // namespace invslot
 
 	namespace invbag {
-		using Titanium::invbag::SLOT_INVALID;
-		using Titanium::invbag::SLOT_BEGIN;
-		using Titanium::invbag::SLOT_END;
-		using Titanium::invbag::SLOT_COUNT;
+		using RoF2::invbag::SLOT_INVALID;
+		using RoF2::invbag::SLOT_BEGIN;
+		using RoF2::invbag::SLOT_END;
+		using RoF2::invbag::SLOT_COUNT;
 
-		using Titanium::invbag::GENERAL_BAGS_BEGIN;
+		using RoF2::invslot::WORLD_END;
+
+		const int16 GENERAL_BAGS_BEGIN = WORLD_END + 1;
 		const int16 GENERAL_BAGS_COUNT = invslot::GENERAL_COUNT * SLOT_COUNT;
-		const int16 GENERAL_BAGS_END = (GENERAL_BAGS_BEGIN + GENERAL_BAGS_COUNT) - 1;
+		const int16 GENERAL_BAGS_END   = (GENERAL_BAGS_BEGIN + GENERAL_BAGS_COUNT) - 1;
 
 		const int16 GENERAL_BAGS_8_COUNT = 8 * SLOT_COUNT;
-		const int16 GENERAL_BAGS_8_END = (GENERAL_BAGS_BEGIN + GENERAL_BAGS_8_COUNT) - 1;
+		const int16 GENERAL_BAGS_8_END   = (GENERAL_BAGS_BEGIN + GENERAL_BAGS_8_COUNT) - 1;
 
-		const int16 CURSOR_BAG_BEGIN = 351;
+		const int16 CURSOR_BAG_BEGIN = GENERAL_BAGS_END + 1;
 		const int16 CURSOR_BAG_COUNT = SLOT_COUNT;
-		const int16 CURSOR_BAG_END = (CURSOR_BAG_BEGIN + CURSOR_BAG_COUNT) - 1;
+		const int16 CURSOR_BAG_END   = (CURSOR_BAG_BEGIN + CURSOR_BAG_COUNT) - 1;
 
-		using Titanium::invbag::BANK_BAGS_BEGIN;
+		const int16 BANK_BAGS_BEGIN = CURSOR_BAG_END + 1;
 		const int16 BANK_BAGS_COUNT = (invtype::BANK_SIZE * SLOT_COUNT);
-		const int16 BANK_BAGS_END = (BANK_BAGS_BEGIN + BANK_BAGS_COUNT) - 1;
+		const int16 BANK_BAGS_END   = (BANK_BAGS_BEGIN + BANK_BAGS_COUNT) - 1;
 
 		const int16 BANK_BAGS_16_COUNT = 16 * SLOT_COUNT;
-		const int16 BANK_BAGS_16_END = (BANK_BAGS_BEGIN + BANK_BAGS_16_COUNT) - 1;
+		const int16 BANK_BAGS_16_END   = (BANK_BAGS_BEGIN + BANK_BAGS_16_COUNT) - 1;
 
-		using Titanium::invbag::SHARED_BANK_BAGS_BEGIN;
+		const int16 SHARED_BANK_BAGS_BEGIN = BANK_BAGS_END + 1;
 		const int16 SHARED_BANK_BAGS_COUNT = invtype::SHARED_BANK_SIZE * SLOT_COUNT;
-		const int16 SHARED_BANK_BAGS_END = (SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_COUNT) - 1;
+		const int16 SHARED_BANK_BAGS_END   = (SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_COUNT) - 1;
 
-		using Titanium::invbag::TRADE_BAGS_BEGIN;
+		const int16 TRADE_BAGS_BEGIN = SHARED_BANK_BAGS_END + 1;
 		const int16 TRADE_BAGS_COUNT = invtype::TRADE_SIZE * SLOT_COUNT;
-		const int16 TRADE_BAGS_END = (TRADE_BAGS_BEGIN + TRADE_BAGS_COUNT) - 1;
+		const int16 TRADE_BAGS_END   = (TRADE_BAGS_BEGIN + TRADE_BAGS_COUNT) - 1;
 
-		using Titanium::invbag::GetInvBagIndexName;
+		using RoF2::invbag::GetInvBagIndexName;
 
 	} // namespace invbag
 

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),

common/eq_packet_structs.h

@@ -4400,6 +4400,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 +6436,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();

common/inventory_profile.h

@@ -176,7 +176,6 @@ namespace EQ
 		// Locate an available inventory slot
 		int16 FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size = 0, bool is_arrow = false);
 		int16 FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start = invslot::GENERAL_BEGIN, uint8 bag_start = invbag::SLOT_BEGIN);
-		std::vector<int16> FindAllFreeSlotsThatFitItem(const EQ::ItemData *inst);
 		int16 FindFirstFreeSlotThatFitsItem(const EQ::ItemData *inst);
 
 		// Calculate slot_id for an item within a bag
@@ -199,12 +198,6 @@ namespace EQ
 
 		uint8 FindBrightestLightType();
 
-		void dumpEntireInventory();
-		void dumpWornItems();
-		void dumpInventory();
-		void dumpBankItems();
-		void dumpSharedBankItems();
-
 		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, const std::string& value);
 		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, int value);
 		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, float value);
@@ -217,8 +210,6 @@ namespace EQ
 		///////////////////////////////
 
 		int GetSlotByItemInstCollection(const std::map<int16, ItemInstance*> &collection, ItemInstance *inst);
-		void dumpItemCollection(const std::map<int16, ItemInstance*> &collection);
-		void dumpBagContents(ItemInstance *inst, std::map<int16, ItemInstance*>::const_iterator *it);
 
 		// Retrieves item within an inventory bucket
 		ItemInstance* _GetItem(const std::map<int16, ItemInstance*>& bucket, int16 slot_id) const;

common/mysql_stmt.cpp

@@ -414,12 +414,6 @@ static uint64_t MakeBits(std::span<const uint8_t> data)
 	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)
 {
@@ -428,14 +422,6 @@ static T FromString(std::string_view sv)
 		// 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)

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_limits.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ namespace RoF2
 
 		const bool AllowOverLevelEquipment = true;
 
-		const bool AllowEmptyBagInBag = true;
+		const bool AllowEmptyBagInBag    = true;
 		const bool AllowClickCastFromBag = true;
 
 	} /*inventory*/
@@ -77,38 +77,38 @@ namespace RoF2
 		} // namespace enum_
 		using namespace enum_;
 
-		const int16 POSSESSIONS_SIZE = 34;
-		const int16 BANK_SIZE = 24;
-		const int16 SHARED_BANK_SIZE = 2;
-		const int16 TRADE_SIZE = 8;
-		const int16 WORLD_SIZE = 10;
-		const int16 LIMBO_SIZE = 36;
-		const int16 TRIBUTE_SIZE = 5;
-		const int16 TROPHY_TRIBUTE_SIZE = 0;//unknown
-		const int16 GUILD_TRIBUTE_SIZE = 2;//unverified
-		const int16 MERCHANT_SIZE = 200;
-		const int16 DELETED_SIZE = 0;//unknown - "Recovery Tab"
-		const int16 CORPSE_SIZE = POSSESSIONS_SIZE;
-		const int16 BAZAAR_SIZE = 200;
-		const int16 INSPECT_SIZE = 23;
-		const int16 REAL_ESTATE_SIZE = 0;//unknown
-		const int16 VIEW_MOD_PC_SIZE = POSSESSIONS_SIZE;
-		const int16 VIEW_MOD_BANK_SIZE = BANK_SIZE;
+		const int16 POSSESSIONS_SIZE          = 34;
+		const int16 BANK_SIZE                 = 24;
+		const int16 SHARED_BANK_SIZE          = 2;
+		const int16 TRADE_SIZE                = 8;
+		const int16 WORLD_SIZE                = 10;
+		const int16 LIMBO_SIZE                = 36;
+		const int16 TRIBUTE_SIZE              = 5;
+		const int16 TROPHY_TRIBUTE_SIZE       = 0;//unknown
+		const int16 GUILD_TRIBUTE_SIZE        = 2;//unverified
+		const int16 MERCHANT_SIZE             = 500;
+		const int16 DELETED_SIZE              = 0;//unknown - "Recovery Tab"
+		const int16 CORPSE_SIZE               = POSSESSIONS_SIZE;
+		const int16 BAZAAR_SIZE               = 200;
+		const int16 INSPECT_SIZE              = 23;
+		const int16 REAL_ESTATE_SIZE          = 0;//unknown
+		const int16 VIEW_MOD_PC_SIZE          = POSSESSIONS_SIZE;
+		const int16 VIEW_MOD_BANK_SIZE        = BANK_SIZE;
 		const int16 VIEW_MOD_SHARED_BANK_SIZE = SHARED_BANK_SIZE;
-		const int16 VIEW_MOD_LIMBO_SIZE = LIMBO_SIZE;
-		const int16 ALT_STORAGE_SIZE = 0;//unknown - "Shroud Bank"
-		const int16 ARCHIVED_SIZE = 0;//unknown
-		const int16 MAIL_SIZE = 0;//unknown
+		const int16 VIEW_MOD_LIMBO_SIZE       = LIMBO_SIZE;
+		const int16 ALT_STORAGE_SIZE          = 0;//unknown - "Shroud Bank"
+		const int16 ARCHIVED_SIZE             = 0;//unknown
+		const int16 MAIL_SIZE                 = 0;//unknown
 		const int16 GUILD_TROPHY_TRIBUTE_SIZE = 0;//unknown
-		const int16 KRONO_SIZE = 0;//unknown
-		const int16 OTHER_SIZE = 0;//unknown
+		const int16 KRONO_SIZE                = 0;//unknown
+		const int16 OTHER_SIZE                = 0;//unknown
 
 		const int16 TRADE_NPC_SIZE = 4; // defined by implication
 
 		const int16 TYPE_INVALID = IINVALID;
-		const int16 TYPE_BEGIN = typePossessions;
-		const int16 TYPE_END = typeOther;
-		const int16 TYPE_COUNT = (TYPE_END - TYPE_BEGIN) + 1;
+		const int16 TYPE_BEGIN   = typePossessions;
+		const int16 TYPE_END     = typeOther;
+		const int16 TYPE_COUNT   = (TYPE_END - TYPE_BEGIN) + 1;
 
 		int16 GetInvTypeSize(int16 inv_type);
 		const char* GetInvTypeName(int16 inv_type);
@@ -162,33 +162,54 @@ namespace RoF2
 		} // namespace enum_
 		using namespace enum_;
 
-		const int16 SLOT_INVALID = IINVALID;
-		const int16 SLOT_BEGIN = INULL;
+		const int16 SLOT_TRADESKILL_EXPERIMENT_COMBINE = 1000;
+		const int16 SLOT_INVALID                       = IINVALID;
+		const int16 SLOT_BEGIN                         = INULL;
+
+		const int16 BANK_BEGIN = 2000;
+		const int16 BANK_END   = (BANK_BEGIN + invtype::BANK_SIZE) - 1;
+
+		const int16 SHARED_BANK_BEGIN = 2500;
+		const int16 SHARED_BANK_END   = (SHARED_BANK_BEGIN + invtype::SHARED_BANK_SIZE) - 1;
+
+		const int16 TRADE_BEGIN = 3000;
+		const int16 TRADE_END   = (TRADE_BEGIN + invtype::TRADE_SIZE) - 1;
+
+		const int16 TRADE_NPC_END = (TRADE_BEGIN + invtype::TRADE_NPC_SIZE) - 1; // defined by implication
+
+		const int16 WORLD_BEGIN = 4000;
+		const int16 WORLD_END   = (WORLD_BEGIN + invtype::WORLD_SIZE) - 1;
+
+		const int16 TRIBUTE_BEGIN = 400;
+		const int16 TRIBUTE_END   = (TRIBUTE_BEGIN + invtype::TRIBUTE_SIZE) - 1;
+
+		const int16 GUILD_TRIBUTE_BEGIN = 450;
+		const int16 GUILD_TRIBUTE_END   = (GUILD_TRIBUTE_BEGIN + invtype::GUILD_TRIBUTE_SIZE) - 1;
 
 		const int16 POSSESSIONS_BEGIN = slotCharm;
-		const int16 POSSESSIONS_END = slotCursor;
+		const int16 POSSESSIONS_END   = slotCursor;
 		const int16 POSSESSIONS_COUNT = (POSSESSIONS_END - POSSESSIONS_BEGIN) + 1;
 
 		const int16 EQUIPMENT_BEGIN = slotCharm;
-		const int16 EQUIPMENT_END = slotAmmo;
+		const int16 EQUIPMENT_END   = slotAmmo;
 		const int16 EQUIPMENT_COUNT = (EQUIPMENT_END - EQUIPMENT_BEGIN) + 1;
 
 		const int16 GENERAL_BEGIN = slotGeneral1;
-		const int16 GENERAL_END = slotGeneral10;
+		const int16 GENERAL_END   = slotGeneral10;
 		const int16 GENERAL_COUNT = (GENERAL_END - GENERAL_BEGIN) + 1;
 
-		const int16 BONUS_BEGIN = invslot::slotCharm;
-		const int16 BONUS_STAT_END = invslot::slotPowerSource;
+		const int16 BONUS_BEGIN     = invslot::slotCharm;
+		const int16 BONUS_STAT_END  = invslot::slotPowerSource;
 		const int16 BONUS_SKILL_END = invslot::slotAmmo;
 
 		const int16 CORPSE_BEGIN = invslot::slotGeneral1;
-		const int16 CORPSE_END = invslot::slotGeneral1 + invslot::slotCursor;
+		const int16 CORPSE_END   = invslot::slotGeneral1 + invslot::slotCursor;
 
-		const uint64 EQUIPMENT_BITMASK = 0x00000000007FFFFF;
-		const uint64 GENERAL_BITMASK = 0x00000001FF800000;
-		const uint64 CURSOR_BITMASK = 0x0000000200000000;
+		const uint64 EQUIPMENT_BITMASK   = 0x00000000007FFFFF;
+		const uint64 GENERAL_BITMASK     = 0x00000001FF800000;
+		const uint64 CURSOR_BITMASK      = 0x0000000200000000;
 		const uint64 POSSESSIONS_BITMASK = (EQUIPMENT_BITMASK | GENERAL_BITMASK | CURSOR_BITMASK); // based on 34-slot count (RoF+)
-		const uint64 CORPSE_BITMASK = (GENERAL_BITMASK | CURSOR_BITMASK | (EQUIPMENT_BITMASK << 34)); // based on 34-slot count (RoF+)
+		const uint64 CORPSE_BITMASK      = (GENERAL_BITMASK | CURSOR_BITMASK | (EQUIPMENT_BITMASK << 34)); // based on 34-slot count (RoF+)
 
 
 		const char* GetInvPossessionsSlotName(int16 inv_slot);
@@ -199,10 +220,21 @@ namespace RoF2
 	namespace invbag {
 		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::RoF2; }
 
-		const int16 SLOT_INVALID = IINVALID;
-		const int16 SLOT_BEGIN = INULL;
-		const int16 SLOT_END = 9; //254;
-		const int16 SLOT_COUNT = 10; //255; // server Size will be 255..unsure what actual client is (test)
+		const int16 SLOT_TRADESKILL_EXPERIMENT_COMBINE = 1000;
+		const int16 SLOT_INVALID                       = IINVALID;
+		const int16 SLOT_BEGIN                         = INULL;
+		const int16 SLOT_COUNT                         = 200;
+		const int16 SLOT_END                           = SLOT_COUNT - 1;
+
+		const int16 GENERAL_BAGS_BEGIN = 251;
+
+		const int16 CURSOR_BAG_BEGIN = 351;
+
+		const int16 BANK_BAGS_BEGIN = 2031;
+
+		const int16 SHARED_BANK_BAGS_BEGIN = 2531;
+
+		const int16 TRADE_BAGS_BEGIN = 3031;
 
 		const char* GetInvBagIndexName(int16 bag_index);
 
@@ -212,9 +244,9 @@ namespace RoF2
 		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const int16 SOCKET_INVALID = IINVALID;
-		const int16 SOCKET_BEGIN = INULL;
-		const int16 SOCKET_END = 5;
-		const int16 SOCKET_COUNT = 6;
+		const int16 SOCKET_BEGIN   = INULL;
+		const int16 SOCKET_END     = 5;
+		const int16 SOCKET_COUNT   = 6;
 
 		const char* GetInvAugIndexName(int16 aug_index);
 
@@ -291,7 +323,7 @@ namespace RoF2
 
 	namespace spells {
 		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF2; }
-		
+
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,
 			Gem2 = 1,
@@ -314,7 +346,7 @@ namespace RoF2
 		const int SPELL_ID_MAX = 45000;
 		const int SPELLBOOK_SIZE = 720;
 		const int SPELL_GEM_COUNT = static_cast<uint32>(CastingSlot::MaxGems);
-		
+
 		const int LONG_BUFFS = 42;
 		const int SHORT_BUFFS = 20;
 		const int DISC_BUFFS = 1;

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/titanium_structs.h

@@ -2463,25 +2463,25 @@ struct WhoAllReturnStruct {
 struct BeginTrader_Struct {
 	uint32 action;
 	uint32 unknown04;
-	uint64 serial_number[80];
-	uint32 cost[80];
+	uint64 serial_number[EQ::invtype::BAZAAR_SIZE];
+	uint32 cost[EQ::invtype::BAZAAR_SIZE];
 };
 
 struct Trader_Struct {
 	uint32 action;
 	uint32 unknown004;
-	uint64 item_id[80];
-	uint32 item_cost[80];
+	uint64 item_id[EQ::invtype::BAZAAR_SIZE];
+	uint32 item_cost[EQ::invtype::BAZAAR_SIZE];
 };
 
 struct ClickTrader_Struct {
 	uint32	code;
 	uint32	unknown[161];//damn soe this is totally pointless :/ but at least your finally using memset! Good job :) -LE
-	uint32	itemcost[80];
+	uint32	itemcost[EQ::invtype::BAZAAR_SIZE];
 };
 
 struct GetItems_Struct{
-	uint32	items[80];
+	uint32	items[EQ::invtype::BAZAAR_SIZE];
 };
 
 struct BecomeTrader_Struct {

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/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/base/base_inventory_repository.h

@@ -19,48 +19,48 @@
 class BaseInventoryRepository {
 public:
 	struct Inventory {
-		uint32_t    charid;
-		uint32_t    slotid;
-		uint32_t    itemid;
+		uint32_t    character_id;
+		uint32_t    slot_id;
+		uint32_t    item_id;
 		uint16_t    charges;
 		uint32_t    color;
-		uint32_t    augslot1;
-		uint32_t    augslot2;
-		uint32_t    augslot3;
-		uint32_t    augslot4;
-		uint32_t    augslot5;
-		int32_t     augslot6;
+		uint32_t    augment_one;
+		uint32_t    augment_two;
+		uint32_t    augment_three;
+		uint32_t    augment_four;
+		uint32_t    augment_five;
+		uint32_t    augment_six;
 		uint8_t     instnodrop;
 		std::string custom_data;
-		uint32_t    ornamenticon;
-		uint32_t    ornamentidfile;
+		uint32_t    ornament_icon;
+		uint32_t    ornament_idfile;
 		int32_t     ornament_hero_model;
 		uint64_t    guid;
 	};
 
 	static std::string PrimaryKey()
 	{
-		return std::string("charid");
+		return std::string("character_id");
 	}
 
 	static std::vector<std::string> Columns()
 	{
 		return {
-			"charid",
-			"slotid",
-			"itemid",
+			"character_id",
+			"slot_id",
+			"item_id",
 			"charges",
 			"color",
-			"augslot1",
-			"augslot2",
-			"augslot3",
-			"augslot4",
-			"augslot5",
-			"augslot6",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
 			"instnodrop",
 			"custom_data",
-			"ornamenticon",
-			"ornamentidfile",
+			"ornament_icon",
+			"ornament_idfile",
 			"ornament_hero_model",
 			"guid",
 		};
@@ -69,21 +69,21 @@ public:
 	static std::vector<std::string> SelectColumns()
 	{
 		return {
-			"charid",
-			"slotid",
-			"itemid",
+			"character_id",
+			"slot_id",
+			"item_id",
 			"charges",
 			"color",
-			"augslot1",
-			"augslot2",
-			"augslot3",
-			"augslot4",
-			"augslot5",
-			"augslot6",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
 			"instnodrop",
 			"custom_data",
-			"ornamenticon",
-			"ornamentidfile",
+			"ornament_icon",
+			"ornament_idfile",
 			"ornament_hero_model",
 			"guid",
 		};
@@ -126,21 +126,21 @@ public:
 	{
 		Inventory e{};
 
-		e.charid              = 0;
-		e.slotid              = 0;
-		e.itemid              = 0;
+		e.character_id        = 0;
+		e.slot_id             = 0;
+		e.item_id             = 0;
 		e.charges             = 0;
 		e.color               = 0;
-		e.augslot1            = 0;
-		e.augslot2            = 0;
-		e.augslot3            = 0;
-		e.augslot4            = 0;
-		e.augslot5            = 0;
-		e.augslot6            = 0;
+		e.augment_one         = 0;
+		e.augment_two         = 0;
+		e.augment_three       = 0;
+		e.augment_four        = 0;
+		e.augment_five        = 0;
+		e.augment_six         = 0;
 		e.instnodrop          = 0;
 		e.custom_data         = "";
-		e.ornamenticon        = 0;
-		e.ornamentidfile      = 0;
+		e.ornament_icon       = 0;
+		e.ornament_idfile     = 0;
 		e.ornament_hero_model = 0;
 		e.guid                = 0;
 
@@ -153,7 +153,7 @@ public:
 	)
 	{
 		for (auto &inventory : inventorys) {
-			if (inventory.charid == inventory_id) {
+			if (inventory.character_id == inventory_id) {
 				return inventory;
 			}
 		}
@@ -179,21 +179,21 @@ public:
 		if (results.RowCount() == 1) {
 			Inventory e{};
 
-			e.charid              = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.slotid              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.itemid              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.character_id        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augslot1            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augslot2            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augslot3            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augslot4            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augslot5            = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augslot6            = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.instnodrop          = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
 			e.custom_data         = row[12] ? row[12] : "";
-			e.ornamenticon        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.ornamentidfile      = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.ornament_icon       = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
 			e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
 			e.guid                = row[16] ? strtoull(row[16], nullptr, 10) : 0;
 
@@ -229,21 +229,21 @@ public:
 
 		auto columns = Columns();
 
-		v.push_back(columns[0] + " = " + std::to_string(e.charid));
-		v.push_back(columns[1] + " = " + std::to_string(e.slotid));
-		v.push_back(columns[2] + " = " + std::to_string(e.itemid));
+		v.push_back(columns[0] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.slot_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
 		v.push_back(columns[3] + " = " + std::to_string(e.charges));
 		v.push_back(columns[4] + " = " + std::to_string(e.color));
-		v.push_back(columns[5] + " = " + std::to_string(e.augslot1));
-		v.push_back(columns[6] + " = " + std::to_string(e.augslot2));
-		v.push_back(columns[7] + " = " + std::to_string(e.augslot3));
-		v.push_back(columns[8] + " = " + std::to_string(e.augslot4));
-		v.push_back(columns[9] + " = " + std::to_string(e.augslot5));
-		v.push_back(columns[10] + " = " + std::to_string(e.augslot6));
+		v.push_back(columns[5] + " = " + std::to_string(e.augment_one));
+		v.push_back(columns[6] + " = " + std::to_string(e.augment_two));
+		v.push_back(columns[7] + " = " + std::to_string(e.augment_three));
+		v.push_back(columns[8] + " = " + std::to_string(e.augment_four));
+		v.push_back(columns[9] + " = " + std::to_string(e.augment_five));
+		v.push_back(columns[10] + " = " + std::to_string(e.augment_six));
 		v.push_back(columns[11] + " = " + std::to_string(e.instnodrop));
 		v.push_back(columns[12] + " = '" + Strings::Escape(e.custom_data) + "'");
-		v.push_back(columns[13] + " = " + std::to_string(e.ornamenticon));
-		v.push_back(columns[14] + " = " + std::to_string(e.ornamentidfile));
+		v.push_back(columns[13] + " = " + std::to_string(e.ornament_icon));
+		v.push_back(columns[14] + " = " + std::to_string(e.ornament_idfile));
 		v.push_back(columns[15] + " = " + std::to_string(e.ornament_hero_model));
 		v.push_back(columns[16] + " = " + std::to_string(e.guid));
 
@@ -253,7 +253,7 @@ public:
 				TableName(),
 				Strings::Implode(", ", v),
 				PrimaryKey(),
-				e.charid
+				e.character_id
 			)
 		);
 
@@ -267,21 +267,21 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.charid));
-		v.push_back(std::to_string(e.slotid));
-		v.push_back(std::to_string(e.itemid));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
 		v.push_back(std::to_string(e.charges));
 		v.push_back(std::to_string(e.color));
-		v.push_back(std::to_string(e.augslot1));
-		v.push_back(std::to_string(e.augslot2));
-		v.push_back(std::to_string(e.augslot3));
-		v.push_back(std::to_string(e.augslot4));
-		v.push_back(std::to_string(e.augslot5));
-		v.push_back(std::to_string(e.augslot6));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
 		v.push_back(std::to_string(e.instnodrop));
 		v.push_back("'" + Strings::Escape(e.custom_data) + "'");
-		v.push_back(std::to_string(e.ornamenticon));
-		v.push_back(std::to_string(e.ornamentidfile));
+		v.push_back(std::to_string(e.ornament_icon));
+		v.push_back(std::to_string(e.ornament_idfile));
 		v.push_back(std::to_string(e.ornament_hero_model));
 		v.push_back(std::to_string(e.guid));
 
@@ -294,7 +294,7 @@ public:
 		);
 
 		if (results.Success()) {
-			e.charid = results.LastInsertedID();
+			e.character_id = results.LastInsertedID();
 			return e;
 		}
 
@@ -313,21 +313,21 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.charid));
-			v.push_back(std::to_string(e.slotid));
-			v.push_back(std::to_string(e.itemid));
+			v.push_back(std::to_string(e.character_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
 			v.push_back(std::to_string(e.charges));
 			v.push_back(std::to_string(e.color));
-			v.push_back(std::to_string(e.augslot1));
-			v.push_back(std::to_string(e.augslot2));
-			v.push_back(std::to_string(e.augslot3));
-			v.push_back(std::to_string(e.augslot4));
-			v.push_back(std::to_string(e.augslot5));
-			v.push_back(std::to_string(e.augslot6));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
 			v.push_back(std::to_string(e.instnodrop));
 			v.push_back("'" + Strings::Escape(e.custom_data) + "'");
-			v.push_back(std::to_string(e.ornamenticon));
-			v.push_back(std::to_string(e.ornamentidfile));
+			v.push_back(std::to_string(e.ornament_icon));
+			v.push_back(std::to_string(e.ornament_idfile));
 			v.push_back(std::to_string(e.ornament_hero_model));
 			v.push_back(std::to_string(e.guid));
 
@@ -363,21 +363,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Inventory e{};
 
-			e.charid              = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.slotid              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.itemid              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.character_id        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augslot1            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augslot2            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augslot3            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augslot4            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augslot5            = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augslot6            = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.instnodrop          = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
 			e.custom_data         = row[12] ? row[12] : "";
-			e.ornamenticon        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.ornamentidfile      = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.ornament_icon       = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
 			e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
 			e.guid                = row[16] ? strtoull(row[16], nullptr, 10) : 0;
 
@@ -404,21 +404,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Inventory e{};
 
-			e.charid              = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.slotid              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.itemid              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.character_id        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augslot1            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augslot2            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augslot3            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augslot4            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augslot5            = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augslot6            = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.instnodrop          = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
 			e.custom_data         = row[12] ? row[12] : "";
-			e.ornamenticon        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.ornamentidfile      = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.ornament_icon       = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
 			e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
 			e.guid                = row[16] ? strtoull(row[16], nullptr, 10) : 0;
 
@@ -495,21 +495,21 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.charid));
-		v.push_back(std::to_string(e.slotid));
-		v.push_back(std::to_string(e.itemid));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
 		v.push_back(std::to_string(e.charges));
 		v.push_back(std::to_string(e.color));
-		v.push_back(std::to_string(e.augslot1));
-		v.push_back(std::to_string(e.augslot2));
-		v.push_back(std::to_string(e.augslot3));
-		v.push_back(std::to_string(e.augslot4));
-		v.push_back(std::to_string(e.augslot5));
-		v.push_back(std::to_string(e.augslot6));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
 		v.push_back(std::to_string(e.instnodrop));
 		v.push_back("'" + Strings::Escape(e.custom_data) + "'");
-		v.push_back(std::to_string(e.ornamenticon));
-		v.push_back(std::to_string(e.ornamentidfile));
+		v.push_back(std::to_string(e.ornament_icon));
+		v.push_back(std::to_string(e.ornament_idfile));
 		v.push_back(std::to_string(e.ornament_hero_model));
 		v.push_back(std::to_string(e.guid));
 
@@ -534,21 +534,21 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.charid));
-			v.push_back(std::to_string(e.slotid));
-			v.push_back(std::to_string(e.itemid));
+			v.push_back(std::to_string(e.character_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
 			v.push_back(std::to_string(e.charges));
 			v.push_back(std::to_string(e.color));
-			v.push_back(std::to_string(e.augslot1));
-			v.push_back(std::to_string(e.augslot2));
-			v.push_back(std::to_string(e.augslot3));
-			v.push_back(std::to_string(e.augslot4));
-			v.push_back(std::to_string(e.augslot5));
-			v.push_back(std::to_string(e.augslot6));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
 			v.push_back(std::to_string(e.instnodrop));
 			v.push_back("'" + Strings::Escape(e.custom_data) + "'");
-			v.push_back(std::to_string(e.ornamenticon));
-			v.push_back(std::to_string(e.ornamentidfile));
+			v.push_back(std::to_string(e.ornament_icon));
+			v.push_back(std::to_string(e.ornament_idfile));
 			v.push_back(std::to_string(e.ornament_hero_model));
 			v.push_back(std::to_string(e.guid));
 

common/repositories/base/base_sharedbank_repository.h

@@ -0,0 +1,560 @@
+/**
+ * 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_SHAREDBANK_REPOSITORY_H
+#define EQEMU_BASE_SHAREDBANK_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseSharedbankRepository {
+public:
+	struct Sharedbank {
+		uint32_t    account_id;
+		uint32_t    slot_id;
+		uint32_t    item_id;
+		uint16_t    charges;
+		uint32_t    color;
+		uint32_t    augment_one;
+		uint32_t    augment_two;
+		uint32_t    augment_three;
+		uint32_t    augment_four;
+		uint32_t    augment_five;
+		uint32_t    augment_six;
+		std::string custom_data;
+		uint32_t    ornament_icon;
+		uint32_t    ornament_idfile;
+		int32_t     ornament_hero_model;
+		uint64_t    guid;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("account_id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"account_id",
+			"slot_id",
+			"item_id",
+			"charges",
+			"color",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
+			"custom_data",
+			"ornament_icon",
+			"ornament_idfile",
+			"ornament_hero_model",
+			"guid",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"account_id",
+			"slot_id",
+			"item_id",
+			"charges",
+			"color",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
+			"custom_data",
+			"ornament_icon",
+			"ornament_idfile",
+			"ornament_hero_model",
+			"guid",
+		};
+	}
+
+	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("sharedbank");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static Sharedbank NewEntity()
+	{
+		Sharedbank e{};
+
+		e.account_id          = 0;
+		e.slot_id             = 0;
+		e.item_id             = 0;
+		e.charges             = 0;
+		e.color               = 0;
+		e.augment_one         = 0;
+		e.augment_two         = 0;
+		e.augment_three       = 0;
+		e.augment_four        = 0;
+		e.augment_five        = 0;
+		e.augment_six         = 0;
+		e.custom_data         = "";
+		e.ornament_icon       = 0;
+		e.ornament_idfile     = 0;
+		e.ornament_hero_model = 0;
+		e.guid                = 0;
+
+		return e;
+	}
+
+	static Sharedbank GetSharedbank(
+		const std::vector<Sharedbank> &sharedbanks,
+		int sharedbank_id
+	)
+	{
+		for (auto &sharedbank : sharedbanks) {
+			if (sharedbank.account_id == sharedbank_id) {
+				return sharedbank;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static Sharedbank FindOne(
+		Database& db,
+		int sharedbank_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				sharedbank_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			Sharedbank e{};
+
+			e.account_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.custom_data         = row[11] ? row[11] : "";
+			e.ornament_icon       = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
+			e.guid                = row[15] ? strtoull(row[15], nullptr, 10) : 0;
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int sharedbank_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				sharedbank_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const Sharedbank &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[0] + " = " + std::to_string(e.account_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.slot_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.charges));
+		v.push_back(columns[4] + " = " + std::to_string(e.color));
+		v.push_back(columns[5] + " = " + std::to_string(e.augment_one));
+		v.push_back(columns[6] + " = " + std::to_string(e.augment_two));
+		v.push_back(columns[7] + " = " + std::to_string(e.augment_three));
+		v.push_back(columns[8] + " = " + std::to_string(e.augment_four));
+		v.push_back(columns[9] + " = " + std::to_string(e.augment_five));
+		v.push_back(columns[10] + " = " + std::to_string(e.augment_six));
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.custom_data) + "'");
+		v.push_back(columns[12] + " = " + std::to_string(e.ornament_icon));
+		v.push_back(columns[13] + " = " + std::to_string(e.ornament_idfile));
+		v.push_back(columns[14] + " = " + std::to_string(e.ornament_hero_model));
+		v.push_back(columns[15] + " = " + std::to_string(e.guid));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.account_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static Sharedbank InsertOne(
+		Database& db,
+		Sharedbank e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.account_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.charges));
+		v.push_back(std::to_string(e.color));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
+		v.push_back("'" + Strings::Escape(e.custom_data) + "'");
+		v.push_back(std::to_string(e.ornament_icon));
+		v.push_back(std::to_string(e.ornament_idfile));
+		v.push_back(std::to_string(e.ornament_hero_model));
+		v.push_back(std::to_string(e.guid));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.account_id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<Sharedbank> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.account_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.charges));
+			v.push_back(std::to_string(e.color));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
+			v.push_back("'" + Strings::Escape(e.custom_data) + "'");
+			v.push_back(std::to_string(e.ornament_icon));
+			v.push_back(std::to_string(e.ornament_idfile));
+			v.push_back(std::to_string(e.ornament_hero_model));
+			v.push_back(std::to_string(e.guid));
+
+			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<Sharedbank> All(Database& db)
+	{
+		std::vector<Sharedbank> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			Sharedbank e{};
+
+			e.account_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.custom_data         = row[11] ? row[11] : "";
+			e.ornament_icon       = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
+			e.guid                = row[15] ? strtoull(row[15], nullptr, 10) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<Sharedbank> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<Sharedbank> 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) {
+			Sharedbank e{};
+
+			e.account_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot_id             = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.charges             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.color               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.augment_one         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five        = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six         = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.custom_data         = row[11] ? row[11] : "";
+			e.ornament_icon       = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.ornament_idfile     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[14] ? static_cast<int32_t>(atoi(row[14])) : 0;
+			e.guid                = row[15] ? strtoull(row[15], nullptr, 10) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const Sharedbank &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.account_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.charges));
+		v.push_back(std::to_string(e.color));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
+		v.push_back("'" + Strings::Escape(e.custom_data) + "'");
+		v.push_back(std::to_string(e.ornament_icon));
+		v.push_back(std::to_string(e.ornament_idfile));
+		v.push_back(std::to_string(e.ornament_hero_model));
+		v.push_back(std::to_string(e.guid));
+
+		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<Sharedbank> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.account_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.charges));
+			v.push_back(std::to_string(e.color));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
+			v.push_back("'" + Strings::Escape(e.custom_data) + "'");
+			v.push_back(std::to_string(e.ornament_icon));
+			v.push_back(std::to_string(e.ornament_idfile));
+			v.push_back(std::to_string(e.ornament_hero_model));
+			v.push_back(std::to_string(e.guid));
+
+			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_SHAREDBANK_REPOSITORY_H

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/sharedbank_repository.h

@@ -3,310 +3,47 @@
 
 #include "../database.h"
 #include "../strings.h"
+#include "base/base_sharedbank_repository.h"
 
-class SharedbankRepository {
+class SharedbankRepository: public BaseSharedbankRepository {
 public:
-	struct Sharedbank {
-		int         acctid;
-		int         slotid;
-		int         itemid;
-		int16       charges;
-		int         augslot1;
-		int         augslot2;
-		int         augslot3;
-		int         augslot4;
-		int         augslot5;
-		int         augslot6;
-		std::string custom_data;
-	};
 
-	static std::string PrimaryKey()
-	{
-		return std::string("");
-	}
+    /**
+     * 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
+     *
+     * SharedbankRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * SharedbankRepository::GetWhereNeverExpires()
+     * SharedbankRepository::GetWhereXAndY()
+     * SharedbankRepository::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
+     */
 
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"acctid",
-			"slotid",
-			"itemid",
-			"charges",
-			"augslot1",
-			"augslot2",
-			"augslot3",
-			"augslot4",
-			"augslot5",
-			"augslot6",
-			"custom_data",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string InsertColumnsRaw()
-	{
-		std::vector<std::string> insert_columns;
-
-		for (auto &column : Columns()) {
-			if (column == PrimaryKey()) {
-				continue;
-			}
-
-			insert_columns.push_back(column);
-		}
-
-		return std::string(Strings::Implode(", ", insert_columns));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("sharedbank");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			ColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			InsertColumnsRaw()
-		);
-	}
-
-	static Sharedbank NewEntity()
-	{
-		Sharedbank entry{};
-
-		entry.acctid      = 0;
-		entry.slotid      = 0;
-		entry.itemid      = 0;
-		entry.charges     = 0;
-		entry.augslot1    = 0;
-		entry.augslot2    = 0;
-		entry.augslot3    = 0;
-		entry.augslot4    = 0;
-		entry.augslot5    = 0;
-		entry.augslot6    = 0;
-		entry.custom_data = 0;
-
-		return entry;
-	}
-
-	static Sharedbank GetSharedbankEntry(
-		const std::vector<Sharedbank> &sharedbanks,
-		int sharedbank_id
-	)
-	{
-		for (auto &sharedbank : sharedbanks) {
-			if (sharedbank. == sharedbank_id) {
-				return sharedbank;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static Sharedbank FindOne(
-		int sharedbank_id
-	)
-	{
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
-				BaseSelect(),
-				sharedbank_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			Sharedbank entry{};
-
-			entry.acctid      = atoi(row[0]);
-			entry.slotid      = atoi(row[1]);
-			entry.itemid      = atoi(row[2]);
-			entry.charges     = atoi(row[3]);
-			entry.augslot1    = atoi(row[4]);
-			entry.augslot2    = atoi(row[5]);
-			entry.augslot3    = atoi(row[6]);
-			entry.augslot4    = atoi(row[7]);
-			entry.augslot5    = atoi(row[8]);
-			entry.augslot6    = atoi(row[9]);
-			entry.custom_data = row[10];
-
-			return entry;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		int sharedbank_id
-	)
-	{
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				sharedbank_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Sharedbank sharedbank_entry
-	)
-	{
-		std::vector<std::string> update_values;
-
-		auto columns = Columns();
-
-		update_values.push_back(columns[0] + " = " + std::to_string(sharedbank_entry.acctid));
-		update_values.push_back(columns[1] + " = " + std::to_string(sharedbank_entry.slotid));
-		update_values.push_back(columns[2] + " = " + std::to_string(sharedbank_entry.itemid));
-		update_values.push_back(columns[3] + " = " + std::to_string(sharedbank_entry.charges));
-		update_values.push_back(columns[4] + " = " + std::to_string(sharedbank_entry.augslot1));
-		update_values.push_back(columns[5] + " = " + std::to_string(sharedbank_entry.augslot2));
-		update_values.push_back(columns[6] + " = " + std::to_string(sharedbank_entry.augslot3));
-		update_values.push_back(columns[7] + " = " + std::to_string(sharedbank_entry.augslot4));
-		update_values.push_back(columns[8] + " = " + std::to_string(sharedbank_entry.augslot5));
-		update_values.push_back(columns[9] + " = " + std::to_string(sharedbank_entry.augslot6));
-		update_values.push_back(columns[10] + " = '" + Strings::Escape(sharedbank_entry.custom_data) + "'");
-
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", update_values),
-				PrimaryKey(),
-				sharedbank_entry.
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static Sharedbank InsertOne(
-		Sharedbank sharedbank_entry
-	)
-	{
-		std::vector<std::string> insert_values;
-
-		insert_values.push_back(std::to_string(sharedbank_entry.acctid));
-		insert_values.push_back(std::to_string(sharedbank_entry.slotid));
-		insert_values.push_back(std::to_string(sharedbank_entry.itemid));
-		insert_values.push_back(std::to_string(sharedbank_entry.charges));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot1));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot2));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot3));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot4));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot5));
-		insert_values.push_back(std::to_string(sharedbank_entry.augslot6));
-		insert_values.push_back("'" + Strings::Escape(sharedbank_entry.custom_data) + "'");
-
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", insert_values)
-			)
-		);
-
-		if (results.Success()) {
-			sharedbank_entry.id = results.LastInsertedID();
-			return sharedbank_entry;
-		}
-
-		sharedbank_entry = InstanceListRepository::NewEntity();
-
-		return sharedbank_entry;
-	}
-
-	static int InsertMany(
-		std::vector<Sharedbank> sharedbank_entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &sharedbank_entry: sharedbank_entries) {
-			std::vector<std::string> insert_values;
-
-			insert_values.push_back(std::to_string(sharedbank_entry.acctid));
-			insert_values.push_back(std::to_string(sharedbank_entry.slotid));
-			insert_values.push_back(std::to_string(sharedbank_entry.itemid));
-			insert_values.push_back(std::to_string(sharedbank_entry.charges));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot1));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot2));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot3));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot4));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot5));
-			insert_values.push_back(std::to_string(sharedbank_entry.augslot6));
-			insert_values.push_back("'" + Strings::Escape(sharedbank_entry.custom_data) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
-		}
-
-		std::vector<std::string> insert_values;
-
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<Sharedbank> All()
-	{
-		std::vector<Sharedbank> all_entries;
-
-		auto results = database.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			Sharedbank entry{};
-
-			entry.acctid      = atoi(row[0]);
-			entry.slotid      = atoi(row[1]);
-			entry.itemid      = atoi(row[2]);
-			entry.charges     = atoi(row[3]);
-			entry.augslot1    = atoi(row[4]);
-			entry.augslot2    = atoi(row[5]);
-			entry.augslot3    = atoi(row[6]);
-			entry.augslot4    = atoi(row[7]);
-			entry.augslot5    = atoi(row[8]);
-			entry.augslot6    = atoi(row[9]);
-			entry.custom_data = row[10];
-
-			all_entries.push_back(entry);
-		}
-
-		return all_entries;
-	}
+	// Custom extended repository methods here
 
 };
 

common/ruletypes.h

@@ -339,7 +339,7 @@ RULE_STRING(World, MOTD, "", "Server MOTD sent on login, change from empty to ha
 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_STRING(World, SupportedClients, "RoF2", "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)
@@ -681,7 +681,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

@@ -48,6 +48,7 @@
 #include "repositories/skill_caps_repository.h"
 #include "repositories/inventory_repository.h"
 #include "repositories/books_repository.h"
+#include "repositories/sharedbank_repository.h"
 
 namespace ItemField
 {
@@ -190,242 +191,268 @@ SharedDatabase::MailKeys SharedDatabase::GetMailKey(int character_id)
 	return MailKeys{};
 }
 
-bool SharedDatabase::SaveCursor(uint32 char_id, std::list<EQ::ItemInstance*>::const_iterator &start, std::list<EQ::ItemInstance*>::const_iterator &end)
+bool SharedDatabase::SaveCursor(
+	uint32 char_id,
+	std::list<EQ::ItemInstance*>::const_iterator& start,
+	std::list<EQ::ItemInstance*>::const_iterator& end
+)
 {
-	// Delete cursor items
-	const std::string query = StringFormat("DELETE FROM inventory WHERE charid = %i "
-	                                       "AND ((slotid >= 8000 AND slotid <= 8999) "
-	                                       "OR slotid = %i OR (slotid >= %i AND slotid <= %i) )",
-	                                       char_id, EQ::invslot::slotCursor,
-	                                       EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END);
-	const auto results = QueryDatabase(query);
-    if (!results.Success()) {
-        std::cout << "Clearing cursor failed: " << results.ErrorMessage() << std::endl;
-        return false;
-    }
+	const int deleted = InventoryRepository::DeleteWhere(
+		*this,
+		fmt::format(
+			"`character_id` = {} AND (`slot_id` = {} OR `slot_id` BETWEEN {} AND {})",
+			char_id,
+			EQ::invslot::slotCursor,
+			EQ::invbag::CURSOR_BAG_BEGIN,
+			EQ::invbag::CURSOR_BAG_END
+		)
+	);
 
-    int i = 8000;
-    for(auto& it = start; it != end; ++it, i++) {
-		if (i > 8999) { break; } // shouldn't be anything in the queue that indexes this high
-		const EQ::ItemInstance *inst = *it;
-		const int16 use_slot = (i == 8000) ? EQ::invslot::slotCursor : i;
+	int16 i = EQ::invslot::slotCursor;
+	for (auto& it = start; it != end; ++it, i++) {
+		// shouldn't be anything in the queue that indexes this high
+		if (i > EQ::invbag::CURSOR_BAG_END) {
+			break;
+		}
+
+		const EQ::ItemInstance* inst   = *it;
+		const int16           use_slot = i == EQ::invslot::slotCursor ? EQ::invslot::slotCursor : i;
 		if (!SaveInventory(char_id, inst, use_slot)) {
 			return false;
 		}
-    }
+	}
 
 	return true;
 }
 
 bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const EQ::ItemInstance* inst)
 {
-	// Delete cursor items
-	const std::string query = StringFormat("SELECT itemid, charges FROM sharedbank "
-	                                       "WHERE acctid = %d AND slotid = %d",
-	                                       account_id, slot_id);
-    auto results = QueryDatabase(query);
-	if (!results.Success()) {
-		//returning true is less harmful in the face of a query error
-		return true;
+	if (!inst || !inst->GetItem()) {
+		return false;
 	}
 
-	if (results.RowCount() == 0)
-        return false;
+	const auto& l = SharedbankRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`account_id` = {} AND `slot_id` = {} LIMIT 1",
+			account_id,
+			slot_id
+		)
+	);
 
-	auto& row = results.begin();
+	if (l.empty()) {
+		return false;
+	}
 
-	const uint32 id = Strings::ToUnsignedInt(row[0]);
-	const uint16 charges = Strings::ToUnsignedInt(row[1]);
+	const auto& e = l.front();
 
-    uint16 expect_charges;
+	uint16 expect_charges = inst->GetCharges() >= 0 ? inst->GetCharges() : std::numeric_limits<int16>::max();
 
-    if(inst->GetCharges() >= 0)
-        expect_charges = inst->GetCharges();
-    else
-        expect_charges = 0x7FFF;
-
-    if(id != inst->GetItem()->ID || charges != expect_charges)
-        return false;
-
-	return true;
+	return e.item_id == inst->GetID() && e.charges == expect_charges;
 }
 
-bool SharedDatabase::SaveInventory(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) {
-
-	//never save tribute slots:
-	if (slot_id >= EQ::invslot::TRIBUTE_BEGIN && slot_id <= EQ::invslot::TRIBUTE_END)
-		return true;
-	if (slot_id >= EQ::invslot::GUILD_TRIBUTE_BEGIN && slot_id <= EQ::invslot::GUILD_TRIBUTE_END)
+bool SharedDatabase::SaveInventory(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id)
+{
+	// Don't save any Tribute slots
+	if (
+		EQ::ValueWithin(slot_id, EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END) ||
+		EQ::ValueWithin(slot_id, EQ::invslot::TRIBUTE_BEGIN, EQ::invslot::TRIBUTE_END)
+	) {
 		return true;
+	}
 
-	if (slot_id >= EQ::invslot::SHARED_BANK_BEGIN && slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) {
-        // Shared bank inventory
+	if (
+		EQ::ValueWithin(slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) ||
+		EQ::ValueWithin(slot_id, EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END)
+	) {
 		if (!inst) {
 			return DeleteSharedBankSlot(char_id, slot_id);
-		}
-		else {
+		} else {
 			// Needed to clear out bag slots that 'REPLACE' in UpdateSharedBankSlot does not overwrite..otherwise, duplication occurs
 			// (This requires that parent then child items be sent..which should be how they are currently passed)
-			if (EQ::InventoryProfile::SupportsContainers(slot_id))
+			if (EQ::InventoryProfile::SupportsContainers(slot_id)) {
 				DeleteSharedBankSlot(char_id, slot_id);
+			}
+
 			return UpdateSharedBankSlot(char_id, inst, slot_id);
 		}
-	}
-	else if (!inst) { // All other inventory
+	} else if (!inst) { // All other inventory
 		return DeleteInventorySlot(char_id, slot_id);
 	}
 
 	// Needed to clear out bag slots that 'REPLACE' in UpdateInventorySlot does not overwrite..otherwise, duplication occurs
 	// (This requires that parent then child items be sent..which should be how they are currently passed)
-	if (EQ::InventoryProfile::SupportsContainers(slot_id))
+	if (EQ::InventoryProfile::SupportsContainers(slot_id)) {
 		DeleteInventorySlot(char_id, slot_id);
-    return UpdateInventorySlot(char_id, inst, slot_id);
-}
-
-bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) {
-	// need to check 'inst' argument for valid pointer
-
-	uint32 augslot[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 };
-	if (inst->IsClassCommon()) {
-		for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-			const EQ::ItemInstance *auginst = inst->GetItem(i);
-			augslot[i] = (auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0;
-		}
 	}
 
-    uint16 charges;
-	if(inst->GetCharges() >= 0)
-		charges = inst->GetCharges();
-	else
-		charges = 0x7FFF;
-
-	// Update/Insert item
-	const std::string query = StringFormat("REPLACE INTO inventory "
-	                                       "(charid, slotid, itemid, charges, instnodrop, custom_data, color, "
-	                                       "augslot1, augslot2, augslot3, augslot4, augslot5, augslot6, ornamenticon, ornamentidfile, ornament_hero_model, guid) "
-	                                       "VALUES( %lu, %lu, %lu, %lu, %lu, '%s', %lu, "
-	                                       "%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu)",
-	                                       static_cast<unsigned long>(char_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
-	                                       static_cast<unsigned long>(charges), static_cast<unsigned long>(inst->IsAttuned() ? 1 : 0),
-	                                       inst->GetCustomDataString().c_str(), static_cast<unsigned long>(inst->GetColor()),
-	                                       static_cast<unsigned long>(augslot[0]), static_cast<unsigned long>(augslot[1]), static_cast<unsigned long>(augslot[2]),
-	                                       static_cast<unsigned long>(augslot[3]), static_cast<unsigned long>(augslot[4]), static_cast<unsigned long>(augslot[5]), static_cast<unsigned long>(inst->GetOrnamentationIcon()),
-	                                       static_cast<unsigned long>(inst->GetOrnamentationIDFile()), static_cast<unsigned long>(inst->GetOrnamentHeroModel()), inst->GetSerialNumber());
-	const auto results = QueryDatabase(query);
-
-    // Save bag contents, if slot supports bag contents
-	if (inst->IsClassBag() && EQ::InventoryProfile::SupportsContainers(slot_id))
-		// Limiting to bag slot count will get rid of 'hidden' duplicated items and 'Invalid Slot ID'
-		// messages through attrition (and the modded code in SaveInventory)
-		for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQ::invbag::SLOT_END; idx++) {
-			const EQ::ItemInstance* baginst = inst->GetItem(idx);
-			SaveInventory(char_id, baginst, EQ::InventoryProfile::CalcSlotId(slot_id, idx));
-		}
-
-    if (!results.Success()) {
-        return false;
-    }
-
-	return true;
+	return UpdateInventorySlot(char_id, inst, slot_id);
 }
 
-bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id) {
-	// need to check 'inst' argument for valid pointer
-
-	uint32 augslot[EQ::invaug::SOCKET_COUNT] = { 0, 0, 0, 0, 0, 0 };
-	if (inst->IsClassCommon()) {
-		for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-			const EQ::ItemInstance *auginst = inst->GetItem(i);
-			augslot[i] = (auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0;
-		}
+bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id)
+{
+	if (!inst || !inst->GetItem()) {
+		return false;
 	}
 
-// Update/Insert item
-	const uint32 account_id = GetAccountIDByChar(char_id);
-    uint16 charges;
-    if(inst->GetCharges() >= 0)
-        charges = inst->GetCharges();
-    else
-        charges = 0x7FFF;
+	std::vector<uint32> augment_ids = inst->GetAugmentIDs();
 
-	const std::string query = StringFormat("REPLACE INTO sharedbank "
-	                                       "(acctid, slotid, itemid, charges, custom_data, "
-	                                       "augslot1, augslot2, augslot3, augslot4, augslot5, augslot6) "
-	                                       "VALUES( %lu, %lu, %lu, %lu, '%s', "
-	                                       "%lu, %lu, %lu, %lu, %lu, %lu)",
-	                                       static_cast<unsigned long>(account_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
-	                                       static_cast<unsigned long>(charges), inst->GetCustomDataString().c_str(), static_cast<unsigned long>(augslot[0]),
-	                                       static_cast<unsigned long>(augslot[1]), static_cast<unsigned long>(augslot[2]), static_cast<unsigned long>(augslot[3]), static_cast<unsigned long>(augslot[4]),
-	                                       static_cast<unsigned long>(augslot[5]));
-	const auto results = QueryDatabase(query);
+	uint16 charges = inst->GetCharges() >= 0 ? inst->GetCharges() : std::numeric_limits<int16>::max();
 
-    // Save bag contents, if slot supports bag contents
+	auto e = InventoryRepository::NewEntity();
+
+	e.character_id        = char_id;
+	e.slot_id             = slot_id;
+	e.item_id             = inst->GetID();
+	e.charges             = charges;
+	e.color               = inst->GetColor();
+	e.augment_one         = augment_ids[0];
+	e.augment_two         = augment_ids[1];
+	e.augment_three       = augment_ids[2];
+	e.augment_four        = augment_ids[3];
+	e.augment_five        = augment_ids[4];
+	e.augment_six         = augment_ids[5];
+	e.instnodrop          = inst->IsAttuned() ? 1 : 0;
+	e.custom_data         = inst->GetCustomDataString();
+	e.ornament_icon       = inst->GetOrnamentationIcon();
+	e.ornament_idfile     = inst->GetOrnamentationIDFile();
+	e.ornament_hero_model = inst->GetOrnamentHeroModel();
+	e.guid                = inst->GetSerialNumber();
+
+	const int replaced = InventoryRepository::ReplaceOne(*this, e);
+
+	// Save bag contents, if slot supports bag contents
 	if (inst->IsClassBag() && EQ::InventoryProfile::SupportsContainers(slot_id)) {
 		// Limiting to bag slot count will get rid of 'hidden' duplicated items and 'Invalid Slot ID'
 		// messages through attrition (and the modded code in SaveInventory)
-		for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx < inst->GetItem()->BagSlots && idx <= EQ::invbag::SLOT_END; idx++) {
-			const EQ::ItemInstance* baginst = inst->GetItem(idx);
-			SaveInventory(char_id, baginst, EQ::InventoryProfile::CalcSlotId(slot_id, idx));
+		for (
+			uint8 i = EQ::invbag::SLOT_BEGIN;
+			i < inst->GetItem()->BagSlots && i <= EQ::invbag::SLOT_END;
+			i++
+		) {
+			const EQ::ItemInstance* bag_inst = inst->GetItem(i);
+			SaveInventory(char_id, bag_inst, EQ::InventoryProfile::CalcSlotId(slot_id, i));
 		}
 	}
 
-    if (!results.Success()) {
-        return false;
-    }
-
-	return true;
+	return replaced;
 }
 
-bool SharedDatabase::DeleteInventorySlot(uint32 char_id, int16 slot_id) {
+bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQ::ItemInstance* inst, int16 slot_id)
+{
+	if (!inst || !inst->GetItem()) {
+		return false;
+	}
 
-	// Delete item
-	std::string query = StringFormat("DELETE FROM inventory WHERE charid = %i AND slotid = %i", char_id, slot_id);
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-        return false;
-    }
+	std::vector<uint32> augment_ids = inst->GetAugmentIDs();
 
-    // Delete bag slots, if need be
-	if (!EQ::InventoryProfile::SupportsContainers(slot_id))
-        return true;
+	uint16 charges = inst->GetCharges() >= 0 ? inst->GetCharges() : std::numeric_limits<int16>::max();
 
-	const int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN);
-    query = StringFormat("DELETE FROM inventory WHERE charid = %i AND slotid >= %i AND slotid < %i",
-                        char_id, base_slot_id, (base_slot_id+10));
-    results = QueryDatabase(query);
-    if (!results.Success()) {
-        return false;
-    }
+	const uint32 account_id = GetAccountIDByChar(char_id);
 
-    // @merth: need to delete augments here
-    return true;
+	auto e = SharedbankRepository::NewEntity();
+
+	e.account_id          = account_id;
+	e.slot_id             = slot_id;
+	e.item_id             = inst->GetID();
+	e.charges             = charges;
+	e.color               = inst->GetColor();
+	e.augment_one         = augment_ids[0];
+	e.augment_two         = augment_ids[1];
+	e.augment_three       = augment_ids[2];
+	e.augment_four        = augment_ids[3];
+	e.augment_five        = augment_ids[4];
+	e.augment_six         = augment_ids[5];
+	e.custom_data         = inst->GetCustomDataString();
+	e.ornament_icon       = inst->GetOrnamentationIcon();
+	e.ornament_idfile     = inst->GetOrnamentationIDFile();
+	e.ornament_hero_model = inst->GetOrnamentHeroModel();
+	e.guid                = inst->GetSerialNumber();
+
+	const int replaced = SharedbankRepository::ReplaceOne(*this, e);
+
+	// Save bag contents, if slot supports bag contents
+	if (inst->IsClassBag() && EQ::InventoryProfile::SupportsContainers(slot_id)) {
+		// Limiting to bag slot count will get rid of 'hidden' duplicated items and 'Invalid Slot ID'
+		// messages through attrition (and the modded code in SaveInventory)
+		for (
+			uint8 i = EQ::invbag::SLOT_BEGIN;
+			i < inst->GetItem()->BagSlots && i <= EQ::invbag::SLOT_END;
+			i++
+		) {
+			const EQ::ItemInstance* bag_inst = inst->GetItem(i);
+			SaveInventory(char_id, bag_inst, EQ::InventoryProfile::CalcSlotId(slot_id, i));
+		}
+	}
+
+	return replaced;
 }
 
-bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id) {
+bool SharedDatabase::DeleteInventorySlot(uint32 char_id, int16 slot_id)
+{
+	const int deleted = InventoryRepository::DeleteWhere(
+		*this,
+		fmt::format(
+			"`character_id` = {} AND `slot_id` = {}",
+			char_id,
+			slot_id
+		)
+	);
 
-    // Delete item
-    const uint32 account_id = GetAccountIDByChar(char_id);
-	std::string query = StringFormat("DELETE FROM sharedbank WHERE acctid=%i AND slotid=%i", account_id, slot_id);
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-        return false;
-    }
+	if (!deleted) {
+		return false;
+	}
 
 	// Delete bag slots, if need be
-	if (!EQ::InventoryProfile::SupportsContainers(slot_id))
-        return true;
+	if (!EQ::InventoryProfile::SupportsContainers(slot_id)) {
+		return true;
+	}
 
-    const int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN);
-    query = StringFormat("DELETE FROM sharedbank WHERE acctid = %i "
-                        "AND slotid >= %i AND slotid < %i",
-                        account_id, base_slot_id, (base_slot_id+10));
-    results = QueryDatabase(query);
-    if (!results.Success()) {
-        return false;
-    }
+	const int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN);
 
-    // @merth: need to delete augments here
-    return true;
+	return InventoryRepository::DeleteWhere(
+		*this,
+		fmt::format(
+			"`character_id` = {} AND `slot_id` BETWEEN {} AND {}",
+			char_id,
+			base_slot_id,
+			base_slot_id + (EQ::invbag::SLOT_COUNT - 1)
+		)
+	);
+}
+
+bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id)
+{
+	const uint32 account_id = GetAccountIDByChar(char_id);
+
+	const int deleted = SharedbankRepository::DeleteWhere(
+		*this,
+		fmt::format(
+			"`account_id` = {} AND `slot_id` = {}",
+			account_id,
+			slot_id
+		)
+	);
+
+	if (!deleted) {
+		return false;
+	}
+
+	if (!EQ::InventoryProfile::SupportsContainers(slot_id)) {
+		return true;
+	}
+
+	const int16 base_slot_id = EQ::InventoryProfile::CalcSlotId(slot_id, EQ::invbag::SLOT_BEGIN);
+
+	return SharedbankRepository::DeleteWhere(
+		*this,
+		fmt::format(
+			"`account_id` = {} AND `slotid` BETWEEN {} AND {}",
+			account_id,
+			base_slot_id,
+			base_slot_id + (EQ::invbag::SLOT_COUNT - 1)
+		)
+	);
 }
 
 
@@ -550,96 +577,81 @@ bool SharedDatabase::SetStartingItems(
 // Retrieve shared bank inventory based on either account or character
 bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is_charid)
 {
-	std::string query;
+	const uint32 account_id = is_charid ? GetAccountIDByChar(id) : id;
 
-	if (is_charid) {
-		query = fmt::format(
-			"SELECT sb.slotid, sb.itemid, sb.charges, "
-			"sb.augslot1, sb.augslot2, sb.augslot3, "
-			"sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
-			"FROM sharedbank sb INNER JOIN character_data ch "
-			"ON ch.account_id = sb.acctid WHERE ch.id = {} ORDER BY sb.slotid",
-			id
-		);
-	} else {
-		query = fmt::format(
-			"SELECT slotid, itemid, charges, "
-			"augslot1, augslot2, augslot3, "
-			"augslot4, augslot5, augslot6, custom_data "
-			"FROM sharedbank WHERE acctid = {} ORDER BY slotid",
-			id
-		);
-	}
-
-	auto results = QueryDatabase(query);
-	// If we have no results we still need to return true
-	if (!results.Success()) {
+	if (!account_id) {
 		return false;
 	}
 
-	for (auto row : results) {
-		int16 slot_id = static_cast<int16>(Strings::ToInt(row[0]));
-		uint32 item_id = Strings::ToUnsignedInt(row[1]);
-		const int16 charges = static_cast<int16>(Strings::ToInt(row[2]));
+	const auto& l = SharedbankRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`account_id` = {}",
+			account_id
+		)
+	);
 
-		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = Strings::ToUnsignedInt(row[3]);
-		aug[1] = Strings::ToUnsignedInt(row[4]);
-		aug[2] = Strings::ToUnsignedInt(row[5]);
-		aug[3] = Strings::ToUnsignedInt(row[6]);
-		aug[4] = Strings::ToUnsignedInt(row[7]);
-		aug[5] = Strings::ToUnsignedInt(row[8]);
+	if (l.empty()) {
+		return true;
+	}
 
-		const EQ::ItemData *item = GetItem(item_id);
+	for (const auto& e : l) {
+		uint32 augment_ids[EQ::invaug::SOCKET_COUNT] = {
+			e.augment_one,
+			e.augment_two,
+			e.augment_three,
+			e.augment_four,
+			e.augment_five,
+			e.augment_six
+		};
+
+		const EQ::ItemData* item = GetItem(e.item_id);
 
 		if (!item) {
 			LogError(
-				"Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
-				is_charid ? "charid" : "acctid",
+				"Warning: {} [{}] has an invalid item_id [{}] in slot_id [{}]",
+				is_charid ? "character_id" : "account_id",
 				id,
-				item_id,
-				slot_id
+				e.item_id,
+				e.slot_id
 			);
 			continue;
 		}
 
-		auto inst = CreateBaseItem(item, charges);
+		EQ::ItemInstance* inst = CreateBaseItem(item, e.charges);
 		if (!inst) {
 			continue;
 		}
 
-		if (inst && item->IsClassCommon()) {
+		if (item->IsClassCommon()) {
 			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i]) {
-					inst->PutAugment(this, i, aug[i]);
+				if (augment_ids[i]) {
+					inst->PutAugment(this, i, augment_ids[i]);
 				}
 			}
 		}
 
-		if (inst && row[9]) {
-			std::string data_str(row[9]);
-			inst->SetCustomDataString(data_str);
+		if (!e.custom_data.empty()) {
+			inst->SetCustomDataString(e.custom_data);
 		}
 
-		// theoretically inst can be nullptr ... this would be very bad ...
-		const int16 put_slot_id = inv->PutItem(slot_id, *inst);
+		const int16 put_slot_id = inv->PutItem(e.slot_id, *inst);
 		safe_delete(inst);
 
-		// Save ptr to item in inventory
 		if (put_slot_id != INVALID_INDEX) {
 			continue;
 		}
 
 		LogError(
-			"Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
-			is_charid ? "charid" : "acctid",
+			"Warning: Invalid slot_id for item in shared bank inventory for {} [{}] item_id [{}] slot_id [{}]",
+			is_charid ? "character_id" : "account_id",
 			id,
-			item_id,
-			slot_id
+			e.item_id,
+			e.slot_id
 		);
 
 		if (is_charid) {
-			SaveInventory(id, nullptr, slot_id);
+			SaveInventory(id, nullptr, e.slot_id);
 		}
 	}
 
@@ -647,72 +659,77 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 }
 
 // Overloaded: Retrieve character inventory based on character id (zone entry)
-bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
+bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile* inv)
 {
-	if (!char_id || !inv)
+	if (!char_id || !inv) {
 		return false;
+	}
 
 	// Retrieve character inventory
-	auto results = InventoryRepository::GetWhere(*this, fmt::format("`charid` = '{}' ORDER BY `slotid`;", char_id));
+	auto results = InventoryRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`character_id` = '{}' ORDER BY `slot_id`",
+			char_id
+		)
+	);
+
 	if (results.empty()) {
 		LogError("Error loading inventory for char_id {} from the database.", char_id);
 		return false;
 	}
 
-	for (auto const &row: results) {
+	for (auto const& row: results) {
 		if (row.guid != 0) {
 			EQ::ItemInstance::AddGUIDToMap(row.guid);
 		}
 	}
 
-	const auto timestamps = GetItemRecastTimestamps(char_id);
-	auto cv_conflict      = false;
-	const auto pmask      = inv->GetLookup()->PossessionsBitmask;
-	const auto bank_size  = inv->GetLookup()->InventoryTypeSize.Bank;
+	const auto timestamps  = GetItemRecastTimestamps(char_id);
+	auto       cv_conflict = false;
+	const auto pmask       = inv->GetLookup()->PossessionsBitmask;
+	const auto bank_size   = inv->GetLookup()->InventoryTypeSize.Bank;
 
-	std::vector<InventoryRepository::Inventory> queue{};
-	for (auto &row: results) {
-		const int16 slot_id              = row.slotid;
-		const uint32 item_id             = row.itemid;
+	std::vector<InventoryRepository::Inventory> queue{ };
+	for (auto& row: results) {
+		const int16  slot_id             = row.slot_id;
+		const uint32 item_id             = row.item_id;
 		const uint16 charges             = row.charges;
 		const uint32 color               = row.color;
-		const bool instnodrop            = row.instnodrop;
-		const uint32 ornament_icon       = row.ornamenticon;
-		const uint32 ornament_idfile     = row.ornamentidfile;
+		const bool   instnodrop          = row.instnodrop;
+		const uint32 ornament_icon       = row.ornament_icon;
+		const uint32 ornament_idfile     = row.ornament_idfile;
 		const uint32 ornament_hero_model = row.ornament_hero_model;
 
-		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = row.augslot1;
-		aug[1] = row.augslot2;
-		aug[2] = row.augslot3;
-		aug[3] = row.augslot4;
-		aug[4] = row.augslot5;
-		aug[5] = row.augslot6;
+		uint32 augment_ids[EQ::invaug::SOCKET_COUNT] = {
+			row.augment_one,
+			row.augment_two,
+			row.augment_three,
+			row.augment_four,
+			row.augment_five,
+			row.augment_six
+		};
 
-		if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {
+		if (EQ::ValueWithin(slot_id, EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END)) {
 			// Titanium thru UF check
 			if (((static_cast<uint64>(1) << slot_id) & pmask) == 0) {
 				cv_conflict = true;
 				continue;
 			}
-		}
-		else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		} else if (EQ::ValueWithin(slot_id, EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END)) {
 			// Titanium thru UF check
-			const auto parent_slot = EQ::invslot::GENERAL_BEGIN + (
-				                         (slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
+			const auto parent_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
 			if (((static_cast<uint64>(1) << parent_slot) & pmask) == 0) {
 				cv_conflict = true;
 				continue;
 			}
-		}
-		else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) {
+		} else if (EQ::ValueWithin(slot_id, EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END)) {
 			// Titanium check
 			if ((slot_id - EQ::invslot::BANK_BEGIN) >= bank_size) {
 				cv_conflict = true;
 				continue;
 			}
-		}
-		else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) {
+		} else if (EQ::ValueWithin(slot_id, EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END)) {
 			// Titanium check
 			const auto parent_index = ((slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
 			if (parent_index >= bank_size) {
@@ -721,7 +738,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			}
 		}
 
-		auto *item = GetItem(item_id);
+		auto* item = GetItem(item_id);
 		if (!item) {
 			LogError(
 				"Warning: charid [{}] has an invalid item_id [{}] in inventory slot [{}]",
@@ -732,7 +749,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			continue;
 		}
 
-		auto *inst = CreateBaseItem(item, charges);
+		auto* inst = CreateBaseItem(item, charges);
 		if (!inst) {
 			continue;
 		}
@@ -745,8 +762,13 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 		inst->SetOrnamentationIDFile(ornament_idfile);
 		inst->SetOrnamentHeroModel(item->HerosForgeModel);
 
-		if (instnodrop || (inst->GetItem()->Attuneable && slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <=
-		                   EQ::invslot::EQUIPMENT_END)) {
+		if (
+			instnodrop ||
+			(
+				inst->GetItem()->Attuneable &&
+				EQ::ValueWithin(slot_id, EQ::invslot::EQUIPMENT_BEGIN, EQ::invslot::EQUIPMENT_END)
+			)
+		) {
 			inst->SetAttuned(true);
 		}
 
@@ -754,52 +776,37 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			inst->SetColor(color);
 		}
 
-		if (charges == 0x7FFF) {
+		if (charges == std::numeric_limits<int16>::max()) {
 			inst->SetCharges(-1);
-		}
-		else if (charges == 0 && inst->IsStackable()) {
+		} else if (charges == 0 && inst->IsStackable()) {
 			// Stackable items need a minimum charge of 1 remain moveable.
 			inst->SetCharges(1);
-		}
-		else {
+		} else {
 			inst->SetCharges(charges);
 		}
 
 		if (item->RecastDelay) {
 			if (item->RecastType != RECAST_TYPE_UNLINKED_ITEM && timestamps.count(item->RecastType)) {
 				inst->SetRecastTimestamp(timestamps.at(item->RecastType));
-			}
-			else if (item->RecastType == RECAST_TYPE_UNLINKED_ITEM && timestamps.count(item->ID)) {
+			} else if (item->RecastType == RECAST_TYPE_UNLINKED_ITEM && timestamps.count(item->ID)) {
 				inst->SetRecastTimestamp(timestamps.at(item->ID));
-			}
-			else {
+			} else {
 				inst->SetRecastTimestamp(0);
 			}
 		}
 
 		if (item->IsClassCommon()) {
 			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i]) {
-					inst->PutAugment(this, i, aug[i]);
+				if (augment_ids[i]) {
+					inst->PutAugment(this, i, augment_ids[i]);
 				}
 			}
 		}
 
 		int16 put_slot_id;
-		if (slot_id >= 8000 && slot_id <= 8999) {
+		if (EQ::ValueWithin(slot_id, EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END)) {
 			put_slot_id = inv->PushCursor(*inst);
-		}
-		else if (slot_id >= 3111 && slot_id <= 3179) {
-			// Admins: please report any occurrences of this error
-			LogError(
-				"Warning: Defunct location for item in inventory: charid={}, item_id={}, slot_id={} .. pushing to cursor...",
-				char_id,
-				item_id,
-				slot_id
-			);
-			put_slot_id = inv->PushCursor(*inst);
-		}
-		else {
+		} else {
 			put_slot_id = inv->PutItem(slot_id, *inst);
 		}
 
@@ -811,7 +818,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 		// Save ptr to item in inventory
 		if (put_slot_id == INVALID_INDEX) {
 			LogError(
-				"Warning: Invalid slot_id for item in inventory: charid=[{}], item_id=[{}], slot_id=[{}]",
+				"Warning: Invalid slot_id for item in inventory for character_id [{}] item_id [{}] slot_id [{}]",
 				char_id,
 				item_id,
 				slot_id
@@ -820,7 +827,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 	}
 
 	if (cv_conflict) {
-		const std::string &char_name = GetCharName(char_id);
+		const std::string& char_name = GetCharName(char_id);
 		LogError(
 			"ClientVersion/Expansion conflict during inventory load at zone entry for [{}] (charid: [{}], inver: [{}], gmi: [{}])",
 			char_name,
@@ -840,94 +847,6 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 	return GetSharedBank(char_id, inv, true);
 }
 
-// Overloaded: Retrieve character inventory based on account_id and character name (char select)
-bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv) // deprecated
-{
-	// Retrieve character inventory
-	const std::string query =
-	    StringFormat("SELECT slotid, itemid, charges, color, augslot1, "
-			 "augslot2, augslot3, augslot4, augslot5, augslot6, instnodrop, custom_data, ornamenticon, "
-			 "ornamentidfile, ornament_hero_model "
-			 "FROM inventory INNER JOIN character_data ch "
-			 "ON ch.id = charid WHERE ch.name = '%s' AND ch.account_id = %i ORDER BY slotid",
-			 name, account_id);
-	auto results = QueryDatabase(query);
-	if (!results.Success()) {
-		LogError("If you got an error related to the 'instnodrop' field, run the "
-						    "following SQL Queries:\nalter table inventory add instnodrop "
-						    "tinyint(1) unsigned default 0 not null;\n");
-		return false;
-	}
-
-	for (auto& row = results.begin(); row != results.end(); ++row) {
-		int16 slot_id = Strings::ToInt(row[0]);
-		uint32 item_id = Strings::ToUnsignedInt(row[1]);
-		const int8 charges = Strings::ToInt(row[2]);
-		const uint32 color = Strings::ToUnsignedInt(row[3]);
-
-		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = Strings::ToUnsignedInt(row[4]);
-		aug[1] = Strings::ToUnsignedInt(row[5]);
-		aug[2] = Strings::ToUnsignedInt(row[6]);
-		aug[3] = Strings::ToUnsignedInt(row[7]);
-		aug[4] = Strings::ToUnsignedInt(row[8]);
-		aug[5] = Strings::ToUnsignedInt(row[9]);
-
-		const bool instnodrop = (row[10] && static_cast<uint16>(Strings::ToUnsignedInt(row[10])));
-		const uint32 ornament_icon = Strings::ToUnsignedInt(row[12]);
-		const uint32 ornament_idfile = Strings::ToUnsignedInt(row[13]);
-		uint32 ornament_hero_model = Strings::ToUnsignedInt(row[14]);
-
-		const EQ::ItemData *item = GetItem(item_id);
-		if (!item)
-			continue;
-
-		EQ::ItemInstance *inst = CreateBaseItem(item, charges);
-
-		if (inst == nullptr)
-			continue;
-
-		inst->SetAttuned(instnodrop);
-
-		if (row[11]) {
-			std::string data_str(row[11]);
-			inst->SetCustomDataString(data_str);
-		}
-
-		inst->SetOrnamentIcon(ornament_icon);
-		inst->SetOrnamentationIDFile(ornament_idfile);
-		inst->SetOrnamentHeroModel(item->HerosForgeModel);
-
-		if (color > 0)
-			inst->SetColor(color);
-
-		inst->SetCharges(charges);
-
-		if (item->IsClassCommon()) {
-			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i])
-					inst->PutAugment(this, i, aug[i]);
-			}
-		}
-
-		int16 put_slot_id;
-		if (slot_id >= 8000 && slot_id <= 8999)
-			put_slot_id = inv->PushCursor(*inst);
-		else
-			put_slot_id = inv->PutItem(slot_id, *inst);
-
-		safe_delete(inst);
-
-		// Save ptr to item in inventory
-		if (put_slot_id == INVALID_INDEX)
-			LogError("Warning: Invalid slot_id for item in inventory: name={}, acctid={}, item_id={}, slot_id={}",
-				name, account_id, item_id, slot_id);
-	}
-
-	// Retrieve shared inventory
-	return GetSharedBank(account_id, inv, false);
-}
-
 std::map<uint32, uint32> SharedDatabase::GetItemRecastTimestamps(uint32 char_id)
 {
 	std::map<uint32, uint32> timers;
@@ -1279,7 +1198,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 
 		// Bag
 		item.BagSize = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bagsize]));
-		item.BagSlots = static_cast<uint8>(EQ::Clamp(Strings::ToInt(row[ItemField::bagslots]), 0, 10)); // Will need to be changed from std::min to just use database value when bag slots are increased
+		item.BagSlots = static_cast<uint8>(EQ::Clamp(Strings::ToInt(row[ItemField::bagslots]), 0, static_cast<int>(EQ::invbag::SLOT_COUNT)));
 		item.BagType = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bagtype]));
 		item.BagWR = static_cast<uint8>(EQ::Clamp(Strings::ToInt(row[ItemField::bagwr]), 0, 100));
 

common/shareddb.h

@@ -104,7 +104,6 @@ public:
 	int32 GetSharedPlatinum(uint32 account_id);
 	bool SetSharedPlatinum(uint32 account_id, int32 amount_to_add);
 	bool GetInventory(uint32 char_id, EQ::InventoryProfile *inv);
-	bool GetInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv); // deprecated
 	std::map<uint32, uint32> GetItemRecastTimestamps(uint32 char_id);
 	uint32 GetItemRecastTimestamp(uint32 char_id, uint32 recast_type);
 	void ClearOldRecastTimestamps(uint32 char_id);

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.59.1-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 9288
 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9045
 
 #endif

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "22.60.0",
+  "version": "22.59.1",
   "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/generators/repository-generator.pl

@@ -142,7 +142,6 @@ foreach my $table_to_generate (@tables) {
         "guild_bank",
         "inventory_versions",
         "raid_leaders",
-        "sharedbank",
         "trader_audit",
         "eqtime",
         "db_version",

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/client.cpp

@@ -2369,21 +2369,26 @@ bool Client::StoreCharacter(
 
 	auto e = InventoryRepository::NewEntity();
 
-	e.charid = character_id;
+	e.character_id = character_id;
 
 	for (int16 slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invbag::BANK_BAGS_END;) {
 		const auto inst = p_inventory_profile->GetItem(slot_id);
 		if (inst) {
-			e.slotid   = slot_id;
-			e.itemid   = inst->GetItem()->ID;
-			e.charges  = inst->GetCharges();
-			e.color    = inst->GetColor();
-			e.augslot1 = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN);
-			e.augslot2 = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 1);
-			e.augslot3 = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 2);
-			e.augslot4 = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 3);
-			e.augslot5 = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 4);
-			e.augslot6 = inst->GetAugmentItemID(EQ::invaug::SOCKET_END);
+			e.slot_id             = slot_id;
+			e.item_id             = inst->GetItem()->ID;
+			e.charges             = inst->GetCharges();
+			e.color               = inst->GetColor();
+			e.augment_one         = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN);
+			e.augment_two         = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 1);
+			e.augment_three       = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 2);
+			e.augment_four        = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 3);
+			e.augment_five        = inst->GetAugmentItemID(EQ::invaug::SOCKET_BEGIN + 4);
+			e.augment_six         = inst->GetAugmentItemID(EQ::invaug::SOCKET_END);
+			e.instnodrop          = inst->IsAttuned() ? 1 : 0;
+			e.ornament_icon       = inst->GetOrnamentationIcon();
+			e.ornament_idfile     = inst->GetOrnamentationIDFile();
+			e.ornament_hero_model = inst->GetOrnamentHeroModel();
+			e.guid                = inst->GetSerialNumber();
 
 			v.emplace_back(e);
 		}

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/worlddb.cpp

@@ -26,6 +26,7 @@
 #include <vector>
 #include "sof_char_create_data.h"
 #include "../common/repositories/character_instance_safereturns_repository.h"
+#include "../common/repositories/inventory_repository.h"
 #include "../common/repositories/criteria/content_filter_criteria.h"
 #include "../common/zone_store.h"
 
@@ -857,115 +858,90 @@ bool WorldDatabase::LoadCharacterCreateCombos()
 // this is a slightly modified version of SharedDatabase::GetInventory(...) for character select use-only
 bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQ::InventoryProfile *inv)
 {
-	if (!account_id || !name || !inv)
+	if (!account_id || !name || !inv) {
 		return false;
+	}
 
-	std::string query = StringFormat(
-		"SELECT"
-		" slotid,"
-		" itemid,"
-		" charges,"
-		" color,"
-		" augslot1,"
-		" augslot2,"
-		" augslot3,"
-		" augslot4,"
-		" augslot5,"
-		" augslot6,"
-		" instnodrop,"
-		" custom_data,"
-		" ornamenticon,"
-		" ornamentidfile,"
-		" ornament_hero_model "
-		"FROM"
-		" inventory "
-		"INNER JOIN"
-		" character_data ch "
-		"ON"
-		" ch.id = charid "
-		"WHERE"
-		" ch.name = '%s' "
-		"AND"
-		" ch.account_id = %i "
-		"AND"
-		" slotid >= %i "
-		"AND"
-		" slotid <= %i",
-		name,
-		account_id,
-		EQ::invslot::slotHead,
-		EQ::invslot::slotFeet
+	const uint32 character_id = GetCharacterID(name);
+
+	if (!character_id) {
+		return false;
+	}
+
+	const auto& l = InventoryRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`character_id` = {} AND `slot_id` BETWEEN {} AND {}",
+			character_id,
+			EQ::invslot::slotHead,
+			EQ::invslot::slotFeet
+		)
 	);
-	auto results = QueryDatabase(query);
-	if (!results.Success())
-		return false;
 
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		int16 slot_id = Strings::ToInt(row[0]);
+	if (l.empty()) {
+		return true;
+	}
 
-		switch (slot_id) {
-		case EQ::invslot::slotFace:
-		case EQ::invslot::slotEar2:
-		case EQ::invslot::slotNeck:
-		case EQ::invslot::slotShoulders:
-		case EQ::invslot::slotBack:
-		case EQ::invslot::slotFinger1:
-		case EQ::invslot::slotFinger2:
-			continue;
-		default:
-			break;
+	for (const auto& e : l) {
+		switch (e.slot_id) {
+			case EQ::invslot::slotFace:
+			case EQ::invslot::slotEar2:
+			case EQ::invslot::slotNeck:
+			case EQ::invslot::slotShoulders:
+			case EQ::invslot::slotBack:
+			case EQ::invslot::slotFinger1:
+			case EQ::invslot::slotFinger2:
+				continue;
+			default:
+				break;
 		}
 
-		uint32 item_id = Strings::ToInt(row[1]);
-		int8 charges = Strings::ToInt(row[2]);
-		uint32 color = Strings::ToUnsignedInt(row[3]);
 
-		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = (uint32)Strings::ToInt(row[4]);
-		aug[1] = (uint32)Strings::ToInt(row[5]);
-		aug[2] = (uint32)Strings::ToInt(row[6]);
-		aug[3] = (uint32)Strings::ToInt(row[7]);
-		aug[4] = (uint32)Strings::ToInt(row[8]);
-		aug[5] = (uint32)Strings::ToInt(row[9]);
+		uint32 augment_ids[EQ::invaug::SOCKET_COUNT] = {
+			e.augment_one,
+			e.augment_two,
+			e.augment_three,
+			e.augment_four,
+			e.augment_five,
+			e.augment_six
+		};
 
-		bool instnodrop = ((row[10] && (uint16)Strings::ToInt(row[10])) ? true : false);
-		uint32 ornament_icon = (uint32)Strings::ToUnsignedInt(row[12]);
-		uint32 ornament_idfile = (uint32)Strings::ToUnsignedInt(row[13]);
-		uint32 ornament_hero_model = (uint32)Strings::ToUnsignedInt(row[14]);
-
-		const EQ::ItemData *item = content_db.GetItem(item_id);
-		if (!item)
+		const EQ::ItemData* item = content_db.GetItem(e.item_id);
+		if (!item) {
 			continue;
-
-		EQ::ItemInstance *inst = content_db.CreateBaseItem(item, charges);
-
-		if (inst == nullptr)
-			continue;
-
-		inst->SetAttuned(instnodrop);
-
-		if (row[11]) {
-			std::string data_str(row[11]);
-			inst->SetCustomDataString(data_str);
 		}
 
-		inst->SetOrnamentIcon(ornament_icon);
-		inst->SetOrnamentationIDFile(ornament_idfile);
-		inst->SetOrnamentHeroModel(item->HerosForgeModel);
+		EQ::ItemInstance *inst = content_db.CreateBaseItem(item, e.charges);
 
-		if (color > 0)
-			inst->SetColor(color);
+		if (!inst) {
+			continue;
+		}
 
-		inst->SetCharges(charges);
+		inst->SetCharges(e.charges);
+
+		if (e.color > 0) {
+			inst->SetColor(e.color);
+		}
 
 		if (item->IsClassCommon()) {
 			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i])
-					inst->PutAugment(this, i, aug[i]);
+				if (augment_ids[i]) {
+					inst->PutAugment(this, i, augment_ids[i]);
+				}
 			}
 		}
 
-		inv->PutItem(slot_id, *inst);
+		inst->SetAttuned(e.instnodrop);
+
+		if (!e.custom_data.empty()) {
+			inst->SetCustomDataString(e.custom_data);
+		}
+
+		inst->SetOrnamentIcon(e.ornament_icon);
+		inst->SetOrnamentationIDFile(e.ornament_idfile);
+		inst->SetOrnamentHeroModel(e.ornament_hero_model);
+
+		inv->PutItem(e.slot_id, *inst);
 
 		safe_delete(inst);
 	}

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:

zone/CMakeLists.txt

@@ -170,7 +170,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

zone/client.cpp

@@ -9124,7 +9124,7 @@ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id)
 		auto l = InventoryRepository::GetWhere(
 			database,
 			fmt::format(
-				"`charid` = {} AND `slotid` = {}",
+				"`character_id` = {} AND `slot_id` = {}",
 				character_id,
 				EQ::invslot::slotPrimary
 			)
@@ -9136,7 +9136,7 @@ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id)
 
 		auto e = l.front();
 
-		e.ornamentidfile = model_id;
+		e.ornament_idfile = model_id;
 
 		const int updated = InventoryRepository::UpdateOne(database, e);
 
@@ -9157,7 +9157,7 @@ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
 		auto l = InventoryRepository::GetWhere(
 			database,
 			fmt::format(
-				"`charid` = {} AND `slotid` = {}",
+				"`character_id` = {} AND `slot_id` = {}",
 				character_id,
 				EQ::invslot::slotSecondary
 			)
@@ -9169,7 +9169,7 @@ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
 
 		auto e = l.front();
 
-		e.ornamentidfile = model_id;
+		e.ornament_idfile = model_id;
 
 		const int updated = InventoryRepository::UpdateOne(database, e);
 
@@ -11995,13 +11995,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 +12011,7 @@ void Client::SendPath(Mob* target) {
 		(
 			target->CastToClient()->IsTrader() ||
 			target->CastToClient()->IsBuyer()
-			)
+		)
 		) {
 		Message(
 			Chat::Yellow,
@@ -12029,17 +12031,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 +12041,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 +12056,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 +12081,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 +12108,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);

zone/client.h

@@ -869,7 +869,6 @@ public:
 	int GetAccountAge();
 
 	void SendPath(Mob* target);
-	void SendPath(const glm::vec3 &loc);
 
 	bool IsDiscovered(uint32 itemid);
 	void DiscoverItem(uint32 itemid);

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);
@@ -1642,11 +1639,6 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 			m_pp.abilitySlotRefresh = 0;
 	}
 
-#ifdef _EQDEBUG
-	printf("Dumping inventory on load:\n");
-	m_inv.dumpEntireInventory();
-#endif
-
 	/* Reset to max so they dont drown on zone in if its underwater */
 	m_pp.air_remaining = 60;
 	/* Check for PVP Zone status*/
@@ -6477,40 +6469,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);
 	}
 }
 
@@ -10803,8 +10764,7 @@ void Client::Handle_OP_MoveCoin(const EQApplicationPacket *app)
 
 void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 {
-	if (!CharacterID())
-	{
+	if (!CharacterID()) {
 		return;
 	}
 
@@ -10813,60 +10773,35 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 		return;
 	}
 
-	MoveItem_Struct* mi = (MoveItem_Struct*)app->pBuffer;
-	if (spellend_timer.Enabled() && casting_spell_id && !IsBardSong(casting_spell_id))
-	{
-		if (mi->from_slot != mi->to_slot && (mi->from_slot <= EQ::invslot::GENERAL_END || mi->from_slot > 39) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot))
-		{
-			const EQ::ItemInstance *itm_from = GetInv().GetItem(mi->from_slot);
-			const EQ::ItemInstance *itm_to = GetInv().GetItem(mi->to_slot);
-			auto message = fmt::format("Player issued a move item from {}(item id {}) to {}(item id {}) while casting {}.",
+	MoveItem_Struct* mi = (MoveItem_Struct*) app->pBuffer;
+	if (spellend_timer.Enabled() && casting_spell_id && !IsBardSong(casting_spell_id)) {
+		if (mi->from_slot != mi->to_slot && (mi->from_slot <= EQ::invslot::GENERAL_END || mi->from_slot > 39) &&
+			IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) {
+			const EQ::ItemInstance* itm_from = GetInv().GetItem(mi->from_slot);
+			const EQ::ItemInstance* itm_to   = GetInv().GetItem(mi->to_slot);
+			auto message = fmt::format(
+				"Player issued a move item from {}(item id {}) to {}(item id {}) while casting {}.",
 				mi->from_slot,
 				itm_from ? itm_from->GetID() : 0,
 				mi->to_slot,
 				itm_to ? itm_to->GetID() : 0,
-				casting_spell_id);
-			RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{.message = message});
+				casting_spell_id
+			);
+			RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{ .message = message });
 			Kick("Inventory desync"); // Kick client to prevent client and server from getting out-of-sync inventory slots
 			return;
 		}
 	}
 
-	// Illegal bagslot usage checks. Currently, user only receives a message if this check is triggered.
-	bool mi_hack = false;
-
-	if (mi->from_slot >= EQ::invbag::GENERAL_BAGS_BEGIN && mi->from_slot <= EQ::invbag::CURSOR_BAG_END) {
-		if (mi->from_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; }
-		else {
-			int16 from_parent = m_inv.CalcSlotId(mi->from_slot);
-			if (!m_inv[from_parent]) { mi_hack = true; }
-			else if (!m_inv[from_parent]->IsClassBag()) { mi_hack = true; }
-			else if (m_inv.CalcBagIdx(mi->from_slot) >= m_inv[from_parent]->GetItem()->BagSlots) { mi_hack = true; }
-		}
-	}
-
-	if (mi->to_slot >= EQ::invbag::GENERAL_BAGS_BEGIN && mi->to_slot <= EQ::invbag::CURSOR_BAG_END) {
-		if (mi->to_slot >= EQ::invbag::CURSOR_BAG_BEGIN) { mi_hack = true; }
-		else {
-			int16 to_parent = m_inv.CalcSlotId(mi->to_slot);
-			if (!m_inv[to_parent]) { mi_hack = true; }
-			else if (!m_inv[to_parent]->IsClassBag()) { mi_hack = true; }
-			else if (m_inv.CalcBagIdx(mi->to_slot) >= m_inv[to_parent]->GetItem()->BagSlots) { mi_hack = true; }
-		}
-	}
-
-	if (mi_hack) { Message(Chat::Yellow, "Caution: Illegal use of inaccessible bag slots!"); }
-
 	if (!SwapItem(mi) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) {
 		SwapItemResync(mi);
 
 		bool error = false;
 		InterrogateInventory(this, false, true, false, error, false);
-		if (error)
+		if (error) {
 			InterrogateInventory(this, true, false, true, error);
+		}
 	}
-
-	return;
 }
 
 void Client::Handle_OP_MoveMultipleItems(const EQApplicationPacket *app)

zone/client_process.cpp

@@ -770,65 +770,83 @@ void Client::BulkSendInventoryItems()
 	EQ::OutBuffer ob;
 	EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
-	// Possessions items
-	for (int16 slot_id = EQ::invslot::POSSESSIONS_BEGIN; slot_id <= EQ::invslot::POSSESSIONS_END; slot_id++) {
+	// Equipment items
+	for (int16 slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; slot_id++) {
 		const EQ::ItemInstance* inst = m_inv[slot_id];
-		if (!inst)
+		if (!inst) {
 			continue;
+		}
 
 		inst->Serialize(ob, slot_id);
 
-		if (ob.tellp() == last_pos)
+		if (ob.tellp() == last_pos) {
 			LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+		}
 
 		last_pos = ob.tellp();
 	}
 
-    if (!RuleB(Inventory, LazyLoadBank)) {
-        // Bank items
-        for (int16 slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; slot_id++) {
-            const EQ::ItemInstance* inst = m_inv[slot_id];
-            if (!inst)
-                continue;
+	// General items
+	for (int16 slot_id = EQ::invslot::GENERAL_BEGIN; slot_id <= EQ::invslot::GENERAL_END; slot_id++) {
+		const EQ::ItemInstance* inst = m_inv[slot_id];
+		if (!inst) {
+			continue;
+		}
 
-            inst->Serialize(ob, slot_id);
+		inst->Serialize(ob, slot_id);
 
-            if (ob.tellp() == last_pos)
-                LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+		if (ob.tellp() == last_pos) {
+			LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+		}
 
-            last_pos = ob.tellp();
-        }
+		last_pos = ob.tellp();
+	}
 
-        // SharedBank items
-        for (int16 slot_id = EQ::invslot::SHARED_BANK_BEGIN; slot_id <= EQ::invslot::SHARED_BANK_END; slot_id++) {
-            const EQ::ItemInstance* inst = m_inv[slot_id];
-            if (!inst)
-                continue;
+	if (!RuleB(Inventory, LazyLoadBank)) {
+		// Bank items
+		for (int16 slot_id = EQ::invslot::BANK_BEGIN; slot_id <= EQ::invslot::BANK_END; slot_id++) {
+			const EQ::ItemInstance* inst = m_inv[slot_id];
+			if (!inst) {
+				continue;
+			}
 
-            inst->Serialize(ob, slot_id);
+			inst->Serialize(ob, slot_id);
 
-            if (ob.tellp() == last_pos)
-                LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+			if (ob.tellp() == last_pos) {
+				LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+			}
 
-            last_pos = ob.tellp();
-        }
-    }
+			last_pos = ob.tellp();
+		}
 
-    auto outapp = new EQApplicationPacket(OP_CharInventory);
-    outapp->size = ob.size();
-    outapp->pBuffer = ob.detach();
-    QueuePacket(outapp);
-    safe_delete(outapp);
+		// SharedBank items
+		for (int16 slot_id = EQ::invslot::SHARED_BANK_BEGIN; slot_id <= EQ::invslot::SHARED_BANK_END; slot_id++) {
+			const EQ::ItemInstance* inst = m_inv[slot_id];
+			if (!inst) {
+				continue;
+			}
+
+			inst->Serialize(ob, slot_id);
+
+			if (ob.tellp() == last_pos) {
+				LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
+			}
+
+			last_pos = ob.tellp();
+		}
+	}
+
+	auto outapp = new EQApplicationPacket(OP_CharInventory);
+
+	outapp->size    = ob.size();
+	outapp->pBuffer = ob.detach();
+
+	QueuePacket(outapp);
+	safe_delete(outapp);
 }
 
 void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 	const EQ::ItemData* handy_item = nullptr;
-
-	uint32 merchant_slots = 80; //The max number of items passed in the transaction.
-	if (m_ClientVersionBit & EQ::versions::maskRoFAndLater) { // RoF+ can send 200 items
-		merchant_slots = 200;
-	}
-
 	const EQ::ItemData *item = nullptr;
 	auto merchant_list = zone->merchanttable[merchant_id];
 	auto npc = entity_list.GetMobByNpcTypeID(npcid);
@@ -840,6 +858,8 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 		}
 	}
 
+	const int16 merchant_slots = (m_ClientVersionBit & EQ::versions::maskRoFAndLater) ? EQ::invtype::MERCHANT_SIZE : 80;
+
 	auto temporary_merchant_list = zone->tmpmerchanttable[npcid];
 	uint32 slot_id = 1;
 	uint8 handy_chance = 0;

zone/corpse.cpp

@@ -845,7 +845,7 @@ LootItem *Corpse::GetItem(uint16 lootslot, LootItem **bag_item_data)
 
 		// convert above code to for loop
 		for (const auto &item: m_item_list) {
-			if (item->equip_slot >= bagstart && item->equip_slot < bagstart + 10) {
+			if (item->equip_slot >= bagstart && item->equip_slot < bagstart + EQ::invbag::SLOT_COUNT) {
 				bag_item_data[item->equip_slot - bagstart] = item;
 			}
 		}
@@ -1472,7 +1472,7 @@ void Corpse::LootCorpseItem(Client *c, const EQApplicationPacket *app)
 
 	const EQ::ItemData *item      = nullptr;
 	EQ::ItemInstance   *inst      = nullptr;
-	LootItem           *item_data = nullptr, *bag_item_data[10] = {};
+	LootItem           *item_data = nullptr, *bag_item_data[EQ::invbag::SLOT_COUNT] = {};
 
 	memset(bag_item_data, 0, sizeof(bag_item_data));
 	if (GetPlayerKillItem() > 1) {

zone/embparser.cpp

@@ -1736,7 +1736,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;
 		}
 

zone/embparser_api.cpp

@@ -278,25 +278,25 @@ int Perl__getinventoryslotid(std::string identifier)
 		else if (identifier == "generalbags.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN;
 		else if (identifier == "generalbags.end")       result = EQ::invbag::GENERAL_BAGS_END;
 		else if (identifier == "general1bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN;
-		else if (identifier == "general1bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 9;
-		else if (identifier == "general2bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 10;
-		else if (identifier == "general2bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 19;
-		else if (identifier == "general3bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 20;
-		else if (identifier == "general3bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 29;
-		else if (identifier == "general4bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 30;
-		else if (identifier == "general4bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 39;
-		else if (identifier == "general5bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 40;
-		else if (identifier == "general5bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 49;
-		else if (identifier == "general6bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 50;
-		else if (identifier == "general6bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 59;
-		else if (identifier == "general7bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 60;
-		else if (identifier == "general7bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 69;
-		else if (identifier == "general8bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 70;
-		else if (identifier == "general8bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 79;
-		else if (identifier == "general9bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + 80;
-		else if (identifier == "general9bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + 89;
-		else if (identifier == "general10bag.begin")    result = EQ::invbag::GENERAL_BAGS_BEGIN + 90;
-		else if (identifier == "general10bag.end")      result = EQ::invbag::GENERAL_BAGS_BEGIN + 99;
+		else if (identifier == "general1bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT - 1);
+		else if (identifier == "general2bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + EQ::invbag::SLOT_COUNT;
+		else if (identifier == "general2bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 2) - 1);
+		else if (identifier == "general3bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 2);
+		else if (identifier == "general3bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 3) - 1);
+		else if (identifier == "general4bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 3);
+		else if (identifier == "general4bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 4) - 1);
+		else if (identifier == "general5bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 4);
+		else if (identifier == "general5bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 5) - 1);
+		else if (identifier == "general6bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 5);
+		else if (identifier == "general6bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 6) - 1);
+		else if (identifier == "general7bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 6);
+		else if (identifier == "general7bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 7) - 1);
+		else if (identifier == "general8bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 7);
+		else if (identifier == "general8bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 8) - 1);
+		else if (identifier == "general9bag.begin")     result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 8);
+		else if (identifier == "general9bag.end")       result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 9) - 1);
+		else if (identifier == "general10bag.begin")    result = EQ::invbag::GENERAL_BAGS_BEGIN + (EQ::invbag::SLOT_COUNT * 9);
+		else if (identifier == "general10bag.end")      result = EQ::invbag::GENERAL_BAGS_BEGIN + ((EQ::invbag::SLOT_COUNT * 10) - 1);
 		else if (identifier == "cursorbag.begin")       result = EQ::invbag::CURSOR_BAG_BEGIN;
 		else if (identifier == "cursorbag.end")         result = EQ::invbag::CURSOR_BAG_END;
 		else if (identifier == "bank.begin")            result = EQ::invslot::BANK_BEGIN;

zone/gm_commands/show/inventory.cpp

@@ -310,7 +310,7 @@ void ShowInventory(Client *c, const Seperator *sep)
 						Chat::White,
 						fmt::format(
 							"Slot {} | {} ({}){}",
-							(8000 + limboIndex),
+							(14000 + limboIndex),
 							item_data->ID,
 							linker.GenerateLink(),
 							(
@@ -339,7 +339,7 @@ void ShowInventory(Client *c, const Seperator *sep)
 							Chat::White,
 							fmt::format(
 								"Slot {} (Augment Slot {}) | {} ({}){}",
-								(8000 + limboIndex),
+								(14000 + limboIndex),
 								augment_index,
 								linker.GenerateLink(),
 								item_data->ID,
@@ -375,7 +375,7 @@ void ShowInventory(Client *c, const Seperator *sep)
 							Chat::White,
 							fmt::format(
 								"Slot {} Bag Slot {} | {} ({}){}",
-								(8000 + limboIndex),
+								(14000 + limboIndex),
 								sub_index,
 								linker.GenerateLink(),
 								item_data->ID,
@@ -407,7 +407,7 @@ void ShowInventory(Client *c, const Seperator *sep)
 								Chat::White,
 								fmt::format(
 									"Slot {} Bag Slot {} (Augment Slot {}) | {} ({}){}",
-									(8000 + limboIndex),
+									(14000 + limboIndex),
 									sub_index,
 									augment_index,
 									linker.GenerateLink(),

zone/inventory.cpp

@@ -1909,13 +1909,20 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		return false;
 	}
 	//verify shared bank transactions in the database
-	if (src_inst && src_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) {
+	if (
+		src_inst &&
+		(
+			EQ::ValueWithin(src_slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) ||
+			EQ::ValueWithin(src_slot_id, EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END)
+		)
+	) {
 		if(!database.VerifyInventory(account_id, src_slot_id, src_inst)) {
 			LogError("Player [{}] on account [{}] was found exploiting the shared bank.\n", GetName(), account_name);
 			DeleteItemInInventory(dst_slot_id,0,true);
 			return(false);
 		}
-		if (src_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQ::invslot::SHARED_BANK_END && src_inst->IsClassBag()){
+
+		if (EQ::ValueWithin(src_slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) && src_inst->IsClassBag()){
 			for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx <= EQ::invbag::SLOT_END; idx++) {
 				const EQ::ItemInstance* baginst = src_inst->GetItem(idx);
 				if (baginst && !database.VerifyInventory(account_id, EQ::InventoryProfile::CalcSlotId(src_slot_id, idx), baginst)){
@@ -1924,13 +1931,21 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 			}
 		}
 	}
-	if (dst_inst && dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END) {
+
+	if (
+		dst_inst &&
+		(
+			EQ::ValueWithin(dst_slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) ||
+			EQ::ValueWithin(dst_slot_id, EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END)
+		)
+	) {
 		if(!database.VerifyInventory(account_id, dst_slot_id, dst_inst)) {
 			LogError("Player [{}] on account [{}] was found exploting the shared bank.\n", GetName(), account_name);
 			DeleteItemInInventory(src_slot_id,0,true);
 			return(false);
 		}
-		if (dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invslot::SHARED_BANK_END && dst_inst->IsClassBag()){
+
+		if (EQ::ValueWithin(dst_slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) && dst_inst->IsClassBag()){
 			for (uint8 idx = EQ::invbag::SLOT_BEGIN; idx <= EQ::invbag::SLOT_END; idx++) {
 				const EQ::ItemInstance* baginst = dst_inst->GetItem(idx);
 				if (baginst && !database.VerifyInventory(account_id, EQ::InventoryProfile::CalcSlotId(dst_slot_id, idx), baginst)){
@@ -1943,10 +1958,20 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 
 	// Check for No Drop Hacks
 	Mob* with = trade->With();
-	if (((with && with->IsClient() && !with->CastToClient()->IsBecomeNPC() && dst_slot_id >= EQ::invslot::TRADE_BEGIN && dst_slot_id <= EQ::invslot::TRADE_END) ||
-		(dst_slot_id >= EQ::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQ::invbag::SHARED_BANK_BAGS_END))
-	&& GetInv().CheckNoDrop(src_slot_id)
-	&& !CanTradeFVNoDropItem()) {
+	if (
+		(
+			(
+				with &&
+				with->IsClient() &&
+				!with->CastToClient()->IsBecomeNPC() &&
+				EQ::ValueWithin(dst_slot_id, EQ::invslot::TRADE_BEGIN, EQ::invslot::TRADE_END)
+			) ||
+			EQ::ValueWithin(dst_slot_id, EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END) ||
+			EQ::ValueWithin(dst_slot_id, EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END)
+		) &&
+		GetInv().CheckNoDrop(src_slot_id) &&
+		!CanTradeFVNoDropItem()
+	) {
 		auto ndh_inst = m_inv[src_slot_id];
 		std::string ndh_item_data;
 		if (ndh_inst == nullptr) {
@@ -3641,7 +3666,7 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 		if (cursor_itr == m_inv.cursor_cbegin())
 			continue;
 
-		instmap[8000 + limbo] = *cursor_itr;
+		instmap[EQ::invbag::CURSOR_BAG_BEGIN + limbo] = *cursor_itr;
 	}
 
 	// call InterrogateInventory_ for error check
@@ -3744,11 +3769,12 @@ bool Client::InterrogateInventory_error(int16 head, int16 index, const EQ::ItemI
 	// very basic error checking - can be elaborated upon if more in-depth testing is needed...
 
 	if (
-		(head >= EQ::invslot::EQUIPMENT_BEGIN && head <= EQ::invslot::EQUIPMENT_END) ||
-		(head >= EQ::invslot::TRIBUTE_BEGIN && head <= EQ::invslot::TRIBUTE_END) ||
-		(head >= EQ::invslot::GUILD_TRIBUTE_BEGIN && head <= EQ::invslot::GUILD_TRIBUTE_END) ||
-		(head >= EQ::invslot::WORLD_BEGIN && head <= EQ::invslot::WORLD_END) ||
-		(head >= 8000 && head <= 8101)) {
+		EQ::ValueWithin(head, EQ::invslot::EQUIPMENT_BEGIN, EQ::invslot::EQUIPMENT_END) ||
+		EQ::ValueWithin(head, EQ::invslot::TRIBUTE_BEGIN, EQ::invslot::TRIBUTE_END) ||
+		EQ::ValueWithin(head, EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END) ||
+		EQ::ValueWithin(head, EQ::invslot::WORLD_BEGIN, EQ::invslot::WORLD_END) ||
+		EQ::ValueWithin(head, EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END)
+	) {
 		switch (depth)
 		{
 		case 0: // requirement: inst is extant

zone/lua_packet.cpp

@@ -839,7 +839,6 @@ luabind::scope lua_register_packet_opcodes() {
 		luabind::value("GroupLeaderChange", static_cast<int>(OP_GroupLeaderChange)),
 		luabind::value("GroupLeadershipAAUpdate", static_cast<int>(OP_GroupLeadershipAAUpdate)),
 		luabind::value("GroupRoles", static_cast<int>(OP_GroupRoles)),
-		luabind::value("OP_SendFindableLocations", static_cast<int>(OP_SendFindableLocations)),
 		luabind::value("SendFindableNPCs", static_cast<int>(OP_SendFindableNPCs)),
 		luabind::value("HideCorpse", static_cast<int>(OP_HideCorpse)),
 		luabind::value("TargetBuffs", static_cast<int>(OP_TargetBuffs)),

zone/mob.cpp

@@ -2048,19 +2048,19 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
 			case 0: {
 				mod2a_name = "Avoidance";
 				mod2b_name = "Combat Effects";
-				mod2a_cap  = RuleI(Character, ItemAvoidanceCap);
-				mod2b_cap  = RuleI(Character, ItemCombatEffectsCap);
+				mod2a_cap  = Strings::Commify(RuleI(Character, ItemAvoidanceCap));
+				mod2b_cap  = Strings::Commify(RuleI(Character, ItemCombatEffectsCap));
 
 				if (IsBot()) {
-					mod2a = CastToBot()->GetAvoidance();
+					mod2a = Strings::Commify(CastToBot()->GetAvoidance());
 				} else if (IsClient()) {
-					mod2a = CastToClient()->GetAvoidance();
+					mod2a = Strings::Commify(CastToClient()->GetAvoidance());
 				}
 
 				if (IsBot()) {
-					mod2b = CastToBot()->GetCombatEffects();
+					mod2b = Strings::Commify(CastToBot()->GetCombatEffects());
 				} else if (IsClient()) {
-					mod2b = CastToClient()->GetCombatEffects();
+					mod2b = Strings::Commify(CastToClient()->GetCombatEffects());
 				}
 
 				break;
@@ -2068,19 +2068,19 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
 			case 1: {
 				mod2a_name = "Accuracy";
 				mod2b_name = "Strikethrough";
-				mod2a_cap  = RuleI(Character, ItemAccuracyCap);
-				mod2b_cap  = RuleI(Character, ItemStrikethroughCap);
+				mod2a_cap  = Strings::Commify(RuleI(Character, ItemAccuracyCap));
+				mod2b_cap  = Strings::Commify(RuleI(Character, ItemStrikethroughCap));
 
 				if (IsBot()) {
-					mod2a = CastToBot()->GetAccuracy();
+					mod2a = Strings::Commify(CastToBot()->GetAccuracy());
 				} else if (IsClient()) {
-					mod2a = CastToClient()->GetAccuracy();
+					mod2a = Strings::Commify(CastToClient()->GetAccuracy());
 				}
 
 				if (IsBot()) {
-					mod2b = CastToBot()->GetStrikeThrough();
+					mod2b = Strings::Commify(CastToBot()->GetStrikeThrough());
 				} else if (IsClient()) {
-					mod2b = CastToClient()->GetStrikeThrough();
+					mod2b = Strings::Commify(CastToClient()->GetStrikeThrough());
 				}
 
 				break;
@@ -2088,20 +2088,20 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
 			case 2: {
 				mod2a_name = "Shielding";
 				mod2b_name = "Spell Shielding";
-				mod2a_cap  = RuleI(Character, ItemShieldingCap);
-				mod2b_cap  = RuleI(Character, ItemSpellShieldingCap);
+				mod2a_cap  = Strings::Commify(RuleI(Character, ItemShieldingCap));
+				mod2b_cap  = Strings::Commify(RuleI(Character, ItemSpellShieldingCap));
 
 				if (IsBot()) {
-					mod2a = CastToBot()->GetShielding();
+					mod2a = Strings::Commify(CastToBot()->GetShielding());
 				} else if (IsClient()) {
-					mod2a = CastToClient()->GetShielding();
+					mod2a = Strings::Commify(CastToClient()->GetShielding());
 				}
 
 
 				if (IsBot()) {
-					mod2b = CastToBot()->GetSpellShield();
+					mod2b = Strings::Commify(CastToBot()->GetSpellShield());
 				} else if (IsClient()) {
-					mod2b = CastToClient()->GetSpellShield();
+					mod2b = Strings::Commify(CastToClient()->GetSpellShield());
 				}
 
 				break;
@@ -2109,19 +2109,19 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
 			case 3: {
 				mod2a_name = "Stun Resist";
 				mod2b_name = "DOT Shielding";
-				mod2a_cap  = RuleI(Character, ItemStunResistCap);
-				mod2b_cap  = RuleI(Character, ItemDoTShieldingCap);
+				mod2a_cap  = Strings::Commify(RuleI(Character, ItemStunResistCap));
+				mod2b_cap  = Strings::Commify(RuleI(Character, ItemDoTShieldingCap));
 
 				if (IsBot()) {
-					mod2a = CastToBot()->GetStunResist();
+					mod2a = Strings::Commify(CastToBot()->GetStunResist());
 				} else if (IsClient()) {
-					mod2a = CastToClient()->GetStunResist();
+					mod2a = Strings::Commify(CastToClient()->GetStunResist());
 				}
 
 				if (IsBot()) {
-					mod2b = CastToBot()->GetDoTShield();
+					mod2b = Strings::Commify(CastToBot()->GetDoTShield());
 				} else if (IsClient()) {
-					mod2b = CastToClient()->GetDoTShield();
+					mod2b = Strings::Commify(CastToClient()->GetDoTShield());
 				}
 
 				break;

zone/mob_ai.cpp

@@ -1815,18 +1815,12 @@ void Mob::AI_Event_NoLongerEngaged() {
 	StopNavigation();
 	ClearRampage();
 
+	parse->EventBotMercNPC(EVENT_COMBAT, this, nullptr, [&]() { return "0"; });
+
 	if (IsNPC()) {
 		SetPrimaryAggro(false);
 		SetAssistAggro(false);
-		if (
-			CastToNPC()->GetCombatEvent() &&
-			GetHP() > 0 &&
-			entity_list.GetNPCByID(GetID())
-		) {
-			if (parse->HasQuestSub(GetNPCTypeID(), EVENT_COMBAT)) {
-				parse->EventNPC(EVENT_COMBAT, CastToNPC(), nullptr, "0", 0);
-			}
-
+		if (CastToNPC()->GetCombatEvent() && GetHP() > 0) {
 			const uint32 emote_id = CastToNPC()->GetEmoteID();
 			if (emote_id) {
 				CastToNPC()->DoNPCEmote(EQ::constants::EmoteEventTypes::LeaveCombat, emote_id);
@@ -1835,8 +1829,6 @@ void Mob::AI_Event_NoLongerEngaged() {
 			m_combat_record.Stop();
 			CastToNPC()->SetCombatEvent(false);
 		}
-	} else {
-		parse->EventBotMerc(EVENT_COMBAT, this, nullptr, [&]() { return "0"; });
 	}
 }
 

zone/npc.cpp

@@ -3297,28 +3297,16 @@ uint32 NPC::GetSpawnKillCount()
 	return(0);
 }
 
-void NPC::DoQuestPause(Mob* m)
-{
-	if (!m) {
-		return;
-	}
-
-	if (IsMoving() && !IsOnHatelist(m)) {
+void NPC::DoQuestPause(Mob *other) {
+	if(IsMoving() && !IsOnHatelist(other)) {
 		PauseWandering(RuleI(NPC, SayPauseTimeInSec));
-
-		if (FacesTarget() && !m->sneaking) {
-			FaceTarget(m);
-		}
-	} else if (!IsMoving()) {
-		if (
-			FacesTarget() &&
-			!m->sneaking &&
-			GetAppearance() != eaSitting &&
-			GetAppearance() != eaDead
-		) {
-			FaceTarget(m);
-		}
+		if (other && !other->sneaking)
+			FaceTarget(other);
+	} else if(!IsMoving()) {
+		if (other && !other->sneaking && GetAppearance() != eaSitting && GetAppearance() != eaDead)
+			FaceTarget(other);
 	}
+
 }
 
 void NPC::ChangeLastName(std::string last_name)
@@ -4250,17 +4238,3 @@ void NPC::DoNpcToNpcAggroScan()
 		false
 	);
 }
-
-bool NPC::FacesTarget()
-{
-	const std::string& excluded_races_rule = RuleS(NPC, ExcludedFaceTargetRaces);
-
-	if (excluded_races_rule.empty()) {
-		return true;
-	}
-
-	const auto& v = Strings::Split(excluded_races_rule, ",");
-
-	return std::find(v.begin(), v.end(), std::to_string(GetBaseRace())) == v.end();
-}
-

zone/npc.h

@@ -482,8 +482,7 @@ public:
 	NPC_Emote_Struct* GetNPCEmote(uint32 emote_id, uint8 event_);
 	void DoNPCEmote(uint8 event_, uint32 emote_id, Mob* t = nullptr);
 	bool CanTalk();
-	void DoQuestPause(Mob* m);
-	bool FacesTarget();
+	void DoQuestPause(Mob *other);
 
 	inline void SetSpellScale(float amt)		{ spellscale = amt; }
 	inline float GetSpellScale()				{ return spellscale; }

zone/parcels.cpp

@@ -278,19 +278,6 @@ void Client::DoParcelSend(const Parcel_Struct *parcel_in)
 		return;
 	}
 
-	if (parcel_in->money_flag && parcel_in->item_slot != INVALID_INDEX) {
-		Message(
-			Chat::Yellow,
-			fmt::format(
-				"{} tells you, 'I am confused!  Do you want to send money or an item?'",
-				merchant->GetCleanName()
-			).c_str()
-		);
-		DoParcelCancel();
-		SendParcelAck();
-		return;
-	}
-
 	auto num_of_parcels = GetParcelCount();
 	if (num_of_parcels >= RuleI(Parcel, ParcelMaxItems)) {
 		SendParcelIconStatus();

zone/pathing.cpp

@@ -72,19 +72,22 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 			Message(Chat::System, "Total points %u", points.size());
 		}
 		
-		int len = (points.size() + 1) * sizeof(FindPerson_Point);
+		int len = sizeof(FindPersonResult_Struct) + (points.size() + 1) * sizeof(FindPerson_Point);
 		auto outapp = new EQApplicationPacket(OP_FindPersonReply, len);
+		FindPersonResult_Struct* fpr = (FindPersonResult_Struct*)outapp->pBuffer;
+		
+		std::vector<FindPerson_Point>::iterator cur, end;
+		cur = points.begin();
+		end = points.end();
+		unsigned int r;
+		for (r = 0; cur != end; ++cur, r++) {
+			fpr->path[r] = *cur;
 		
-		auto& last = points.back();
-		outapp->WriteFloat(last.y);
-		outapp->WriteFloat(last.x);
-		outapp->WriteFloat(last.z);
-
-		for (auto& p : points) {
-			outapp->WriteFloat(p.y);
-			outapp->WriteFloat(p.x);
-			outapp->WriteFloat(p.z);
 		}
+		//put the last element into the destination field
+		--cur;
+		fpr->path[r] = *cur;
+		fpr->dest = *cur;
 		
 		FastQueuePacket(&outapp);
 	})

zone/trading.cpp

@@ -777,8 +777,6 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 				tradingWith->SayString(TRADE_BACK, GetCleanName());
 				PushItemOnCursor(*inst, true);
 			}
-
-			items.clear();
 		}
 		// Only enforce trade rules if the NPC doesn't have an EVENT_TRADE
 		// subroutine.  That overrides all.
@@ -2915,11 +2913,10 @@ void Client::SendBecomeTraderToWorld(Client *trader, BazaarTraderBarterActions a
 	auto outapp = new ServerPacket(ServerOP_TraderMessaging, sizeof(TraderMessaging_Struct));
 	auto data   = (TraderMessaging_Struct *) outapp->pBuffer;
 
-	data->action      = action;
-	data->entity_id   = trader->GetID();
-	data->trader_id   = trader->CharacterID();
-	data->zone_id     = trader->GetZoneID();
-	data->instance_id = trader->GetInstanceID();
+	data->action    = action;
+	data->entity_id = trader->GetID();
+	data->trader_id = trader->CharacterID();
+	data->zone_id   = trader->GetZoneID();
 	strn0cpy(data->trader_name, trader->GetName(), sizeof(data->trader_name));
 
 	worldserver.SendPacket(outapp);

zone/worldserver.cpp

@@ -2005,15 +2005,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 
 		break;
 	}
-	case ServerOP_ReloadFindableLocations:
-	{
-		if (zone && zone->IsLoaded()) {
-			zone->SendReloadMessage("Findable Locations");
-			zone->ReloadFindableLocations();
-		}
-
-		break;
-	}
 	case ServerOP_ReloadBlockedSpells:
 	{
 		if (zone && zone->IsLoaded()) {
@@ -3951,7 +3942,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 					c.second->QueuePacket(outapp);
 					safe_delete(outapp);
 				}
-				if (zone && zone->GetZoneID() == Zones::BAZAAR && in->instance_id == zone->GetInstanceID()) {
+				if (zone && zone->GetZoneID() == Zones::BAZAAR) {
 					if (in->action == TraderOn) {
 						c.second->SendBecomeTrader(TraderOn, in->entity_id);
 					}

zone/zone.cpp

@@ -1200,7 +1200,6 @@ bool Zone::Init(bool is_static) {
 	LoadNPCEmotes(&npc_emote_list);
 	LoadAlternateAdvancement();
 	LoadBaseData();
-	LoadFindableLocations();
 	LoadMerchants();
 	LoadTempMerchantData();
 

zone/zone.h

@@ -47,7 +47,6 @@
 #include "../common/repositories/lootdrop_entries_repository.h"
 #include "../common/repositories/base_data_repository.h"
 #include "../common/repositories/skill_caps_repository.h"
-#include "../common/repositories/findable_location_repository.h"
 
 struct EXPModifier
 {
@@ -455,12 +454,6 @@ public:
 	void LoadBaseData();
 	void ReloadBaseData();
 
-	// Findable Locations
-	void LoadFindableLocations();
-	void ReloadFindableLocations();
-	void ClearFindableLocations();
-	void SendFindableLocations(Client* client = nullptr);
-
 
 private:
 	bool      allow_mercs;
@@ -525,9 +518,6 @@ private:
 
 	// Base Data
 	std::vector<BaseDataRepository::BaseData> m_base_data = { };
-
-	// Findable Locations
-	std::vector<FindableLocationRepository::FindableLocation> m_findable_locations = { };
 };
 
 #endif

zone/zone_finable_locations.cpp

@@ -1,42 +0,0 @@
-#include "zone.h"
-
-void Zone::LoadFindableLocations() {
-	m_findable_locations = content_db.LoadFindableLocations(GetShortName(), GetInstanceVersion());
-	if (m_findable_locations.empty()) {
-		LogInfo("No findable loacations loaded");
-		return;
-	}
-}
-
-void Zone::ReloadFindableLocations() {
-	ClearFindableLocations();
-	LoadFindableLocations();
-}
-
-void Zone::ClearFindableLocations() {
-	m_findable_locations.clear();
-}
-
-void Zone::SendFindableLocations(Client* client) {
-	if (m_findable_locations.empty()) {
-		return;
-	}
-	
-	size_t size = sizeof(uint32) + (m_findable_locations.size() * sizeof(FindableLocation_Struct));
-	auto outapp = new EQApplicationPacket(OP_SendFindableLocations, size);
-
-	outapp->WriteUInt32(m_findable_locations.size());
-
-	for (auto& location : m_findable_locations) {
-		outapp->WriteUInt32(location.type);
-		outapp->WriteSInt32(location.findable_id);
-		outapp->WriteSInt32(location.findable_sub_id);
-		outapp->WriteSInt32(location.zone_id);
-		outapp->WriteSInt32(location.zone_id_index);
-		outapp->WriteFloat(location.y);
-		outapp->WriteFloat(location.x);
-		outapp->WriteFloat(location.z);
-	}
-
-	client->FastQueuePacket(&outapp);
-}

zone/zonedb.cpp

@@ -50,8 +50,9 @@
 #include "../common/repositories/character_corpses_repository.h"
 #include "../common/repositories/character_corpse_items_repository.h"
 #include "../common/repositories/zone_repository.h"
+
 #include "../common/repositories/trader_repository.h"
-#include "../common/repositories/findable_location_repository.h"
+
 
 #include <ctime>
 #include <iostream>
@@ -2874,15 +2875,6 @@ void ZoneDatabase::UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, ui
 	CharacterAltCurrencyRepository::ReplaceOne(*this, e);
 }
 
-std::vector<FindableLocationRepository::FindableLocation> ZoneDatabase::LoadFindableLocations(const std::string& zone_name, int16 version) {
-	auto findable_locations = FindableLocationRepository::GetWhere(
-		*this, fmt::format(
-			"zone = '{}' AND (version = {} OR version = -1) {} ORDER BY id ASC",
-			zone_name, version, ContentFilterCriteria::apply()));
-
-	return findable_locations;
-}
-
 void ZoneDatabase::SaveBuffs(Client *client)
 {
 	CharacterBuffsRepository::DeleteWhere(

zone/zonedb.h

@@ -13,7 +13,6 @@
 #include "../common/repositories/doors_repository.h"
 #include "../common/races.h"
 #include "../common/repositories/npc_faction_entries_repository.h"
-#include "../common/repositories/findable_location_repository.h"
 
 #include "bot_database.h"
 
@@ -209,10 +208,10 @@ struct ZoneSpellsBlocked {
 };
 
 struct TraderCharges_Struct {
-	uint32 ItemID[80];
-	int32 SerialNumber[80];
-	uint32 ItemCost[80];
-	int32 Charges[80];
+	uint32 ItemID[EQ::invtype::BAZAAR_SIZE];
+	int32  SerialNumber[EQ::invtype::BAZAAR_SIZE];
+	uint32 ItemCost[EQ::invtype::BAZAAR_SIZE];
+	int32  Charges[EQ::invtype::BAZAAR_SIZE];
 };
 
 const int MaxMercStanceID = 9;
@@ -639,9 +638,6 @@ public:
 	void LoadAltCurrencyValues(uint32 char_id, std::map<uint32, uint32> &currency);
 	void UpdateAltCurrencyValue(uint32 char_id, uint32 currency_id, uint32 value);
 
-	/* Findable Locations */
-	std::vector<FindableLocationRepository::FindableLocation> LoadFindableLocations(const std::string& zone_name, int16 version);
-
 	/*
 		* Misc stuff.
 		* PLEASE DO NOT ADD TO THIS COLLECTION OF CRAP UNLESS YOUR METHOD