Add slot ID conversions

Cleanup
2026-05-22 16:28:28 +00:00 · 2024-11-21 23:29:10 -05:00 · 2024-11-21 23:29:10 -05:00 · 2024-11-21 23:29:10 -05:00 · 2024-11-21 23:29:10 -05:00 · 2024-11-21 23:29:10 -05:00
406 changed files with 20462 additions and 48843 deletions
@@ -68,4 +68,3 @@ compile_flags.txt

 # CMake Files
 cmake-build-relwithdebinfo/*
-skill-caps.diff
@@ -1,202 +1,3 @@
-## [22.62.2] 2/1/2025
-
-### Fixes
-
-* Add price change check to the Bazaar Search Window purchase mechanics ([#4632](https://github.com/EQEmu/Server/pull/4632)) @neckkola 2025-02-01
-* NewBazaar Search Consumables ([#4631](https://github.com/EQEmu/Server/pull/4631)) @neckkola 2025-02-01
-* Update the shard bazaar search feature ([#4630](https://github.com/EQEmu/Server/pull/4630)) @neckkola 2025-02-01
-
-### Memory Leak
-
-* Revert " Change raw pointer to unique_ptr to avoid potential leak in dbg stream " ([#4616](https://github.com/EQEmu/Server/pull/4616)) @Akkadius 2025-01-27
-
-### Performance
-
-* Significantly Improve Client Network Resends ([#4629](https://github.com/EQEmu/Server/pull/4629)) @Akkadius 2025-02-01
-
-## [22.62.1] 1/27/2025
-
-### Memory Leak
-
-* Revert "Change raw pointer to unique_ptr to avoid potential leak in dbg stream" ([#4616](https://github.com/EQEmu/Server/pull/4616)) @Akkadius 2025-01-27
-
-### Performance
-
-* Re-use ClientUpdate packet memory ([#4619](https://github.com/EQEmu/Server/pull/4619)) @Akkadius 2025-01-27
-* Re-use OP_Animation packet ([#4621](https://github.com/EQEmu/Server/pull/4621)) @Akkadius 2025-01-27
-* Re-use OP_Damage packet memory ([#4625](https://github.com/EQEmu/Server/pull/4625)) @Akkadius 2025-01-27
-* Re-use OP_HPUpdate packet memory ([#4622](https://github.com/EQEmu/Server/pull/4622)) @Akkadius 2025-01-27
-* Re-use OP_PlayerStateAdd packet memory ([#4626](https://github.com/EQEmu/Server/pull/4626)) @Akkadius 2025-01-27
-* Re-use OP_SendFindableNPCs packet memory ([#4623](https://github.com/EQEmu/Server/pull/4623)) @Akkadius 2025-01-27
-
-### Repop
-
-* Make #repop instant ([#4620](https://github.com/EQEmu/Server/pull/4620)) @Akkadius 2025-01-27
-
-## [22.62.0] 1/26/2025
-
-### Bazaar
-
-* Improve Bazaar Search Performance ([#4615](https://github.com/EQEmu/Server/pull/4615)) @neckkola 2025-01-27
-
-### CLI
-
-* Add --skip-backup to world database:updates ([#4605](https://github.com/EQEmu/Server/pull/4605)) @Akkadius 2025-01-22
-
-### Database
-
-* Change npc_types walkspeed to be of type float ([#4589](https://github.com/EQEmu/Server/pull/4589)) @Akkadius 2025-01-07
-
-### Databuckets
-
-* Add Account Scoped Databuckets ([#4603](https://github.com/EQEmu/Server/pull/4603)) @Akkadius 2025-01-21
-* Implement Nested Databuckets ([#4604](https://github.com/EQEmu/Server/pull/4604)) @Akkadius 2025-01-27
-
-### Feature
-
-* Add Alternate Bazaar Search Approach ([#4600](https://github.com/EQEmu/Server/pull/4600)) @neckkola 2025-01-20
-* Add Support for Item Previews ([#4599](https://github.com/EQEmu/Server/pull/4599)) @Kinglykrab 2025-01-20
-* Evolving Item Support for RoF2 ([#4496](https://github.com/EQEmu/Server/pull/4496)) @neckkola 2025-01-20
-* Implement Custom Pet Names ([#4594](https://github.com/EQEmu/Server/pull/4594)) @catapultam-habeo 2025-01-22
-
-### Fixes
-
-* Add Bazaar BulkSendTrader Limit for RoF2 ([#4590](https://github.com/EQEmu/Server/pull/4590)) @neckkola 2025-01-08
-* CLI help menu from parsing correctly in World  @Akkadius 2025-01-22
-* Delete later in RemoveItem second case  @Akkadius 2025-01-25
-* Fix query error in character_evolving_items  @Akkadius 2025-01-21
-* Repair a memory leak in #summonitem ([#4591](https://github.com/EQEmu/Server/pull/4591)) @neckkola 2025-01-08
-* Repair an incorrect safe_delete call memory leak. ([#4588](https://github.com/EQEmu/Server/pull/4588)) @neckkola 2025-01-07
-* Repair levers opening the Evolving XP Transfer Window ([#4607](https://github.com/EQEmu/Server/pull/4607)) @neckkola 2025-01-23
-* Update a few Bazaar RoF2 routines for memory leaks ([#4592](https://github.com/EQEmu/Server/pull/4592)) @neckkola 2025-01-08
-* Update database version to match manifest  @Akkadius 2025-01-21
-* Update trader add/remove packets to limits for RoF2 ([#4595](https://github.com/EQEmu/Server/pull/4595)) @neckkola 2025-01-19
-
-### Linux
-
-* Implement KSM Kernel Samepage Merging with Maps ([#4601](https://github.com/EQEmu/Server/pull/4601)) @Akkadius 2025-01-21
-
-### Memory Leak
-
-* Change raw pointer to unique_ptr to avoid potential leak in dbg stream ([#4616](https://github.com/EQEmu/Server/pull/4616)) @KimLS 2025-01-27
-* Fix leak in BuyTraderItemOutsideBazaar ([#4609](https://github.com/EQEmu/Server/pull/4609)) @Akkadius 2025-01-24
-* Fix leak in Client::RemoveDuplicateLore ([#4614](https://github.com/EQEmu/Server/pull/4614)) @Akkadius 2025-01-24
-* Fix leak in NPC::RemoveItem ([#4611](https://github.com/EQEmu/Server/pull/4611)) @Akkadius 2025-01-24
-* Fix leak in QuestManager::varlink ([#4610](https://github.com/EQEmu/Server/pull/4610)) @Akkadius 2025-01-24
-* Fix leaks in Client::Handle_OP_AugmentItem ([#4612](https://github.com/EQEmu/Server/pull/4612)) @Akkadius 2025-01-24
-* Fix memory leak in Client::Handle_OP_MoveMultipleItems ([#4613](https://github.com/EQEmu/Server/pull/4613)) @Akkadius 2025-01-24
-
-### Performance
-
-* Client / NPC Position Update Optimizations ([#4602](https://github.com/EQEmu/Server/pull/4602)) @Akkadius 2025-01-21
-
-### Quest API
-
-* Add SetAAEXPPercentage to Perl/Lua ([#4597](https://github.com/EQEmu/Server/pull/4597)) @Kinglykrab 2025-01-19
-
-### Zone
-
-* Implement zone player count sharding ([#4536](https://github.com/EQEmu/Server/pull/4536)) @Akkadius 2025-01-08
-
-## [22.61.0] 1/6/2025
-
-### Bots
-
-* Fix AA ranks to account for level ([#4567](https://github.com/EQEmu/Server/pull/4567)) @nytmyr 2024-12-07
-
-### Code
-
-* Convert Event Parses to Single Line ([#4569](https://github.com/EQEmu/Server/pull/4569)) @Kinglykrab 2024-12-12
-* Fix GM Flag Spell Restriction Bypasses ([#4571](https://github.com/EQEmu/Server/pull/4571)) @Kinglykrab 2025-01-06
-* Remove Unused Group Methods ([#4559](https://github.com/EQEmu/Server/pull/4559)) @Kinglykrab 2024-12-12
-
-### Commands
-
-* Add #find bot Subcommand ([#4563](https://github.com/EQEmu/Server/pull/4563)) @Kinglykrab 2024-12-12
-* Add #find ldon_theme Subcommand ([#4564](https://github.com/EQEmu/Server/pull/4564)) @Kinglykrab 2024-12-12
-* Fix #copycharacter ([#4582](https://github.com/EQEmu/Server/pull/4582)) @Akkadius 2025-01-06
-
-### Databuckets
-
-* Improved Reliability and Performance of Databuckets ([#4562](https://github.com/EQEmu/Server/pull/4562)) @Akkadius 2024-12-12
-
-### Feature
-
-* Enable bazaar window 'Find Trader' functionality ([#4560](https://github.com/EQEmu/Server/pull/4560)) @neckkola 2024-12-12
-
-### Filesystem
-
-* Path Manager Improvements ([#4557](https://github.com/EQEmu/Server/pull/4557)) @Akkadius 2025-01-06
-
-### Fixes
-
-* Allow Items in ROF2 to Stack to 32,767 ([#4556](https://github.com/EQEmu/Server/pull/4556)) @Kinglykrab 2024-12-12
-* Fix EVENT_COMBAT on NPC Death ([#4558](https://github.com/EQEmu/Server/pull/4558)) @Kinglykrab 2024-11-28
-* Guild Membership Update Fix ([#4581](https://github.com/EQEmu/Server/pull/4581)) @neckkola 2025-01-06
-* Guild creation to propagate across zones ([#4575](https://github.com/EQEmu/Server/pull/4575)) @neckkola 2025-01-06
-* Repair a EQEMUConfig Memory Leak ([#4584](https://github.com/EQEmu/Server/pull/4584)) @neckkola 2025-01-06
-* Repair a LoadNPCEmote MemoryLeak ([#4586](https://github.com/EQEmu/Server/pull/4586)) @neckkola 2025-01-06
-* Repair a memory leak in GuildsList ([#4585](https://github.com/EQEmu/Server/pull/4585)) @neckkola 2025-01-06
-* Resolve a client crash when logging in or zoning ([#4572](https://github.com/EQEmu/Server/pull/4572)) @neckkola 2024-12-14
-
-### Groups
-
-* Fix AmIMainAssist incorrectly checking for MainTankName ([#4565](https://github.com/EQEmu/Server/pull/4565)) @nytmyr 2024-12-04
-
-### Inventory
-
-* Add GetInventorySlots() Method ([#4566](https://github.com/EQEmu/Server/pull/4566)) @Kinglykrab 2025-01-06
-
-### Logs
-
-* Improve Crash log defaults ([#4579](https://github.com/EQEmu/Server/pull/4579)) @Akkadius 2025-01-06
-
-### Maps
-
-* Fix broken Map MMFS implementation ([#4576](https://github.com/EQEmu/Server/pull/4576)) @Akkadius 2025-01-06
-
-### Network
-
-* Prune / disconnect TCP connections gracefully ([#4574](https://github.com/EQEmu/Server/pull/4574)) @Akkadius 2025-01-06
-
-### Rules
-
-* Add rules for requiring custom files from client ([#4561](https://github.com/EQEmu/Server/pull/4561)) @knervous 2024-12-12
-
-## [22.60.0] 11/25/2024
-
-### Bazaar
-
-* 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
@@ -37,9 +37,6 @@ IF(EQEMU_ADD_PROFILER)
 	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
 ENDIF(EQEMU_ADD_PROFILER)

-IF(USE_MAP_MMFS)
-	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
-ENDIF (USE_MAP_MMFS)

 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
@@ -36,14 +36,12 @@
 #include "../../common/file.h"
 #include "../../common/events/player_event_logs.h"
 #include "../../common/skill_caps.h"
-#include "../../common/evolving_items.h"

-EQEmuLogSys          LogSys;
-WorldContentService  content_service;
-ZoneStore            zone_store;
-PathManager          path;
-PlayerEventLogs      player_event_logs;
-EvolvingItemsManager evolving_items_manager;
+EQEmuLogSys         LogSys;
+WorldContentService content_service;
+ZoneStore           zone_store;
+PathManager         path;
+PlayerEventLogs     player_event_logs;

 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
@@ -30,14 +30,12 @@
 #include "../../common/repositories/base_data_repository.h"
 #include "../../common/file.h"
 #include "../../common/events/player_event_logs.h"
-#include "../../common/evolving_items.h"

-EQEmuLogSys          LogSys;
-WorldContentService  content_service;
-ZoneStore            zone_store;
-PathManager          path;
-PlayerEventLogs      player_event_logs;
-EvolvingItemsManager evolving_items_manager;
+EQEmuLogSys         LogSys;
+WorldContentService content_service;
+ZoneStore           zone_store;
+PathManager         path;
+PlayerEventLogs     player_event_logs;

 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -39,7 +39,6 @@ SET(common_sources
    event_sub.cpp
    events/player_event_logs.cpp
    events/player_event_discord_formatter.cpp
-    evolving_items.cpp
    expedition_lockout_timer.cpp
    extprofile.cpp
    discord/discord_manager.cpp
@@ -89,7 +88,6 @@ SET(common_sources
    skills.cpp
    skill_caps.cpp
    spdat.cpp
-    spdat_bot.cpp
    strings.cpp
    struct_strategy.cpp
    textures.cpp
@@ -99,7 +97,6 @@ SET(common_sources
    json/json.hpp
    json/jsoncpp.cpp
    zone_store.cpp
-    memory/ksm.hpp
    net/console_server.cpp
    net/console_server_connection.cpp
    net/crc32.cpp
@@ -175,7 +172,6 @@ SET(repositories
    repositories/base/base_character_currency_repository.h
    repositories/base/base_character_data_repository.h
    repositories/base/base_character_disciplines_repository.h
-    repositories/base/base_character_evolving_items_repository.h
    repositories/base/base_character_expedition_lockouts_repository.h
    repositories/base/base_character_exp_modifiers_repository.h
    repositories/base/base_character_inspect_messages_repository.h
@@ -222,7 +218,6 @@ SET(repositories
    repositories/base/base_faction_list_repository.h
    repositories/base/base_faction_list_mod_repository.h
    repositories/base/base_faction_values_repository.h
-	repositories/base/base_find_location_repository.h
    repositories/base/base_fishing_repository.h
    repositories/base/base_forage_repository.h
    repositories/base/base_friends_repository.h
@@ -245,7 +240,6 @@ SET(repositories
    repositories/base/base_inventory_snapshots_repository.h
    repositories/base/base_ip_exemptions_repository.h
    repositories/base/base_items_repository.h
-    repositories/base/base_items_evolving_details_repository.h
    repositories/base/base_ldon_trap_entries_repository.h
    repositories/base/base_ldon_trap_templates_repository.h
    repositories/base/base_level_exp_mods_repository.h
@@ -283,20 +277,8 @@ SET(repositories
    repositories/base/base_pets_equipmentset_repository.h
    repositories/base/base_pets_equipmentset_entries_repository.h
    repositories/base/base_player_titlesets_repository.h
-    repositories/base/base_player_event_aa_purchase_repository.h
-    repositories/base/base_player_event_killed_npc_repository.h
-    repositories/base/base_player_event_killed_named_npc_repository.h
-    repositories/base/base_player_event_killed_raid_npc_repository.h
    repositories/base/base_player_event_log_settings_repository.h
    repositories/base/base_player_event_logs_repository.h
-    repositories/base/base_player_event_loot_items_repository.h
-    repositories/base/base_player_event_merchant_purchase_repository.h
-    repositories/base/base_player_event_merchant_sell_repository.h
-    repositories/base/base_player_event_npc_handin_repository.h
-    repositories/base/base_player_event_npc_handin_entries_repository.h
-    repositories/base/base_player_event_speech_repository.h
-    repositories/base/base_player_event_trade_repository.h
-    repositories/base/base_player_event_trade_entries_repository.h
    repositories/base/base_quest_globals_repository.h
    repositories/base/base_raid_details_repository.h
    repositories/base/base_raid_members_repository.h
@@ -373,7 +355,6 @@ SET(repositories
    repositories/character_currency_repository.h
    repositories/character_data_repository.h
    repositories/character_disciplines_repository.h
-    repositories/character_evolving_items_repository.h
    repositories/character_expedition_lockouts_repository.h
    repositories/character_exp_modifiers_repository.h
    repositories/character_inspect_messages_repository.h
@@ -420,7 +401,6 @@ SET(repositories
    repositories/faction_list_repository.h
    repositories/faction_list_mod_repository.h
    repositories/faction_values_repository.h
-	repositories/find_location_repository.h
    repositories/fishing_repository.h
    repositories/forage_repository.h
    repositories/friends_repository.h
@@ -443,7 +423,6 @@ SET(repositories
    repositories/inventory_snapshots_repository.h
    repositories/ip_exemptions_repository.h
    repositories/items_repository.h
-    repositories/items_evolving_details_repository.h
    repositories/ldon_trap_entries_repository.h
    repositories/ldon_trap_templates_repository.h
    repositories/level_exp_mods_repository.h
@@ -481,20 +460,8 @@ SET(repositories
    repositories/pets_equipmentset_repository.h
    repositories/pets_equipmentset_entries_repository.h
    repositories/player_titlesets_repository.h
-    repositories/player_event_aa_purchase_repository.h
-    repositories/player_event_killed_npc_repository.h
-    repositories/player_event_killed_named_npc_repository.h
-    repositories/player_event_killed_raid_npc_repository.h
    repositories/player_event_log_settings_repository.h
    repositories/player_event_logs_repository.h
-    repositories/player_event_loot_items_repository.h
-    repositories/player_event_merchant_purchase_repository.h
-    repositories/player_event_merchant_sell_repository.h
-    repositories/player_event_npc_handin_repository.h
-    repositories/player_event_npc_handin_entries_repository.h
-    repositories/player_event_speech_repository.h
-    repositories/player_event_trade_repository.h
-    repositories/player_event_trade_entries_repository.h
    repositories/quest_globals_repository.h
    repositories/raid_details_repository.h
    repositories/raid_members_repository.h
@@ -588,7 +555,6 @@ SET(common_headers
    events/player_event_discord_formatter.h
    events/player_events.h
    event_sub.h
-    evolving_items.h
    expedition_lockout_timer.h
    extprofile.h
    faction.h
@@ -6,17 +6,15 @@

 std::vector<BazaarSearchResultsFromDB_Struct>
 Bazaar::GetSearchResults(
-	Database &db,
-	Database &content_db,
+	SharedDatabase &db,
 	BazaarSearchCriteria_Struct search,
-	uint32 char_zone_id,
-	int32 char_zone_instance_id
+	uint32 char_zone_id
 )
 {
 	LogTrading(
 		"Searching for items with search criteria - item_name [{}] min_cost [{}] max_cost [{}] min_level [{}] "
 		"max_level [{}] max_results [{}] prestige [{}] augment [{}] trader_entity_id [{}] trader_id [{}] "
-		"search_scope [{}] char_zone_id [{}], char_zone_instance_id [{}]",
+		"search_scope [{}] char_zone_id [{}]",
 		search.item_name,
 		search.min_cost,
 		search.max_cost,
@@ -28,173 +26,26 @@ Bazaar::GetSearchResults(
 		search.trader_entity_id,
 		search.trader_id,
 		search.search_scope,
-		char_zone_id,
-		char_zone_instance_id
+		char_zone_id
 	);

-	static std::map<uint8, uint32> item_slot_searches_new = {
-		{EQ::invslot::slotCharm,       1},
-		{EQ::invslot::slotEar1,        2},
-		{EQ::invslot::slotHead,        4},
-		{EQ::invslot::slotFace,        8},
-		{EQ::invslot::slotEar2,        16},
-		{EQ::invslot::slotNeck,        32},
-		{EQ::invslot::slotShoulders,   64},
-		{EQ::invslot::slotArms,        128},
-		{EQ::invslot::slotBack,        256},
-		{EQ::invslot::slotWrist1,      512},
-		{EQ::invslot::slotWrist2,      1024},
-		{EQ::invslot::slotRange,       2048},
-		{EQ::invslot::slotHands,       4096},
-		{EQ::invslot::slotPrimary,     8192},
-		{EQ::invslot::slotSecondary,   16384},
-		{EQ::invslot::slotFinger1,     32768},
-		{EQ::invslot::slotFinger2,     65536},
-		{EQ::invslot::slotChest,       131072},
-		{EQ::invslot::slotLegs,        262144},
-		{EQ::invslot::slotFeet,        524288},
-		{EQ::invslot::slotWaist,       1048576},
-		{EQ::invslot::slotPowerSource, 2097152},
-		{EQ::invslot::slotAmmo,        4194304},
-	};
-
-	struct ItemSearchType {
-		EQ::item::ItemType type;
-		std::string        condition;
-	};
-
-	std::vector<ItemSearchType> item_search_types_new = {
-		{EQ::item::ItemType::ItemTypeBook,                 " AND (items.itemclass = 2 or items.itemclass = 31)"},
-		{EQ::item::ItemType::ItemTypeContainer,            " AND (items.itemclass = 1 or items.itemclass = 67)"},
-		{EQ::item::ItemType::ItemTypeAllEffects,           " AND (items.scrolleffect > 0 && items.scrolleffect < 65000)"},
-		{EQ::item::ItemType::ItemTypeUnknown9,             " AND items.worneffect = 998"},
-		{EQ::item::ItemType::ItemTypeUnknown10,            " AND (items.worneffect >= 1298 && items.worneffect <= 1307)"},
-		{EQ::item::ItemType::ItemTypeFocusEffect,          " AND items.focuseffect > 0"},
-		{EQ::item::ItemType::ItemTypeArmor,                " AND items.itemtype = 10"},
-		{EQ::item::ItemType::ItemType1HBlunt,              " AND items.itemtype = 3"},
-		{EQ::item::ItemType::ItemType1HPiercing,           " AND items.itemtype = 2"},
-		{EQ::item::ItemType::ItemType1HSlash,              " AND items.itemtype = 0"},
-		{EQ::item::ItemType::ItemType2HBlunt,              " AND items.itemtype = 4"},
-		{EQ::item::ItemType::ItemType2HSlash,              " AND items.itemtype = 1"},
-		{EQ::item::ItemType::ItemTypeBow,                  " AND items.itemtype = 5"},
-		{EQ::item::ItemType::ItemTypeShield,               " AND items.itemtype = 8"},
-		{EQ::item::ItemType::ItemTypeMisc,                 " AND items.itemtype = 11"},
-		{EQ::item::ItemType::ItemTypeFood,                 " AND items.itemtype = 14"},
-		{EQ::item::ItemType::ItemTypeDrink,                " AND items.itemtype = 15"},
-		{EQ::item::ItemType::ItemTypeLight,                " AND items.itemtype = 16"},
-		{EQ::item::ItemType::ItemTypeCombinable,           " AND items.itemtype = 17"},
-		{EQ::item::ItemType::ItemTypeBandage,              " AND items.itemtype = 18"},
-		{EQ::item::ItemType::ItemTypeSmallThrowing,        " AND (items.itemtype = 19 OR items.itemtype = 7)"},
-		{EQ::item::ItemType::ItemTypeSpell,                " AND items.itemtype = 20"},
-		{EQ::item::ItemType::ItemTypePotion,               " AND items.itemtype = 21"},
-		{EQ::item::ItemType::ItemTypeBrassInstrument,      " AND items.itemtype = 25"},
-		{EQ::item::ItemType::ItemTypeWindInstrument,       " AND items.itemtype = 23"},
-		{EQ::item::ItemType::ItemTypeStringedInstrument,   " AND items.itemtype = 24"},
-		{EQ::item::ItemType::ItemTypePercussionInstrument, " AND items.itemtype = 26"},
-		{EQ::item::ItemType::ItemTypeArrow,                " AND items.itemtype = 27"},
-		{EQ::item::ItemType::ItemTypeJewelry,              " AND items.itemtype = 29"},
-		{EQ::item::ItemType::ItemTypeNote,                 " AND items.itemtype = 32"},
-		{EQ::item::ItemType::ItemTypeKey,                  " AND items.itemtype = 33"},
-		{EQ::item::ItemType::ItemType2HPiercing,           " AND items.itemtype = 35"},
-		{EQ::item::ItemType::ItemTypeAlcohol,              " AND items.itemtype = 38"},
-		{EQ::item::ItemType::ItemTypeMartial,              " AND items.itemtype = 45"},
-		{EQ::item::ItemType::ItemTypeAugmentation,         " AND items.itemtype = 54"},
-		{EQ::item::ItemType::ItemTypeAlternateAbility,     " AND items.itemtype = 57"},
-		{EQ::item::ItemType::ItemTypeCount,                " AND items.itemtype = 65"},
-		{EQ::item::ItemType::ItemTypeCollectible,          " AND items.itemtype = 66"}
-	};
-
-	// item stat searches
-	struct ItemStatSearch {
-		std::string           query_string;
-		EQ::skills::SkillType skill_type;
-	};
-
-	std::map<uint32, ItemStatSearch> item_stat_searches_new = {
-		{STAT_AC,                  {" items.ac" ,          static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_AGI,                 {" items.aagi",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_CHA,                 {" items.acha",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_DEX,                 {" items.adex",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_INT,                 {" items.aint",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_STA,                 {" items.asta",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_STR,                 {" items.astr",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_WIS,                 {" items.awis",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_COLD,                {" items.cr",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_DISEASE,             {" items.dr",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_FIRE,                {" items.fr",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_MAGIC,               {" items.mr",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_POISON,              {" items.pr",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HP,                  {" items.hp",           static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_MANA,                {" items.mana",         static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_ENDURANCE,           {" items.endur",        static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_ATTACK,              {" items.attack",       static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HP_REGEN,            {" items.regen",        static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_MANA_REGEN,          {" items.manaregen",    static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HASTE,               {" items.haste",        static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_DAMAGE_SHIELD,       {" items.damageshield", static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_DS_MITIGATION,       {" items.dsmitigation", static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEAL_AMOUNT,         {" items.healamt",      static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_SPELL_DAMAGE,        {" items.spelldmg",     static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_CLAIRVOYANCE,        {" items.clairvoyance", static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_AGILITY,      {" items.heroic_agi",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_CHARISMA,     {" items.heroic_cha",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_DEXTERITY,    {" items.heroic_dex",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_INTELLIGENCE, {" items.heroic_int",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_STAMINA,      {" items.heroic_sta",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_STRENGTH,     {" items.heroic_str",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_HEROIC_WISDOM,       {" items.heroic_wis",   static_cast<EQ::skills::SkillType>(0)} },
-		{STAT_BASH,                {" items.skillmodvalue", EQ::skills::SkillBash}                },
-		{STAT_BACKSTAB,            {" items.backstabdmg",   EQ::skills::SkillBackstab}            },
-		{STAT_DRAGON_PUNCH,        {" items.skillmodvalue", EQ::skills::SkillDragonPunch}         },
-		{STAT_EAGLE_STRIKE,        {" items.skillmodvalue", EQ::skills::SkillEagleStrike}         },
-		{STAT_FLYING_KICK,         {" items.skillmodvalue", EQ::skills::SkillFlyingKick}          },
-		{STAT_KICK,                {" items.skillmodvalue", EQ::skills::SkillKick}                },
-		{STAT_ROUND_KICK,          {" items.skillmodvalue", EQ::skills::SkillRoundKick}           },
-		{STAT_TIGER_CLAW,          {" items.skillmodvalue", EQ::skills::SkillTigerClaw}           },
-		{STAT_FRENZY,              {" items.skillmodvalue", EQ::skills::SkillFrenzy}              },
-	};
-
-	bool        convert = false;
-	std::string search_criteria_trader("TRUE");
-	std::string field_criteria_items("FALSE");
-	std::string where_criteria_items(" TRUE ");
+	std::string search_criteria_trader("TRUE ");

 	if (search.search_scope == NonRoFBazaarSearchScope) {
 		search_criteria_trader.append(
 			fmt::format(
-				" AND trader.char_entity_id = {} AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
+				" AND trader.char_entity_id = {} AND trader.char_zone_id = {}",
 				search.trader_entity_id,
-				Zones::BAZAAR,
-				char_zone_instance_id
+				Zones::BAZAAR
 			)
 		);
 	}
 	else if (search.search_scope == Local_Scope) {
-		search_criteria_trader.append(fmt::format(
-			" AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
-			char_zone_id,
-			char_zone_instance_id)
-		);
+		search_criteria_trader.append(fmt::format(" AND trader.char_zone_id = {}", char_zone_id));
 	}
 	else if (search.trader_id > 0) {
-		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
-			if (search.trader_id >= TraderRepository::TRADER_CONVERT_ID) {
-				convert = true;
-				search_criteria_trader.append(fmt::format(
-					" AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
-					Zones::BAZAAR,
-					search.trader_id - TraderRepository::TRADER_CONVERT_ID)
-				);
-			}
-			else {
-				search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
-			}
-		}
-		else {
-			search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
-		}
+		search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
 	}
-
 	if (search.min_cost != 0) {
 		search_criteria_trader.append(fmt::format(" AND trader.item_cost >= {}", search.min_cost * 1000));
 	}
@@ -202,124 +53,300 @@ Bazaar::GetSearchResults(
 		search_criteria_trader.append(fmt::format(" AND trader.item_cost <= {}", (uint64) search.max_cost * 1000));
 	}

-	if (search.slot != std::numeric_limits<uint32>::max()) {
-		if (item_slot_searches_new.contains(search.slot)) {
-			where_criteria_items.append(
-				fmt::format(" AND items.slots & {0} = {0}", item_slot_searches_new[search.slot]));
-		}
-	}
+	// not yet implemented
+	//	if (search.prestige != 0) {
+	// 	   0xffffffff prestige only, 0xfffffffe non-prestige, 0 all
+	//		search_criteria.append(fmt::format(" AND items.type = {} ", search.prestige));
+	//	}

-	if (search.type != std::numeric_limits<uint32>::max()) {
-		for (auto const &[type, condition]: item_search_types_new) {
-			if (type == search.type) {
-				where_criteria_items.append(condition);
-				break;
-			}
-		}
-	}
-
-	if (search.race != std::numeric_limits<uint32>::max()) {
-		where_criteria_items.append(
-			fmt::format(" AND items.races & {0} = {0}", GetPlayerRaceBit(GetRaceIDFromPlayerRaceValue(search.race))));
-	}
-
-	if (search._class != std::numeric_limits<uint32>::max()) {
-		where_criteria_items.append(fmt::format(" AND items.classes & {0} = {0}", GetPlayerClassBit(search._class)));
-	}
-
-	if (search.item_stat != std::numeric_limits<uint32>::max()) {
-		if (item_stat_searches_new.contains(search.item_stat)) {
-			field_criteria_items = fmt::format("{}", item_stat_searches_new[search.item_stat].query_string);
-			if (item_stat_searches_new[search.item_stat].skill_type) {
-				where_criteria_items.append(
-					fmt::format(" AND items.skillmodtype = {} ", item_stat_searches_new[search.item_stat].skill_type));
-			}
-			else {
-				where_criteria_items.append(
-					fmt::format(" AND {} > 0 ", item_stat_searches_new[search.item_stat].query_string));
-			}
-		}
-	}
-
-	if (search.augment) {
-		where_criteria_items.append(fmt::format(
-			" AND (items.augslot1type = {0} OR "
-			"items.augslot2type = {0} OR "
-			"items.augslot3type = {0} OR "
-			"items.augslot4type = {0} OR "
-			"items.augslot5type = {0} OR "
-			"items.augslot6type = {0})",
-			search.augment)
-		);
-	}
-
-	if (search.min_level != 1) {
-		where_criteria_items.append(fmt::format(" AND items.reclevel >= {}", search.min_level));
-	}
-
-	if (search.max_level != 100) {
-		where_criteria_items.append(fmt::format(" AND items.reclevel <= {}", search.max_level));
-	}
-
-	std::vector<BazaarSearchResultsFromDB_Struct> all_entries;
-	std::vector<std::string>                      trader_items_ids{};
-
-	auto const trader_results = TraderRepository::GetBazaarTraderDetails(db, search_criteria_trader);
-	if (trader_results.empty()) {
-		LogTradingDetail("Bazaar - No traders found in bazaar search.");
-		return all_entries;
-	}
-
-	for (auto const &i: trader_results) {
-		trader_items_ids.push_back(std::to_string(i.trader.item_id));
-	}
-
-	auto const item_results = ItemsRepository::GetItemsForBazaarSearch(
-		content_db,
-		trader_items_ids,
-		std::string(search.item_name),
-		field_criteria_items,
-		where_criteria_items
+	std::string query = fmt::format(
+		"SELECT COUNT(item_id), trader.char_id, trader.item_id, trader.item_sn, trader.item_charges, trader.item_cost, "
+		"trader.slot_id, SUM(trader.item_charges), trader.char_zone_id, trader.char_entity_id, character_data.name, "
+		"aug_slot_1, aug_slot_2, aug_slot_3, aug_slot_4, aug_slot_5, aug_slot_6 "
+		"FROM trader, character_data "
+		"WHERE {} AND trader.char_id = character_data.id "
+		"GROUP BY trader.item_sn, trader.item_charges, trader.char_id",
+		search_criteria_trader.c_str()
 	);

-	if (item_results.empty()) {
-		LogTradingDetail("Bazaar - No items found in bazaar search.");
+	std::vector<BazaarSearchResultsFromDB_Struct> all_entries;
+
+	auto results = db.QueryDatabase(query);
+
+	if (!results.Success()) {
 		return all_entries;
 	}

-	all_entries.reserve(trader_results.size());
+	struct ItemSearchType {
+		EQ::item::ItemType type;
+		bool               condition;
+	};

-	for (auto const& t:trader_results) {
-		if (!item_results.contains(t.trader.item_id)) {
+	struct AddititiveSearchCriteria {
+		bool should_check;
+		bool condition;
+	};
+
+	for (auto row: results) {
+		BazaarSearchResultsFromDB_Struct r{};
+
+		r.item_id = Strings::ToInt(row[2]);
+		r.charges = Strings::ToInt(row[4]);
+
+		auto item = db.GetItem(r.item_id);
+		if (!item) {
 			continue;
 		}

-		BazaarSearchResultsFromDB_Struct r{};
-		r.count                   = 1;
-		r.trader_id               = t.trader.char_id;
-		r.serial_number           = t.trader.item_sn;
-		r.cost                    = t.trader.item_cost;
-		r.slot_id                 = t.trader.slot_id;
-		r.charges                 = t.trader.item_charges;
-		r.stackable               = item_results.at(t.trader.item_id).stackable;
-		r.icon_id                 = item_results.at(t.trader.item_id).icon;
-		r.trader_zone_id          = t.trader.char_zone_id;
-		r.trader_zone_instance_id = t.trader.char_zone_instance_id;
-		r.trader_entity_id        = t.trader.char_entity_id;
-		r.serial_number_RoF       = fmt::format("{:016}\0", t.trader.item_sn);
-		r.item_name               = fmt::format("{:.63}\0", item_results.at(t.trader.item_id).name);
-		r.trader_name             = fmt::format("{:.63}\0", t.trader_name);
-		r.item_stat               = item_results.at(t.trader.item_id).stats;
+		uint32 aug_slot_1 = Strings::ToUnsignedInt(row[11]);
+		uint32 aug_slot_2 = Strings::ToUnsignedInt(row[12]);
+		uint32 aug_slot_3 = Strings::ToUnsignedInt(row[13]);
+		uint32 aug_slot_4 = Strings::ToUnsignedInt(row[14]);
+		uint32 aug_slot_5 = Strings::ToUnsignedInt(row[15]);
+		uint32 aug_slot_6 = Strings::ToUnsignedInt(row[16]);

-		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
-			if (convert ||
-				char_zone_id != Zones::BAZAAR ||
-				(char_zone_id == Zones::BAZAAR && r.trader_zone_instance_id != char_zone_instance_id)
-				) {
-				r.trader_id = TraderRepository::TRADER_CONVERT_ID + r.trader_zone_instance_id;
-				}
+		std::unique_ptr<EQ::ItemInstance> inst(
+			db.CreateItem(
+				item,
+				r.charges,
+				aug_slot_1,
+				aug_slot_2,
+				aug_slot_3,
+				aug_slot_4,
+				aug_slot_5,
+				aug_slot_6
+			)
+		);
+
+		if (!inst->GetItem()) {
+			continue;
 		}

+		r.count             = Strings::ToInt(row[0]);
+		r.trader_id         = Strings::ToInt(row[1]);
+		r.serial_number     = Strings::ToInt(row[3]);
+		r.cost              = Strings::ToInt(row[5]);
+		r.slot_id           = Strings::ToInt(row[6]);
+		r.sum_charges       = Strings::ToInt(row[7]);
+		r.stackable         = item->Stackable;
+		r.icon_id           = item->Icon;
+		r.trader_zone_id    = Strings::ToInt(row[8]);
+		r.trader_entity_id  = Strings::ToInt(row[9]);
+		r.serial_number_RoF = fmt::format("{:016}\0", Strings::ToInt(row[3]));
+		r.item_name         = fmt::format("{:.63}\0", item->Name);
+		r.trader_name       = fmt::format("{:.63}\0", std::string(row[10]).c_str());
+
+		LogTradingDetail(
+			"Searching against item [{}] ({}) for trader [{}]",
+			item->Name,
+			item->ID,
+			r.trader_name
+		);
+
+		// item stat searches
+		std::map<uint32, uint32> item_stat_searches = {
+
+			{STAT_AC,                  inst->GetItemArmorClass(true)},
+			{STAT_AGI,                 static_cast<uint32>(inst->GetItemAgi(true))},
+			{STAT_CHA,                 static_cast<uint32>(inst->GetItemCha(true))},
+			{STAT_DEX,                 static_cast<uint32>(inst->GetItemDex(true))},
+			{STAT_INT,                 static_cast<uint32>(inst->GetItemInt(true))},
+			{STAT_STA,                 static_cast<uint32>(inst->GetItemSta(true))},
+			{STAT_STR,                 static_cast<uint32>(inst->GetItemStr(true))},
+			{STAT_WIS,                 static_cast<uint32>(inst->GetItemWis(true))},
+			{STAT_COLD,                static_cast<uint32>(inst->GetItemCR(true))},
+			{STAT_DISEASE,             static_cast<uint32>(inst->GetItemDR(true))},
+			{STAT_FIRE,                static_cast<uint32>(inst->GetItemFR(true))},
+			{STAT_MAGIC,               static_cast<uint32>(inst->GetItemMR(true))},
+			{STAT_POISON,              static_cast<uint32>(inst->GetItemPR(true))},
+			{STAT_HP,                  static_cast<uint32>(inst->GetItemHP(true))},
+			{STAT_MANA,                static_cast<uint32>(inst->GetItemMana(true))},
+			{STAT_ENDURANCE,           static_cast<uint32>(inst->GetItemEndur(true))},
+			{STAT_ATTACK,              static_cast<uint32>(inst->GetItemAttack(true))},
+			{STAT_HP_REGEN,            static_cast<uint32>(inst->GetItemRegen(true))},
+			{STAT_MANA_REGEN,          static_cast<uint32>(inst->GetItemManaRegen(true))},
+			{STAT_HASTE,               static_cast<uint32>(inst->GetItemHaste(true))},
+			{STAT_DAMAGE_SHIELD,       static_cast<uint32>(inst->GetItemDamageShield(true))},
+			{STAT_DS_MITIGATION,       static_cast<uint32>(inst->GetItemDSMitigation(true))},
+			{STAT_HEAL_AMOUNT,         static_cast<uint32>(inst->GetItemHealAmt(true))},
+			{STAT_SPELL_DAMAGE,        static_cast<uint32>(inst->GetItemSpellDamage(true))},
+			{STAT_CLAIRVOYANCE,        static_cast<uint32>(inst->GetItemClairvoyance(true))},
+			{STAT_HEROIC_AGILITY,      static_cast<uint32>(inst->GetItemHeroicAgi(true))},
+			{STAT_HEROIC_CHARISMA,     static_cast<uint32>(inst->GetItemHeroicCha(true))},
+			{STAT_HEROIC_DEXTERITY,    static_cast<uint32>(inst->GetItemHeroicDex(true))},
+			{STAT_HEROIC_INTELLIGENCE, static_cast<uint32>(inst->GetItemHeroicInt(true))},
+			{STAT_HEROIC_STAMINA,      static_cast<uint32>(inst->GetItemHeroicSta(true))},
+			{STAT_HEROIC_STRENGTH,     static_cast<uint32>(inst->GetItemHeroicStr(true))},
+			{STAT_HEROIC_WISDOM,       static_cast<uint32>(inst->GetItemHeroicWis(true))},
+			{STAT_BASH,                static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillBash, true))},
+			{STAT_BACKSTAB,            static_cast<uint32>(inst->GetItemBackstabDamage(true))},
+			{STAT_DRAGON_PUNCH,        static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillDragonPunch, true))},
+			{STAT_EAGLE_STRIKE,        static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillEagleStrike, true))},
+			{STAT_FLYING_KICK,         static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillFlyingKick, true))},
+			{STAT_KICK,                static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillKick, true))},
+			{STAT_ROUND_KICK,          static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillRoundKick, true))},
+			{STAT_TIGER_CLAW,          static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillTigerClaw, true))},
+			{STAT_FRENZY,              static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillFrenzy, true))},
+		};
+
+		r.item_stat = item_stat_searches.contains(search.item_stat) ? item_stat_searches[search.item_stat] : 0;
+		if (item_stat_searches.contains(search.item_stat) && item_stat_searches[search.item_stat] <= 0) {
+			continue;
+		}
+
+		static std::map<uint8, uint32> item_slot_searches = {
+			{EQ::invslot::slotCharm,       1},
+			{EQ::invslot::slotEar1,        2},
+			{EQ::invslot::slotHead,        4},
+			{EQ::invslot::slotFace,        8},
+			{EQ::invslot::slotEar2,        16},
+			{EQ::invslot::slotNeck,        32},
+			{EQ::invslot::slotShoulders,   64},
+			{EQ::invslot::slotArms,        128},
+			{EQ::invslot::slotBack,        256},
+			{EQ::invslot::slotWrist1,      512},
+			{EQ::invslot::slotWrist2,      1024},
+			{EQ::invslot::slotRange,       2048},
+			{EQ::invslot::slotHands,       4096},
+			{EQ::invslot::slotPrimary,     8192},
+			{EQ::invslot::slotSecondary,   16384},
+			{EQ::invslot::slotFinger1,     32768},
+			{EQ::invslot::slotFinger2,     65536},
+			{EQ::invslot::slotChest,       131072},
+			{EQ::invslot::slotLegs,        262144},
+			{EQ::invslot::slotFeet,        524288},
+			{EQ::invslot::slotWaist,       1048576},
+			{EQ::invslot::slotPowerSource, 2097152},
+			{EQ::invslot::slotAmmo,        4194304},
+		};
+
+		auto GetEquipmentSlotBit = [&](uint32 slot) -> uint32 {
+			return item_slot_searches.contains(slot) ? item_slot_searches[slot] : 0;
+		};
+
+		auto FindItemAugSlot = [&]() -> bool {
+			for (auto const &s: inst->GetItem()->AugSlotType) {
+				return s == search.augment;
+			}
+			return false;
+		};
+
+		// item type searches
+		std::vector<ItemSearchType> item_search_types = {
+			{EQ::item::ItemType::ItemTypeAll,                  true},
+			{EQ::item::ItemType::ItemTypeBook,                 item->ItemClass == EQ::item::ItemType::ItemTypeBook},
+			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer ||
+			                                                   item->IsClassBag()},
+			{EQ::item::ItemType::ItemTypeAllEffects,           item->Scroll.Effect > 0 && item->Scroll.Effect < 65000},
+			{EQ::item::ItemType::ItemTypeUnknown9,             item->Worn.Effect == 998},
+			{EQ::item::ItemType::ItemTypeUnknown10,            item->Worn.Effect >= 1298 && item->Worn.Effect <= 1307},
+			{EQ::item::ItemType::ItemTypeFocusEffect,          item->Focus.Effect > 0},
+			{EQ::item::ItemType::ItemTypeArmor,                item->ItemType == EQ::item::ItemType::ItemTypeArmor},
+			{EQ::item::ItemType::ItemType1HBlunt,              item->ItemType == EQ::item::ItemType::ItemType1HBlunt},
+			{EQ::item::ItemType::ItemType1HPiercing,           item->ItemType == EQ::item::ItemType::ItemType1HPiercing},
+			{EQ::item::ItemType::ItemType1HSlash,              item->ItemType == EQ::item::ItemType::ItemType1HSlash},
+			{EQ::item::ItemType::ItemType2HBlunt,              item->ItemType == EQ::item::ItemType::ItemType2HBlunt},
+			{EQ::item::ItemType::ItemType2HSlash,              item->ItemType == EQ::item::ItemType::ItemType2HSlash},
+			{EQ::item::ItemType::ItemTypeBow,                  item->ItemType == EQ::item::ItemType::ItemTypeBow},
+			{EQ::item::ItemType::ItemTypeShield,               item->ItemType == EQ::item::ItemType::ItemTypeShield},
+			{EQ::item::ItemType::ItemTypeMisc,                 item->ItemType == EQ::item::ItemType::ItemTypeMisc},
+			{EQ::item::ItemType::ItemTypeFood,                 item->ItemType == EQ::item::ItemType::ItemTypeFood},
+			{EQ::item::ItemType::ItemTypeDrink,                item->ItemType == EQ::item::ItemType::ItemTypeDrink},
+			{EQ::item::ItemType::ItemTypeLight,                item->ItemType == EQ::item::ItemType::ItemTypeLight},
+			{EQ::item::ItemType::ItemTypeCombinable,           item->ItemType == EQ::item::ItemType::ItemTypeCombinable},
+			{EQ::item::ItemType::ItemTypeBandage,              item->ItemType == EQ::item::ItemType::ItemTypeBandage},
+			{EQ::item::ItemType::ItemTypeSmallThrowing,        item->ItemType == EQ::item::ItemType::ItemTypeSmallThrowing ||
+			                                                   item->ItemType == EQ::item::ItemType::ItemTypeLargeThrowing},
+			{EQ::item::ItemType::ItemTypeSpell,                item->ItemType == EQ::item::ItemType::ItemTypeSpell},
+			{EQ::item::ItemType::ItemTypePotion,               item->ItemType == EQ::item::ItemType::ItemTypePotion},
+			{EQ::item::ItemType::ItemTypeBrassInstrument,      item->ItemType == EQ::item::ItemType::ItemTypeBrassInstrument},
+			{EQ::item::ItemType::ItemTypeWindInstrument,       item->ItemType == EQ::item::ItemType::ItemTypeWindInstrument},
+			{EQ::item::ItemType::ItemTypeStringedInstrument,   item->ItemType == EQ::item::ItemType::ItemTypeStringedInstrument},
+			{EQ::item::ItemType::ItemTypePercussionInstrument, item->ItemType == EQ::item::ItemType::ItemTypePercussionInstrument},
+			{EQ::item::ItemType::ItemTypeArrow,                item->ItemType == EQ::item::ItemType::ItemTypeArrow},
+			{EQ::item::ItemType::ItemTypeJewelry,              item->ItemType == EQ::item::ItemType::ItemTypeJewelry},
+			{EQ::item::ItemType::ItemTypeNote,                 item->ItemType == EQ::item::ItemType::ItemTypeNote},
+			{EQ::item::ItemType::ItemTypeKey,                  item->ItemType == EQ::item::ItemType::ItemTypeKey},
+			{EQ::item::ItemType::ItemType2HPiercing,           item->ItemType == EQ::item::ItemType::ItemType2HPiercing},
+			{EQ::item::ItemType::ItemTypeAlcohol,              item->ItemType == EQ::item::ItemType::ItemTypeAlcohol},
+			{EQ::item::ItemType::ItemTypeMartial,              item->ItemType == EQ::item::ItemType::ItemTypeMartial},
+			{EQ::item::ItemType::ItemTypeAugmentation,         item->ItemType == EQ::item::ItemType::ItemTypeAugmentation},
+			{EQ::item::ItemType::ItemTypeAlternateAbility,     item->ItemType == EQ::item::ItemType::ItemTypeAlternateAbility},
+			{EQ::item::ItemType::ItemTypeCount,                item->ItemType == EQ::item::ItemType::ItemTypeCount},
+			{EQ::item::ItemType::ItemTypeCollectible,          item->ItemType == EQ::item::ItemType::ItemTypeCollectible}
+			};
+
+		bool met_filter = false;
+		bool has_filter = false;
+
+		for (auto &i: item_search_types) {
+			if (i.type == search.type) {
+				has_filter = true;
+				if (i.condition) {
+					LogTradingDetail("Item [{}] met search criteria for type [{}]", item->Name, uint8(i.type));
+					met_filter = true;
+					break;
+				}
+			}
+		}
+		if (has_filter && !met_filter) {
+			continue;
+		}
+
+		// TODO: Add catch-all item type filter for specific item types
+
+		// item additive searches
+		std::vector<AddititiveSearchCriteria> item_additive_searches = {
+			{
+				.should_check = search.min_level != 1 && inst->GetItemRequiredLevel(true) > 0,
+				.condition = inst->GetItemRequiredLevel(true) >= search.min_level
+			},
+			{
+				.should_check = search.max_level != 1 && inst->GetItemRequiredLevel(true) > 0,
+				.condition = inst->GetItemRequiredLevel(true) <= search.max_level
+			},
+			{
+				.should_check = !std::string(search.item_name).empty(),
+				.condition = Strings::ContainsLower(item->Name, search.item_name)
+			},
+			{
+				.should_check = search._class != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Classes & GetPlayerClassBit(search._class))
+			},
+			{
+				.should_check = search.race != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Races & GetPlayerRaceBit(GetRaceIDFromPlayerRaceValue(search.race)))
+			},
+			{
+				.should_check = search.augment != 0,
+				.condition = FindItemAugSlot()
+			},
+			{
+				.should_check = search.slot != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Slots & GetEquipmentSlotBit(search.slot))
+			},
+		};
+
+		bool should_add = true;
+
+		for (auto &i: item_additive_searches) {
+			LogTradingDetail(
+				"Checking item [{}] for search criteria - should_check [{}] condition [{}]",
+				item->Name,
+				i.should_check,
+				i.condition
+			);
+			if (i.should_check && !i.condition) {
+				should_add = false;
+				continue;
+			}
+		}
+
+		if (!should_add) {
+			continue;
+		}
+
+		LogTradingDetail("Found item [{}] meeting search criteria.", r.item_name);
 		all_entries.push_back(r);
 	}

@@ -3,13 +3,11 @@

 #include <vector>
 #include "shareddb.h"
-#include "../../common/item_instance.h"

 class Bazaar {
 public:
 	static std::vector<BazaarSearchResultsFromDB_Struct>
-	GetSearchResults(Database &content_db, Database &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id);
-
+	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id);
 };


@@ -131,8 +131,6 @@ static std::map<uint8, std::string> class_names = {
 #define ARMOR_TYPE_LAST ARMOR_TYPE_PLATE
 #define ARMOR_TYPE_COUNT 5

-#define BOT_CLASS_BASE_ID_PREFIX 3000
-

 const char* GetClassIDName(uint8 class_id, uint8 level = 0);

@@ -294,8 +294,6 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}

-	LogSys.CloseFileLogs();
-
 	exit(1);
 }

@@ -50,7 +50,6 @@
 #include "../common/repositories/raid_members_repository.h"
 #include "../common/repositories/reports_repository.h"
 #include "../common/repositories/variables_repository.h"
-#include "../common/repositories/character_pet_name_repository.h"
 #include "../common/events/player_event_logs.h"

 // Disgrace: for windows compile
@@ -314,12 +313,6 @@ bool Database::ReserveName(uint32 account_id, const std::string& name)
 		return false;
 	}

-	const auto& p = CharacterPetNameRepository::GetWhere(*this, where_filter);
-	if (!p.empty()) {
-		LogInfo("Account [{}] requested name [{}] but name is already taken by an Pet", account_id, name);
-		return false;
-	}
-
 	auto e = CharacterDataRepository::NewEntity();

 	e.account_id = account_id;
@@ -1867,35 +1860,7 @@ bool Database::CopyCharacter(

 	const int64 new_character_id = (CharacterDataRepository::GetMaxId(*this) + 1);

-	// validate destination name doesn't exist already
-	const auto& destination_characters = CharacterDataRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`name` = '{}' AND `deleted_at` IS NULL LIMIT 1",
-			Strings::Escape(destination_character_name)
-		)
-	);
-	if (!destination_characters.empty()) {
-		LogError("Character [{}] already exists", destination_character_name);
-		return false;
-	}
-
-	std::vector<std::string> tables_to_zero_id = {
-		"keyring",
-		"data_buckets",
-		"character_instance_safereturns",
-		"character_expedition_lockouts",
-		"character_instance_lockouts",
-		"character_parcels",
-		"character_tribute",
-		"player_titlesets",
-	};
-
-	std::vector<std::string> ignore_tables = {
-		"guilds",
-	};
-
-	size_t total_rows_copied = 0;
+	std::vector<std::string> tables_to_zero_id = { "keyring", "data_buckets", "character_instance_safereturns" };

 	TransactionBegin();

@@ -1903,10 +1868,6 @@ bool Database::CopyCharacter(
 		const std::string& table_name               = t.first;
 		const std::string& character_id_column_name = t.second;

-		if (Strings::Contains(ignore_tables, table_name)) {
-			continue;
-		}
-
 		auto results = QueryDatabase(
 			fmt::format(
 				"SHOW COLUMNS FROM {}",
@@ -1957,10 +1918,6 @@ bool Database::CopyCharacter(
 					value = std::to_string(destination_account_id);
 				}

-				if (!Strings::IsNumber(value)) {
-					value = Strings::Escape(value);
-				}
-
 				new_values.emplace_back(value);
 			}

@@ -1993,11 +1950,6 @@ bool Database::CopyCharacter(
 				)
 			);

-			size_t rows_copied = insert_rows.size(); // Rows copied for this table
-			total_rows_copied += rows_copied; // Increment grand total
-
-			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
-
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
@@ -2007,13 +1959,6 @@ bool Database::CopyCharacter(

 	TransactionCommit();

-	LogInfo(
-		"Character [{}] copied to [{}] total rows [{}]",
-		source_character_name,
-		destination_character_name,
-		Strings::Commify(total_rows_copied)
-	);
-
 	return true;
 }

@@ -2155,18 +2100,18 @@ void Database::PurgeCharacterParcels()
 	pel.event_type_name = PlayerEvent::EventName[pel.event_type_id];
 	std::stringstream ss;
 	for (auto const   &r: results) {
-		pd.from_name    = r.from_name;
-		pd.item_id      = r.item_id;
-		pd.augment_1_id = r.aug_slot_1;
-		pd.augment_2_id = r.aug_slot_2;
-		pd.augment_3_id = r.aug_slot_3;
-		pd.augment_4_id = r.aug_slot_4;
-		pd.augment_5_id = r.aug_slot_5;
-		pd.augment_6_id = r.aug_slot_6;
-		pd.note         = r.note;
-		pd.quantity     = r.quantity;
-		pd.sent_date    = r.sent_date;
-		pd.char_id      = r.char_id;
+		pd.from_name  = r.from_name;
+		pd.item_id    = r.item_id;
+		pd.aug_slot_1 = r.aug_slot_1;
+		pd.aug_slot_2 = r.aug_slot_2;
+		pd.aug_slot_3 = r.aug_slot_3;
+		pd.aug_slot_4 = r.aug_slot_4;
+		pd.aug_slot_5 = r.aug_slot_5;
+		pd.aug_slot_6 = r.aug_slot_6;
+		pd.note       = r.note;
+		pd.quantity   = r.quantity;
+		pd.sent_date  = r.sent_date;
+		pd.char_id    = r.char_id;
 		{
 			cereal::JSONOutputArchiveSingleLine ar(ss);
 			pd.serialize(ar);
@@ -2202,20 +2147,3 @@ void Database::ClearBuyerDetails()
 {
 	BuyerRepository::DeleteBuyer(*this, 0);
 }
-
-uint64_t Database::GetNextTableId(const std::string &table_name)
-{
-	auto results = QueryDatabase(fmt::format("SHOW TABLE STATUS LIKE '{}'", table_name));
-
-	for (auto row: results) {
-		for (int row_index = 0; row_index < results.ColumnCount(); row_index++) {
-			std::string field_name = Strings::ToLower(results.FieldName(row_index));
-			if (field_name == "auto_increment") {
-				std::string value = row[row_index] ? row[row_index] : "null";
-				return Strings::ToUnsignedBigInt(value, 1);
-			}
-		}
-	}
-
-	return 1;
-}
@@ -274,8 +274,6 @@ public:
 	void Encode(std::string &in);
 	void Decode(std::string &in);

-	uint64_t GetNextTableId(const std::string& table_name);
-
 private:
 	Mutex           Mvarcache;
 	VarCache_Struct varcache;
@@ -136,6 +136,11 @@ std::string DatabaseDumpService::GetLoginTableList()
 	return Strings::Join(DatabaseSchema::GetLoginTables(), " ");
 }

+std::string DatabaseDumpService::GetQueryServTables()
+{
+	return Strings::Join(DatabaseSchema::GetQueryServerTables(), " ");
+}
+
 std::string DatabaseDumpService::GetSystemTablesList()
 {
 	auto system_tables  = DatabaseSchema::GetServerTables();
@@ -267,6 +272,11 @@ void DatabaseDumpService::DatabaseDump()
 			tables_to_dump += GetLoginTableList() + " ";
 			dump_descriptor += "-login";
 		}
+
+		if (IsDumpQueryServerTables()) {
+			tables_to_dump += GetQueryServTables();
+			dump_descriptor += "-queryserv";
+		}
 	}

 	if (IsDumpStaticInstanceData()) {
@@ -391,6 +401,7 @@ void DatabaseDumpService::DatabaseDump()
 //	LogDebug("[{}] dump-to-console", IsDumpOutputToConsole());
 //	LogDebug("[{}] dump-path", GetSetDumpPath());
 //	LogDebug("[{}] compression", (IsDumpWithCompression() ? "true" : "false"));
+//	LogDebug("[{}] query-serv", (IsDumpQueryServerTables() ? "true" : "false"));
 //	LogDebug("[{}] has-compression-binary", (HasCompressionBinary() ? "true" : "false"));
 //	LogDebug("[{}] content", (IsDumpContentTables() ? "true" : "false"));
 //	LogDebug("[{}] no-data", (IsDumpWithNoData() ? "true" : "false"));
@@ -500,6 +511,16 @@ const std::string &DatabaseDumpService::GetDumpFileName() const
 	return dump_file_name;
 }

+bool DatabaseDumpService::IsDumpQueryServerTables() const
+{
+	return dump_query_server_tables;
+}
+
+void DatabaseDumpService::SetDumpQueryServerTables(bool dump_query_server_tables)
+{
+	DatabaseDumpService::dump_query_server_tables = dump_query_server_tables;
+}
+
 bool DatabaseDumpService::IsDumpOutputToConsole() const
 {
 	return dump_output_to_console;
@@ -45,6 +45,8 @@ public:
 	void SetDumpPath(const std::string &dump_path);
 	const std::string &GetDumpFileName() const;
 	void SetDumpFileName(const std::string &dump_file_name);
+	bool IsDumpQueryServerTables() const;
+	void SetDumpQueryServerTables(bool dump_query_server_tables);
 	bool IsDumpOutputToConsole() const;
 	void SetDumpOutputToConsole(bool dump_output_to_console);
 	bool IsDumpDropTableSyntaxOnly() const;
@@ -94,6 +96,7 @@ private:
 	bool HasCompressionBinary();
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
+	std::string GetQueryServTables();
 	void RemoveSqlBackup();
 	void BuildCredentialsFile();
 	void RemoveCredentialsFile();
@@ -142,7 +142,6 @@ bool DatabaseUpdate::UpdateManifest(
 	if (version_low != version_high) {

 		LogSys.DisableMySQLErrorLogs();
-		bool force_interactive = false;
 		for (int version = version_low + 1; version <= version_high; ++version) {
 			for (auto &e: entries) {
 				if (e.version == version) {
@@ -164,20 +163,13 @@ bool DatabaseUpdate::UpdateManifest(
 						prefix,
 						e.description
 					);
-
-					if (!has_migration && e.force_interactive) {
-						force_interactive = true;
-					}
 				}
 			}
 		}
 		LogSys.EnableMySQLErrorLogs();
 		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));

-		if (!missing_migrations.empty() && m_skip_backup) {
-			LogInfo("Skipping database backup");
-		}
-		else if (!missing_migrations.empty()) {
+		if (!missing_migrations.empty()) {
 			LogInfo("Automatically backing up database before applying updates");
 			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 			auto s = DatabaseDumpService();
@@ -192,42 +184,6 @@ bool DatabaseUpdate::UpdateManifest(
 			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 		}

-		if (force_interactive && !std::getenv("FORCE_INTERACTIVE")) {
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-			LogInfo("Some migrations require user input. Running interactively");
-			LogInfo("This is usually due to a major change that could cause data loss");
-			LogInfo("Your server is automatically backed up before these updates are applied");
-			LogInfo("but you should also make sure you take a backup prior to running this update");
-			LogInfo("Would you like to run this update? [y/n] (Timeout 60s)");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-			// user input
-			std::string input;
-			bool        gave_input        = false;
-			time_t      start_time        = time(nullptr);
-			time_t      wait_time_seconds = 60;
-
-			// spawn a concurrent thread that waits for input from std::cin
-			std::thread t1(
-				[&]() {
-					std::cin >> input;
-					gave_input = true;
-				}
-			);
-			t1.detach();
-
-			// check the inputReceived flag once every 50ms for 10 seconds
-			while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
-				std::this_thread::sleep_for(std::chrono::milliseconds(50));
-			}
-
-			// prompt for user skip
-			if (Strings::Trim(input) != "y") {
-				LogInfo("Exiting due to user input");
-				std::exit(1);
-			}
-		}
-
 		for (auto &m: missing_migrations) {
 			for (auto &e: entries) {
 				if (e.version == m) {
@@ -315,13 +271,6 @@ DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
 	return this;
 }

-DatabaseUpdate *DatabaseUpdate::SetSkipBackup(bool skip)
-{
-	m_skip_backup = skip;
-
-	return this;
-}
-
 bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 {
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
@@ -11,7 +11,6 @@ struct ManifestEntry {
 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
 	bool        content_schema_update{}; // if true, this migration is a content schema update and should be ran against the content database
-	bool        force_interactive; // if true, this migration will always be run interactively
 };

 struct DatabaseVersion {
@@ -30,15 +29,12 @@ public:

 	DatabaseUpdate *SetDatabase(Database *db);
 	DatabaseUpdate *SetContentDatabase(Database *db);
-	DatabaseUpdate *SetSkipBackup(bool skip);
 	bool HasPendingUpdates();
 private:
-	bool m_skip_backup = false;
 	Database *m_database;
 	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
-
 };

 #endif //EQEMU_DATABASE_UPDATE_H
@@ -5774,627 +5774,8 @@ CREATE INDEX idx_bot_expires ON data_buckets (bot_id, expires);
 	},
 	ManifestEntry{
 		.version = 9286,
-		.description = "2024_11_26_bazaar_find_trader.sql",
-		.check       = "SHOW COLUMNS FROM `trader` LIKE 'char_zone_instance_id'",
-		.condition   = "empty",
-		.match       = "",
-		.sql         = R"(
-ALTER TABLE `trader`
-	ADD COLUMN `char_zone_instance_id` INT NULL DEFAULT '0' AFTER `char_zone_id`;
-)"
-	},
-	ManifestEntry{
-		.version = 9287,
-		.description = "2024_11_26_bazaar_find_trader.sql",
-		.check       = "SHOW COLUMNS FROM `npc_types` LIKE 'walkspeed'",
-		.condition   = "missing",
-		.match       = "float",
-		.sql         = R"(
-ALTER TABLE `npc_types` MODIFY COLUMN `walkspeed` float NOT NULL DEFAULT 0;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9288,
-		.description = "2024_11_10_zone_player_partitioning.sql",
-		.check = "SHOW CREATE TABLE `zone`",
-		.condition = "missing",
-		.match = "shard_at_player_count",
-		.sql = R"(
-ALTER TABLE `zone`
-ADD COLUMN `shard_at_player_count` int(11) NULL DEFAULT 0 AFTER `seconds_before_idle`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version     = 9289,
-		.description = "2025_01_19_evolving_items__character_evolving_items",
-		.check       = "SHOW TABLES LIKE 'character_evolving_items'",
-		.condition   = "empty",
-		.match       = "",
-		.sql         = R"(
-CREATE TABLE `character_evolving_items` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`character_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`item_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`activated` TINYINT(1) UNSIGNED NULL DEFAULT '0',
-	`equipped` TINYINT(3) UNSIGNED NULL DEFAULT '0',
-	`current_amount` BIGINT(20) NULL DEFAULT '0',
-	`progression` DOUBLE(22,0) NULL DEFAULT '0',
-	`final_item_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`deleted_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1
-;
-)"
-	},
-	ManifestEntry{
-		.version     = 9290,
-		.description = "2025_01_19_evolving_items__items_evolving_details",
-		.check       = "SHOW TABLES LIKE 'items_evolving_details'",
-		.condition   = "empty",
-		.match       = "",
-		.sql         = R"(
-CREATE TABLE `items_evolving_details` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `item_evo_id` int(10) unsigned DEFAULT 0 COMMENT 'items.evoid',
-  `item_evolve_level` int(10) unsigned DEFAULT 0 COMMENT 'items.evolvinglevel',
-  `item_id` int(10) unsigned DEFAULT 0 COMMENT 'items.id',
-  `type` int(10) unsigned DEFAULT 0,
-  `sub_type` int(10) unsigned DEFAULT 0,
-  `required_amount` bigint(20) DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-INSERT INTO `items_evolving_details` VALUES
-(1,1000,1,86900,99,1,0),
-(2,1000,2,86901,99,1,0),
-(3,1000,3,86902,99,1,0),
-(4,1000,4,86903,99,1,0),
-(5,1000,5,86904,99,1,0),
-(6,1001,1,86910,99,1,0),
-(7,1001,2,86911,99,1,0),
-(8,1001,3,86912,99,1,0),
-(9,1001,4,86913,99,1,0),
-(10,1001,5,86914,99,1,0),
-(11,1001,6,86915,99,1,0),
-(12,1001,7,86916,99,1,0),
-(13,1002,1,86920,99,1,0),
-(14,1002,2,86921,99,1,0),
-(15,1002,3,86922,99,1,0),
-(16,1002,4,86923,99,1,0),
-(17,1002,5,86924,99,1,0),
-(18,1002,6,86925,99,1,0),
-(19,1002,7,86926,99,1,0),
-(20,1003,1,86930,99,1,0),
-(21,1003,2,86931,99,1,0),
-(22,1003,3,86932,99,1,0),
-(23,1003,4,86933,99,1,0),
-(24,1003,5,86934,99,1,0),
-(25,1003,6,86935,99,1,0),
-(26,1004,1,86940,99,1,0),
-(27,1004,2,86941,99,1,0),
-(28,1004,3,86942,99,1,0),
-(29,1004,4,86943,99,1,0),
-(30,1004,5,86944,99,1,0),
-(31,1004,6,86945,99,1,0),
-(32,1005,1,86950,99,1,0),
-(33,1005,2,86951,99,1,0),
-(34,1005,3,86952,99,1,0),
-(35,1005,4,86953,99,1,0),
-(36,1005,5,86954,99,1,0),
-(37,1005,6,86955,99,1,0),
-(38,1005,7,86956,99,1,0),
-(39,1006,1,86960,99,1,0),
-(40,1006,2,86961,99,1,0),
-(41,1006,3,86962,99,1,0),
-(42,1006,4,86963,99,1,0),
-(43,1006,5,86964,99,1,0),
-(44,1006,6,86965,99,1,0),
-(45,1006,7,86966,99,1,0),
-(46,1007,1,86970,99,1,0),
-(47,1007,2,86971,99,1,0),
-(48,1007,3,86972,99,1,0),
-(49,1007,4,86973,99,1,0),
-(50,1007,5,86974,99,1,0),
-(51,1007,6,86975,99,1,0),
-(52,1007,7,86976,99,1,0),
-(53,1008,1,86980,99,1,0),
-(54,1008,2,86981,99,1,0),
-(55,1008,3,86982,99,1,0),
-(56,1008,4,86983,99,1,0),
-(57,1008,5,86984,99,1,0),
-(58,1009,1,86990,99,1,0),
-(59,1009,2,86991,99,1,0),
-(60,1009,3,86992,99,1,0),
-(61,1009,4,86993,99,1,0),
-(62,1009,5,86994,99,1,0),
-(63,1009,6,86995,99,1,0),
-(64,1009,7,86996,99,1,0),
-(65,1009,8,86997,99,1,0),
-(66,1009,9,86998,99,1,0),
-(67,1009,10,86999,99,1,0),
-(68,1010,1,90001,99,1,0),
-(69,1010,2,90002,99,1,0),
-(70,1010,3,90003,99,1,0),
-(71,1010,6,90006,99,1,0),
-(72,1010,7,90007,99,1,0),
-(73,1010,8,90008,99,1,0),
-(74,1010,10,90010,99,1,0),
-(75,1050,1,89270,99,1,0),
-(76,1050,2,89271,99,1,0),
-(77,1050,3,89272,99,1,0),
-(78,1050,4,89273,99,1,0),
-(79,1050,5,89274,99,1,0),
-(80,1050,6,89275,99,1,0),
-(81,1051,1,89280,99,1,0),
-(82,1051,2,89281,99,1,0),
-(83,1051,3,89282,99,1,0),
-(84,1051,4,89283,99,1,0),
-(85,1051,5,89284,99,1,0),
-(86,1052,1,89290,99,1,0),
-(87,1052,2,89291,99,1,0),
-(88,1052,3,89292,99,1,0),
-(89,1052,4,89293,99,1,0),
-(90,1052,5,89294,99,1,0),
-(91,1052,6,89295,99,1,0),
-(92,1052,7,89296,99,1,0),
-(93,1053,1,89300,99,1,0),
-(94,1053,2,89301,99,1,0),
-(95,1053,3,89302,99,1,0),
-(96,1053,4,89303,99,1,0),
-(97,1053,5,89304,99,1,0),
-(98,1053,6,89305,99,1,0),
-(99,1053,7,89306,99,1,0),
-(100,1053,8,89307,99,1,0),
-(101,1053,9,89308,99,1,0),
-(102,1054,1,89310,99,1,0),
-(103,1054,2,89311,99,1,0),
-(104,1054,3,89312,99,1,0),
-(105,1054,4,89313,99,1,0),
-(106,1054,5,89314,99,1,0),
-(107,1054,6,89315,99,1,0),
-(108,1055,1,89320,99,1,0),
-(109,1055,2,89321,99,1,0),
-(110,1055,3,89322,99,1,0),
-(111,1055,4,89323,99,1,0),
-(112,1055,5,89324,99,1,0),
-(113,1055,6,89325,99,1,0),
-(114,1055,7,89326,99,1,0),
-(115,1056,1,89330,99,1,0),
-(116,1056,2,89331,99,1,0),
-(117,1056,3,89332,99,1,0),
-(118,1056,4,89333,99,1,0),
-(119,1056,5,89334,99,1,0),
-(120,1057,1,89340,99,1,0),
-(121,1057,2,89341,99,1,0),
-(122,1057,3,89342,99,1,0),
-(123,1057,4,89343,99,1,0),
-(124,1057,5,89344,99,1,0),
-(125,1057,6,89345,99,1,0),
-(126,1057,7,89346,99,1,0),
-(127,1057,8,89347,99,1,0),
-(128,1058,1,89350,99,1,0),
-(129,1058,2,89351,99,1,0),
-(130,1058,3,89352,99,1,0),
-(131,1058,4,89353,99,1,0),
-(132,1058,5,89354,99,1,0),
-(133,1058,6,89355,99,1,0),
-(134,1058,7,89356,99,1,0),
-(135,1059,1,89360,99,1,0),
-(136,1059,2,89361,99,1,0),
-(137,1059,3,89362,99,1,0),
-(138,1060,1,89490,99,1,0),
-(139,1060,2,89491,99,1,0),
-(140,1060,3,89492,99,1,0),
-(141,1061,1,89500,99,1,0),
-(142,1061,2,89501,99,1,0),
-(143,1061,3,89502,99,1,0),
-(144,1062,1,89510,99,1,0),
-(145,1062,2,89511,99,1,0),
-(146,1062,3,89512,99,1,0),
-(147,1063,1,89520,99,1,0),
-(148,1063,2,89521,99,1,0),
-(149,1063,3,89522,99,1,0),
-(150,1064,1,89530,99,1,0),
-(151,1064,2,89531,99,1,0),
-(152,1064,3,89532,99,1,0),
-(153,1065,1,89540,99,1,0),
-(154,1065,2,89541,99,1,0),
-(155,1065,3,89542,99,1,0),
-(156,1066,1,89550,3,274,500),
-(157,1066,2,89551,3,274,1000),
-(158,1066,3,89552,3,274,2000),
-(159,1067,1,89560,99,1,0),
-(160,1067,2,89561,99,1,0),
-(161,1067,3,89562,99,1,0),
-(162,1069,1,85571,99,1,0),
-(163,1069,2,85572,99,1,0),
-(164,1069,3,85573,99,1,0),
-(165,1200,1,95001,99,1,0),
-(166,1200,2,95002,99,1,0),
-(167,1200,3,95003,99,1,0),
-(168,1200,4,95004,99,1,0),
-(169,1200,5,95005,99,1,0),
-(170,1200,6,95006,99,1,0),
-(171,1200,7,95007,99,1,0),
-(172,1201,1,95008,99,1,0),
-(173,1201,2,95009,99,1,0),
-(174,1201,3,95010,99,1,0),
-(175,1201,4,95011,99,1,0),
-(176,1201,5,95012,99,1,0),
-(177,1201,6,95013,99,1,0),
-(178,1201,7,95014,99,1,0),
-(179,1202,1,95015,99,1,0),
-(180,1202,2,95016,99,1,0),
-(181,1202,3,95017,99,1,0),
-(182,1202,4,95018,99,1,0),
-(183,1202,5,95019,99,1,0),
-(184,1202,6,95020,99,1,0),
-(185,1202,7,95021,99,1,0),
-(186,1203,1,95022,99,1,0),
-(187,1203,2,95023,99,1,0),
-(188,1203,3,95024,99,1,0),
-(189,1203,4,95025,99,1,0),
-(190,1203,5,95026,99,1,0),
-(191,1203,6,95027,99,1,0),
-(192,1203,7,95028,99,1,0),
-(193,1204,1,95029,99,1,0),
-(194,1204,2,95030,99,1,0),
-(195,1204,3,95031,99,1,0),
-(196,1204,4,95032,99,1,0),
-(197,1204,5,95033,99,1,0),
-(198,1204,6,95034,99,1,0),
-(199,1204,7,95035,99,1,0),
-(200,1205,1,95036,99,1,0),
-(201,1205,2,95037,99,1,0),
-(202,1205,3,95038,99,1,0),
-(203,1205,4,95039,99,1,0),
-(204,1205,5,95040,99,1,0),
-(205,1205,6,95041,99,1,0),
-(206,1205,7,95042,99,1,0),
-(207,1206,1,95043,99,1,0),
-(208,1206,2,95044,99,1,0),
-(209,1206,3,95045,99,1,0),
-(210,1206,4,95046,99,1,0),
-(211,1206,5,95047,99,1,0),
-(212,1206,6,95048,99,1,0),
-(213,1206,7,95049,99,1,0),
-(214,1207,1,95050,99,1,0),
-(215,1207,2,95051,99,1,0),
-(216,1207,3,95052,99,1,0),
-(217,1207,4,95053,99,1,0),
-(218,1207,5,95054,99,1,0),
-(219,1207,6,95055,99,1,0),
-(220,1207,7,95056,99,1,0),
-(221,1208,1,95057,99,1,0),
-(222,1208,2,95058,99,1,0),
-(223,1208,3,95059,99,1,0),
-(224,1208,4,95060,99,1,0),
-(225,1208,5,95061,99,1,0),
-(226,1208,6,95062,99,1,0),
-(227,1208,7,95063,99,1,0),
-(228,1209,1,95064,99,1,0),
-(229,1209,2,95065,99,1,0),
-(230,1209,3,95066,99,1,0),
-(231,1209,4,95067,99,1,0),
-(232,1209,5,95068,99,1,0),
-(233,1209,6,95069,99,1,0),
-(234,1209,7,95070,99,1,0),
-(235,1210,1,95071,99,1,0),
-(236,1210,2,95072,99,1,0),
-(237,1210,3,95073,99,1,0),
-(238,1210,4,95074,99,1,0),
-(239,1210,5,95075,99,1,0),
-(240,1210,6,95076,99,1,0),
-(241,1210,7,95077,99,1,0),
-(242,1211,1,85612,1,1,100000),
-(243,1211,2,85613,1,1,200000),
-(244,1211,3,85614,1,1,300000),
-(245,1214,1,80035,99,1,0),
-(246,1301,1,102700,99,1,0),
-(247,1301,4,102703,99,1,0),
-(248,1302,1,102704,99,1,0),
-(249,1302,2,102705,99,1,0),
-(250,1303,1,102706,99,1,0),
-(251,1303,2,102707,99,1,0),
-(252,1303,3,102708,99,1,0),
-(253,1304,1,102709,99,1,0),
-(254,1304,5,102713,99,1,0),
-(255,1305,1,102714,99,1,0),
-(256,1306,1,102716,99,1,0),
-(257,1306,5,102720,99,1,0),
-(258,1307,1,102721,99,1,0),
-(259,1307,3,102723,99,1,0),
-(260,1308,1,102724,99,1,0),
-(261,1309,1,102727,99,1,0),
-(262,1309,2,102728,99,1,0),
-(263,1310,1,102729,99,1,0),
-(264,1310,3,102731,99,1,0),
-(265,1311,1,102732,99,1,0),
-(266,1311,4,102735,99,1,0),
-(267,1312,1,102736,99,1,0),
-(268,1312,3,102738,99,1,0),
-(269,1313,1,102739,99,1,0),
-(270,1314,1,102743,99,1,0),
-(271,1314,2,102744,99,1,0),
-(272,1314,3,102745,99,1,0),
-(273,1315,1,102746,99,1,0),
-(274,1315,2,102747,99,1,0),
-(275,1316,1,102748,99,1,0),
-(276,1316,5,102752,99,1,0),
-(277,1317,1,102753,99,1,0),
-(278,1318,1,102756,99,1,0),
-(279,1319,1,102759,99,1,0),
-(280,1319,3,102761,99,1,0),
-(281,1320,1,102762,99,1,0),
-(282,1321,1,102765,99,1,0),
-(283,1321,2,102766,99,1,0),
-(284,1321,3,102767,99,1,0),
-(285,1322,1,102768,99,1,0),
-(286,1322,2,102769,99,1,0),
-(287,1322,3,102770,99,1,0),
-(288,1323,1,102771,99,1,0),
-(289,1324,1,102774,99,1,0),
-(290,1400,1,102800,99,1,0),
-(291,1401,1,102807,99,1,0),
-(292,1401,7,102813,99,1,0),
-(293,1402,1,102814,99,1,0),
-(294,1402,7,102820,99,1,0),
-(295,1403,1,102821,99,1,0),
-(296,1404,1,102828,99,1,0),
-(297,1405,1,102835,99,1,0),
-(298,1406,1,102842,99,1,0),
-(299,1408,1,109310,99,1,0),
-(300,1408,5,109314,99,1,0),
-(301,1409,1,109315,99,1,0),
-(302,1409,5,109319,99,1,0),
-(303,1410,1,109320,99,1,0),
-(304,1410,5,109324,99,1,0),
-(305,1411,1,109325,99,1,0),
-(306,1411,5,109329,99,1,0),
-(307,1412,1,109330,99,1,0),
-(308,1412,5,109334,99,1,0),
-(309,1413,1,109335,99,1,0),
-(310,1413,5,109339,99,1,0),
-(311,1414,1,109340,99,1,0),
-(312,1414,5,109344,99,1,0),
-(313,1415,1,109345,99,1,0),
-(314,1415,5,109349,99,1,0),
-(315,1416,1,109350,99,1,0),
-(316,1416,2,109351,99,1,0),
-(317,1416,5,109354,99,1,0),
-(318,1417,1,109355,99,1,0),
-(319,1417,5,109359,99,1,0),
-(320,1418,1,109360,99,1,0),
-(321,1418,5,109364,99,1,0),
-(322,1419,1,109365,99,1,0),
-(323,1419,3,109367,99,1,0),
-(324,1419,5,109369,99,1,0),
-(325,1420,1,109370,99,1,0),
-(326,1420,5,109374,99,1,0),
-(327,1421,1,109375,99,1,0),
-(328,1421,5,109379,99,1,0),
-(329,1422,1,109380,99,1,0),
-(330,1422,5,109384,99,1,0),
-(331,1423,1,109385,99,1,0),
-(332,1423,2,109386,99,1,0),
-(333,1423,5,109389,99,1,0),
-(334,1436,1,120378,99,1,0),
-(335,1436,2,120379,99,1,0),
-(336,1436,3,120380,99,1,0),
-(337,1436,4,120381,99,1,0),
-(338,1436,5,120382,99,1,0),
-(339,1436,6,120383,99,1,0),
-(340,1436,7,120384,99,1,0),
-(341,1436,8,120385,99,1,0),
-(342,1436,9,120386,99,1,0),
-(343,1436,10,120387,99,1,0),
-(344,1436,11,120388,99,1,0),
-(345,1436,12,120389,99,1,0),
-(346,1436,13,120390,99,1,0),
-(347,1436,14,120391,99,1,0),
-(348,1436,15,120392,99,1,0),
-(349,1436,16,120393,99,1,0),
-(350,1436,17,120394,99,1,0),
-(351,1436,18,120395,99,1,0),
-(352,1436,19,120396,99,1,0),
-(353,1436,20,120397,99,1,0),
-(354,1440,1,56992,99,1,0),
-(355,1440,2,56993,99,1,0),
-(356,1440,3,56994,99,1,0),
-(357,1440,4,56995,99,1,0),
-(358,1440,5,56996,99,1,0),
-(359,1441,1,132787,99,1,0),
-(360,1441,2,132788,99,1,0),
-(361,1441,3,132789,99,1,0),
-(362,1441,4,132790,99,1,0),
-(363,1441,5,132791,99,1,0),
-(364,1441,6,132792,99,1,0),
-(365,1441,7,132793,99,1,0),
-(366,1441,8,132794,99,1,0),
-(367,1441,9,132795,99,1,0),
-(368,1441,10,132796,99,1,0),
-(369,1441,11,132797,99,1,0),
-(370,1441,13,132799,99,1,0),
-(371,1441,14,132800,99,1,0),
-(372,1441,15,132801,99,1,0),
-(373,1441,16,132802,99,1,0),
-(374,1441,17,132803,99,1,0),
-(375,1441,18,132804,99,1,0),
-(376,1441,19,132805,99,1,0),
-(377,1441,20,132806,99,1,0),
-(378,1442,1,133137,99,1,0),
-(379,1442,2,133138,99,1,0),
-(380,1442,3,133139,99,1,0),
-(381,1442,4,133140,99,1,0),
-(382,1442,10,133146,99,1,0),
-(383,1442,11,133147,99,1,0),
-(384,1442,12,133148,99,1,0),
-(385,1442,13,133149,99,1,0),
-(386,1442,14,133150,99,1,0),
-(387,1442,15,133151,99,1,0),
-(388,1442,16,133152,99,1,0),
-(389,1442,17,133153,99,1,0),
-(390,1442,18,133154,99,1,0),
-(391,1442,19,133155,99,1,0),
-(392,1442,20,133156,99,1,0),
-(393,1443,1,133406,99,1,0),
-(394,1443,2,133407,99,1,0),
-(395,1443,3,133408,99,1,0),
-(396,1443,4,133409,99,1,0),
-(397,1443,5,133410,99,1,0),
-(398,1443,6,133411,99,1,0),
-(399,1443,7,133412,99,1,0),
-(400,1443,8,133413,99,1,0),
-(401,1443,9,133414,99,1,0),
-(402,1443,10,133415,99,1,0),
-(403,1443,11,133416,99,1,0),
-(404,1443,12,133417,99,1,0),
-(405,1443,13,133418,99,1,0),
-(406,1443,14,133419,99,1,0),
-(407,1443,15,133420,99,1,0),
-(408,1443,16,133421,99,1,0),
-(409,1443,17,133422,99,1,0),
-(410,1443,18,133423,99,1,0),
-(411,1443,19,133424,99,1,0),
-(412,1443,20,133425,99,1,0),
-(413,1444,1,94938,99,1,0),
-(414,1444,2,94939,99,1,0),
-(415,1444,3,94940,99,1,0),
-(416,1444,4,94941,99,1,0),
-(417,1444,5,94942,99,1,0),
-(418,1444,6,94943,99,1,0),
-(419,1444,7,94944,99,1,0),
-(420,1444,8,94945,99,1,0),
-(421,1444,9,94946,99,1,0),
-(422,1444,10,94947,99,1,0),
-(423,1444,11,94948,99,1,0),
-(424,1444,12,94949,99,1,0),
-(425,1444,13,94950,99,1,0),
-(426,1444,14,94951,99,1,0),
-(427,1444,15,94952,99,1,0),
-(428,1444,16,94953,99,1,0),
-(429,1444,17,94954,99,1,0),
-(430,1444,18,94955,99,1,0),
-(431,1444,19,94956,99,1,0),
-(432,1444,20,94957,99,1,0),
-(433,1445,1,98858,99,1,0),
-(434,1445,2,98859,99,1,0),
-(435,1445,3,98860,99,1,0),
-(436,1445,4,98861,99,1,0),
-(437,1445,5,98862,99,1,0);
-
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9291,
-		.description = "2025_01_21_add_remove_zone_fields",
-		.check = "SHOW COLUMNS FROM `zone` LIKE 'client_update_range'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE zone DROP COLUMN IF EXISTS npc_update_range;
-ALTER TABLE zone DROP COLUMN IF EXISTS max_movement_update_range;
-ALTER TABLE `zone` ADD COLUMN `client_update_range` int(11) NOT NULL DEFAULT 600 AFTER `npc_max_aggro_dist`;
-)",
-		.content_schema_update = true,
-	},
-	ManifestEntry{
-		.version = 9292,
-		.description = "2025_01_21_data_buckets_account_id",
-		.check       = "SHOW COLUMNS FROM `data_buckets` LIKE 'account_id'",
-		.condition   = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `data_buckets`
-ADD COLUMN `account_id` bigint(11) NULL DEFAULT 0 AFTER `expires`,
-DROP INDEX `keys`,
-ADD UNIQUE INDEX `keys` (`key`, `character_id`, `npc_id`, `bot_id`, `account_id`) USING BTREE;
-
-- Add the INDEX for character_id and key
-ALTER TABLE `data_buckets` ADD KEY `idx_account_id_key` (`account_id`, `key`);
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9293,
-		.description = "2025_01_10_create_pet_names_table.sql",
-		.check = "SHOW TABLES LIKE 'character_pet_name'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-CREATE TABLE `character_pet_name` (
-    `character_id` INT(11) NOT NULL PRIMARY KEY,
-    `name` VARCHAR(64) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-)",
-	},
-	ManifestEntry{
-		.version = 9294,
-		.description = "2025_01_26_items_table_bazaar_search_indexes.sql",
-		.check = "SHOW CREATE TABLE `items`",
-		.condition = "missing",
-		.match = "idx_slots_reclevel",
-		.sql = R"(
-- indexes for the `items` table
-CREATE INDEX idx_slots_reclevel ON items (slots, reclevel);
-CREATE INDEX idx_itemclass_itemtype ON items (itemclass, itemtype);
-CREATE INDEX idx_augment_slots ON items (
-    augslot1type,
-    augslot2type,
-    augslot3type,
-    augslot4type,
-    augslot5type,
-    augslot6type
-);
-CREATE INDEX idx_races_classes ON items (races, classes);
-
-- common stat fields
-CREATE INDEX idx_item_ac ON items (ac);
-CREATE INDEX idx_item_hp ON items (hp);
-CREATE INDEX idx_item_mana ON items (mana);
-CREATE INDEX idx_item_reclevel ON items (reclevel);
-CREATE INDEX idx_item_type_skill ON items (itemtype, skillmodtype);
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9295,
-		.description = "2025_01_26_trader_table_bazaar_search_indexes.sql",
-		.check = "SHOW CREATE TABLE `trader`",
-		.condition = "missing",
-		.match = "idx_trader_item",
-		.sql = R"(
-- indexes for the `trader` table
-CREATE INDEX idx_trader_item ON trader (item_id, item_cost);
-CREATE INDEX idx_trader_char ON trader (char_id, char_zone_id, char_zone_instance_id);
-CREATE INDEX idx_trader_item_sn ON trader (item_sn);
-CREATE INDEX idx_trader_item_cost ON trader (item_cost);
-CREATE INDEX idx_trader_active_transaction ON trader (active_transaction);
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9296,
-		.description = "2025_02_01_trader_table_listing_date.sql",
-		.check = "SHOW CREATE TABLE `trader`",
-		.condition = "missing",
-		.match = "listing_date",
-		.sql = R"(
-ALTER TABLE `trader`
-	ADD COLUMN `listing_date` DATETIME NULL DEFAULT NULL AFTER `active_transaction`,
-	ADD INDEX `idx_trader_listing_date` (`listing_date`);
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9297,
-		.description = "2024_01_22_sharedbank_guid_primary_key.sql",
-		.check = "SHOW COLUMNS FROM `sharedbank` LIKE 'guid'",
+		.description = "2024_10_24_sharedbank_guid_primary_key.sql",
+		.check = "SHOW COLUMN FROM `sharedbank` LIKE 'guid'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
@@ -6415,14 +5796,12 @@ 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`);
-)",
-		.content_schema_update = false,
-		.force_interactive = true
+)"
 	},
 	ManifestEntry{
-		.version = 9298,
+		.version = 9287,
 		.description = "2024_10_24_inventory_changes.sql",
-		.check = "SHOW COLUMNS FROM `inventory` LIKE 'character_id'",
+		.check = "SHOW COLUMN FROM `inventory` LIKE 'charid'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
@@ -6440,6 +5819,7 @@ CHANGE COLUMN `ornamenticon` `ornament_icon` int(11) UNSIGNED NOT NULL DEFAULT 0
 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
@@ -6450,41 +5830,13 @@ UPDATE `inventory` SET `slot_id` = ((`slot_id` - 311) + 5210) WHERE `slot_id` BE
 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` - 8000) + 6010) WHERE `slot_id` BETWEEN 8000 AND 8199; -- Cursor Overflow
-DELETE FROM `inventory` WHERE `slot_id` BETWEEN 8200 AND 8999; -- Extreme Cursor Overflow
 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 2040; -- Bank Bag 1
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2041) + 6410) WHERE `slot_id` BETWEEN 2041 AND 2050; -- Bank Bag 2
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2051) + 6610) WHERE `slot_id` BETWEEN 2051 AND 2060; -- Bank Bag 3
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2061) + 6810) WHERE `slot_id` BETWEEN 2061 AND 2070; -- Bank Bag 4
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2071) + 7010) WHERE `slot_id` BETWEEN 2071 AND 2080; -- Bank Bag 5
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2081) + 7210) WHERE `slot_id` BETWEEN 2081 AND 2090; -- Bank Bag 6
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2091) + 7410) WHERE `slot_id` BETWEEN 2091 AND 2100; -- Bank Bag 7
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2101) + 7610) WHERE `slot_id` BETWEEN 2101 AND 2110; -- Bank Bag 8
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2111) + 7810) WHERE `slot_id` BETWEEN 2111 AND 2120; -- Bank Bag 9
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2121) + 8010) WHERE `slot_id` BETWEEN 2121 AND 2130; -- Bank Bag 10
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2131) + 8210) WHERE `slot_id` BETWEEN 2131 AND 2140; -- Bank Bag 11
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2141) + 8410) WHERE `slot_id` BETWEEN 2141 AND 2150; -- Bank Bag 12
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2151) + 8610) WHERE `slot_id` BETWEEN 2151 AND 2160; -- Bank Bag 13
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2161) + 8810) WHERE `slot_id` BETWEEN 2161 AND 2170; -- Bank Bag 14
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2171) + 9010) WHERE `slot_id` BETWEEN 2171 AND 2180; -- Bank Bag 15
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2181) + 9210) WHERE `slot_id` BETWEEN 2181 AND 2190; -- Bank Bag 16
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2191) + 9410) WHERE `slot_id` BETWEEN 2191 AND 2200; -- Bank Bag 17
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2201) + 9610) WHERE `slot_id` BETWEEN 2201 AND 2210; -- Bank Bag 18
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2211) + 9810) WHERE `slot_id` BETWEEN 2211 AND 2220; -- Bank Bag 19
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2221) + 10010) WHERE `slot_id` BETWEEN 2221 AND 2230; -- Bank Bag 20
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2231) + 10210) WHERE `slot_id` BETWEEN 2231 AND 2240; -- Bank Bag 21
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2241) + 10410) WHERE `slot_id` BETWEEN 2241 AND 2250; -- Bank Bag 22
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2251) + 10610) WHERE `slot_id` BETWEEN 2251 AND 2260; -- Bank Bag 23
-UPDATE `inventory` SET `slot_id` = ((`slot_id` - 2261) + 10810) WHERE `slot_id` BETWEEN 2261 AND 2270; -- Bank Bag 24
-UPDATE `sharedbank` SET `slot_id` = ((`slot_id` - 2531) + 11010) WHERE `slot_id` BETWEEN 2531 AND 2540; -- Shared Bank Bag 1
-UPDATE `sharedbank` SET `slot_id` = ((`slot_id` - 2541) + 11210) WHERE `slot_id` BETWEEN 2541 AND 2550; -- Shared Bank Bag 2
-)",
-		.content_schema_update = false,
-		.force_interactive = true
+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 = 9299,
+		.version = 9288,
 		.description = "2024_10_24_merchantlist_temp_uncap.sql",
 		.check = "SHOW CREATE TABLE `merchantlist_temp`",
 		.condition = "contains",
@@ -6492,284 +5844,7 @@ UPDATE `sharedbank` SET `slot_id` = ((`slot_id` - 2541) + 11210) WHERE `slot_id`
 		.sql = R"(
 ALTER TABLE `merchantlist_temp`
 MODIFY COLUMN `slot` int UNSIGNED NOT NULL DEFAULT 0 AFTER `npcid`;
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9300,
-		.description = "2024_10_15_npc_types_multiquest_enabled.sql",
-		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'multiquest_enabled'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `npc_types`
-ADD COLUMN `multiquest_enabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `is_parcel_merchant`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9301,
-		.description = "2024_10_08_add_detail_player_event_logging.sql",
-		.check       = "SHOW COLUMNS FROM `player_event_log_settings` LIKE 'etl_enabled'",
-		.condition   = "empty",
-		.match       = "",
-		.sql = R"(
-ALTER TABLE `player_event_log_settings`
-	ADD COLUMN `etl_enabled` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `discord_webhook_id`;
-ALTER TABLE `player_event_logs`
-	ADD COLUMN `etl_table_id` BIGINT(20) NOT NULL DEFAULT '0' AFTER `event_data`;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 14;
-CREATE TABLE `player_event_loot_items` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`item_id` INT(10) UNSIGNED NULL DEFAULT NULL,
-	`item_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`charges` INT(11) NULL DEFAULT NULL,
-	`augment_1_id` INT UNSIGNED NULL DEFAULT '0',
-	`augment_2_id` INT UNSIGNED NULL DEFAULT '0',
-	`augment_3_id` INT UNSIGNED NULL DEFAULT '0',
-	`augment_4_id` INT UNSIGNED NULL DEFAULT '0',
-	`augment_5_id` INT UNSIGNED NULL DEFAULT '0',
-	`augment_6_id` INT UNSIGNED NULL DEFAULT '0',
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT NULL,
-	`corpse_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `item_id_npc_id` (`item_id`, `npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 16;
-CREATE TABLE `player_event_merchant_sell` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`merchant_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`merchant_type` INT(10) UNSIGNED NULL DEFAULT '0',
-	`item_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`item_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`charges` INT(11) NULL DEFAULT '0',
-	`cost` INT(10) UNSIGNED NULL DEFAULT '0',
-	`alternate_currency_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`player_money_balance` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`player_currency_balance` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `item_id_npc_id` (`item_id`, `npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 15;
-CREATE TABLE `player_event_merchant_purchase` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`merchant_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`merchant_type` INT(10) UNSIGNED NULL DEFAULT '0',
-	`item_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`item_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`charges` INT(11) NULL DEFAULT '0',
-	`cost` INT(10) UNSIGNED NULL DEFAULT '0',
-	`alternate_currency_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`player_money_balance` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`player_currency_balance` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `item_id_npc_id` (`item_id`, `npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 22;
-CREATE TABLE `player_event_npc_handin` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`npc_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`handin_copper` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`handin_silver` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`handin_gold` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`handin_platinum` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`return_copper` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`return_silver` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`return_gold` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`return_platinum` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`is_quest_handin` TINYINT(3) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `npc_id_is_quest_handin` (`npc_id`, `is_quest_handin`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-CREATE TABLE `player_event_npc_handin_entries` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`player_event_npc_handin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
-	`type` INT(10) UNSIGNED NULL DEFAULT NULL,
-	`item_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`charges` INT(11) NOT NULL DEFAULT '0',
-	`evolve_level` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`evolve_amount` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_1_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_2_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_3_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_4_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_5_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`augment_6_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `type_item_id` (`type`, `item_id`) USING BTREE,
-	INDEX `player_event_npc_handin_id` (`player_event_npc_handin_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 27;
-CREATE TABLE `player_event_trade` (
-	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`char1_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`char2_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`char1_copper` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char1_silver` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char1_gold` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char1_platinum` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char2_copper` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char2_silver` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char2_gold` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char2_platinum` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `char1_id_char2_id` (`char1_id`, `char2_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-CREATE TABLE `player_event_trade_entries` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`player_event_trade_id` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`char_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`slot` SMALLINT(6) NULL DEFAULT '0',
-	`item_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`charges` SMALLINT(6) NULL DEFAULT '0',
-	`augment_1_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`augment_2_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`augment_3_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`augment_4_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`augment_5_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`augment_6_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`in_bag` TINYINT(4) NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `player_event_trade_id` (`player_event_trade_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 0 WHERE `id` = 54;
-CREATE TABLE `player_event_speech` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`to_char_id` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`from_char_id` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`guild_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`type` INT(10) UNSIGNED NULL DEFAULT '0',
-	`min_status` INT(10) UNSIGNED NULL DEFAULT '0',
-	`message` LONGTEXT NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `to_char_id_from_char_id` (`to_char_id`, `from_char_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 44;
-CREATE TABLE `player_event_killed_npc` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`npc_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`combat_time_seconds` INT(10) UNSIGNED NULL DEFAULT '0',
-	`total_damage_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`total_heal_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `npc_id` (`npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 45;
-CREATE TABLE `player_event_killed_named_npc` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`npc_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`combat_time_seconds` INT(10) UNSIGNED NULL DEFAULT '0',
-	`total_damage_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`total_heal_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `npc_id` (`npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 46;
-CREATE TABLE `player_event_killed_raid_npc` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`npc_id` INT(10) UNSIGNED NULL DEFAULT '0',
-	`npc_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-	`combat_time_seconds` INT(10) UNSIGNED NULL DEFAULT '0',
-	`total_damage_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`total_heal_per_second_taken` BIGINT(20) UNSIGNED NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `npc_id` (`npc_id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB;
-UPDATE `player_event_log_settings` SET `etl_enabled` = 1 WHERE `id` = 4;
-CREATE TABLE `player_event_aa_purchase` (
-	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-	`aa_ability_id` INT(11) NULL DEFAULT '0',
-	`cost` INT(11) NULL DEFAULT '0',
-	`previous_id` INT(11) NULL DEFAULT '0',
-	`next_id` INT(11) NULL DEFAULT '0',
-	`created_at` DATETIME NULL DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	INDEX `created_at` (`created_at`) USING BTREE
-)
-COLLATE='latin1_swedish_ci'
-ENGINE=InnoDB
-;
 )"
-	},
-	ManifestEntry{
-		.version = 9302,
-		.description = "2025_02_09_illusion_block.sql",
-		.check = "SHOW COLUMNS FROM `character_data` LIKE 'illusion_block'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_data`
-	ADD COLUMN `illusion_block` TINYINT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `deleted_at`;
-
-UPDATE `command_settings`
-SET `aliases` =
-    CASE
-        WHEN LENGTH(`aliases`) > 0 AND `aliases` NOT LIKE '%|ib%'
-            THEN CONCAT(`aliases`, '|ib')
-        WHEN LENGTH(`aliases`) = 0
-            THEN 'ib'
-        ELSE `aliases`
-    END
-WHERE `command` = 'illusionblock'
-AND `aliases` NOT LIKE '%ib%';
-)",
 	}
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
@@ -114,9 +114,7 @@ bool Database::CheckInstanceExpired(uint16 instance_id)
 	timeval tv{};
 	gettimeofday(&tv, nullptr);

-	// Use uint64_t for the addition to prevent overflow
-	uint64_t expiration_time = static_cast<uint64_t>(i.start_time) + static_cast<uint64_t>(i.duration);
-	return expiration_time <= tv.tv_sec;
+	return (i.start_time + i.duration) <= tv.tv_sec;
 }

 bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration)
@@ -471,13 +469,15 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)

 void Database::DeleteInstance(uint16 instance_id)
 {
-	// I'm not sure why this isn't in here but we should add it in a later change and make sure it's tested
-	// InstanceListRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
+
 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+
 	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+
 	DynamicZoneMembersRepository::DeleteByInstance(*this, instance_id);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+
 	CharacterCorpsesRepository::BuryInstance(*this, instance_id);
 }

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

+	/**
+	 * Gets QueryServer tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetQueryServerTables()
+	{
+		return {
+			"qs_merchant_transaction_record",
+			"qs_merchant_transaction_record_entries",
+			"qs_player_aa_rate_hourly",
+			"qs_player_delete_record",
+			"qs_player_delete_record_entries",
+			"qs_player_events",
+			"qs_player_handin_record",
+			"qs_player_handin_record_entries",
+			"qs_player_move_record",
+			"qs_player_move_record_entries",
+			"qs_player_npc_kill_record",
+			"qs_player_npc_kill_record_entries",
+			"qs_player_speech",
+			"qs_player_trade_record",
+			"qs_player_trade_record_entries",
+		};
+	}
+
 	/**
 	 * Gets state tables
 	 * Tables that keep track of server state
@@ -333,20 +355,8 @@ namespace DatabaseSchema {
 			"saylink",
 			"server_scheduled_events",
 			"spawn2_disabled",
-			"player_event_aa_purchase",
-			"player_event_killed_npc",
-			"player_event_killed_named_npc",
-			"player_event_killed_raid_npc",
 			"player_event_log_settings",
 			"player_event_logs",
-			"player_event_loot_items",
-			"player_event_merchant_purchase",
-			"player_event_merchant_sell",
-			"player_event_npc_handin",
-			"player_event_npc_handin_entries",
-			"player_event_speech",
-			"player_event_trade",
-			"player_event_trade_entries",
 			"shared_task_activity_state",
 			"shared_task_dynamic_zones",
 			"shared_task_members",
@@ -392,7 +402,6 @@ namespace DatabaseSchema {
 	static std::vector<std::string> GetBotTables()
 	{
 		return {
-			"bot_blocked_buffs",
 			"bot_buffs",
 			"bot_command_settings",
 			"bot_create_combinations",
@@ -406,7 +415,6 @@ namespace DatabaseSchema {
 			"bot_pet_buffs",
 			"bot_pet_inventories",
 			"bot_pets",
-			"bot_settings",
 			"bot_spell_casting_chances",
 			"bot_spell_settings",
 			"bot_spells_entries",
@@ -140,6 +140,29 @@ std::string EQ::constants::GetLanguageName(uint8 language_id)
 	return EQ::constants::GetLanguageMap().find(language_id)->second;
 }

+const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
+{
+	static const std::map<uint32, std::string> ldon_theme_map = {
+		{ LDoNThemes::Unused, "Unused" },
+		{ LDoNThemes::GUK, "Deepest Guk" },
+		{ LDoNThemes::MIR, "Miragul's Menagerie" },
+		{ LDoNThemes::MMC, "Mistmoore Catacombs" },
+		{ LDoNThemes::RUJ, "Rujarkian Hills" },
+		{ LDoNThemes::TAK, "Takish-Hiz" },
+	};
+
+	return ldon_theme_map;
+}
+
+std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
+{
+	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return std::string();
+	}
+
+	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+}
+
 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
 {
 	static const std::map<int8, std::string> flymode_map = {
@@ -436,18 +459,3 @@ bool ComparisonType::IsValid(uint8 type)
 {
 	return comparison_types.find(type) != comparison_types.end();
 }
-
-uint32 LDoNTheme::GetBitmask(uint32 theme_id)
-{
-	return IsValid(theme_id) ? ldon_theme_names[theme_id].second : LDoNTheme::UnusedBit;
-}
-
-std::string LDoNTheme::GetName(uint32 theme_id)
-{
-	return IsValid(theme_id) ? ldon_theme_names[theme_id].first : "UNKNOWN LDON THEME";
-}
-
-bool LDoNTheme::IsValid(uint32 theme_id)
-{
-	return ldon_theme_names.find(theme_id) != ldon_theme_names.end();
-}
@@ -354,6 +354,9 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetLanguageMap();
 		std::string GetLanguageName(uint8 language_id);

+		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
+		std::string GetLDoNThemeName(uint32 theme_id);
+
 		extern const std::map<int8, std::string>& GetFlyModeMap();
 		std::string GetFlyModeName(int8 flymode_id);

@@ -750,35 +753,6 @@ static std::map<uint32, std::string> stance_names = {
 	{ Stance::AEBurn,     "AE Burn" }
 };

-namespace LDoNTheme {
-	constexpr uint32 Unused = 0;
-	constexpr uint32 GUK    = 1;
-	constexpr uint32 MIR    = 2;
-	constexpr uint32 MMC    = 3;
-	constexpr uint32 RUJ    = 4;
-	constexpr uint32 TAK    = 5;
-
-	constexpr uint32 UnusedBit = 0;
-	constexpr uint32 GUKBit    = 1;
-	constexpr uint32 MIRBit    = 2;
-	constexpr uint32 MMCBit    = 4;
-	constexpr uint32 RUJBit    = 8;
-	constexpr uint32 TAKBit    = 16;
-
-	uint32 GetBitmask(uint32 theme_id);
-	std::string GetName(uint32 theme_id);
-	bool IsValid(uint32 theme_id);
-}
-
-static std::map<uint32, std::pair<std::string, uint32>> ldon_theme_names = {
-	{ LDoNTheme::Unused, { "Unused",              LDoNTheme::UnusedBit }, },
-	{ LDoNTheme::GUK,    { "Deepest Guk",         LDoNTheme::GUKBit }, },
-	{ LDoNTheme::MIR,    { "Miragul's Menagerie", LDoNTheme::MIRBit }, },
-	{ LDoNTheme::MMC,    { "Mistmoore Catacombs", LDoNTheme::MMCBit }, },
-	{ LDoNTheme::RUJ,    { "Rujarkian Hills",     LDoNTheme::RUJBit }, },
-	{ LDoNTheme::TAK,    { "Takish-Hiz",          LDoNTheme::TAKBit }, },
-};
-
 namespace PCNPCOnlyFlagType {
 	constexpr int PC  = 1;
 	constexpr int NPC = 2;
@@ -35,7 +35,7 @@ N(OP_AltCurrencyMerchantRequest),
 N(OP_AltCurrencyPurchase),
 N(OP_AltCurrencyReclaim),
 N(OP_AltCurrencySell),
-N(OP_AltCurrencySellSelection), 		// Used by eqstr_us.txt 8066, 8068, 8069
+N(OP_AltCurrencySellSelection), 		// Used by eqstr_us.txt 8066, 8068, 8069 		
 N(OP_Animation),
 N(OP_AnnoyingZoneUnknown),
 N(OP_ApplyPoison),
@@ -77,7 +77,6 @@ N(OP_CashReward),
 N(OP_CastSpell),
 N(OP_ChangeSize),
 N(OP_ChannelMessage),
-N(OP_ChangePetName),
 N(OP_CharacterCreate),
 N(OP_CharacterCreateRequest),
 N(OP_CharInventory),
@@ -163,7 +162,6 @@ N(OP_EnduranceUpdate),
 N(OP_EnterChat),
 N(OP_EnterWorld),
 N(OP_EnvDamage),
-N(OP_EvolveItem),
 N(OP_ExpansionInfo),
 N(OP_ExpUpdate),
 N(OP_FaceChange),
@@ -285,15 +283,12 @@ N(OP_InspectMessageUpdate),
 N(OP_InspectRequest),
 N(OP_InstillDoubt),
 N(OP_InterruptCast),
-N(OP_InvokeChangePetName),
-N(OP_InvokeChangePetNameImmediate),
 N(OP_ItemLinkClick),
 N(OP_ItemLinkResponse),
 N(OP_ItemLinkText),
 N(OP_ItemName),
 N(OP_ItemPacket),
 N(OP_ItemPreview),
-N(OP_ItemPreviewRequest),
 N(OP_ItemRecastDelay),
 N(OP_ItemVerifyReply),
 N(OP_ItemVerifyRequest),
@@ -405,8 +400,6 @@ N(OP_PetitionSearchText),
 N(OP_PetitionUnCheckout),
 N(OP_PetitionUpdate),
 N(OP_PickPocket),
-N(OP_PickZone),
-N(OP_PickZoneWindow),
 N(OP_PlayerProfile),
 N(OP_PlayerStateAdd),
 N(OP_PlayerStateRemove),
@@ -473,7 +466,6 @@ N(OP_SendAATable),
 N(OP_SendCharInfo),
 N(OP_SendExpZonein),
 N(OP_SendFindableNPCs),
-N(OP_SendFindableLocations),
 N(OP_SendGuildTributes),
 N(OP_SendLoginInfo),
 N(OP_SendMaxCharacters),
@@ -522,7 +514,7 @@ N(OP_ShopPlayerSell),
 N(OP_ShopSendParcel),
 N(OP_ShopDeleteParcel),
 N(OP_ShopRespondParcel),
-N(OP_ShopRetrieveParcel),
+N(OP_ShopRetrieveParcel), 
 N(OP_ShopParcelIcon),
 N(OP_ShopRequest),
 N(OP_SimpleMessage),
@@ -575,7 +567,6 @@ N(OP_TradeRequestAck),
 N(OP_TraderItemUpdate),
 N(OP_TraderShop),
 N(OP_TradeSkillCombine),
-N(OP_TradeSkillRecipeInspect),
 N(OP_Translocate),
 N(OP_TributeInfo),
 N(OP_TributeItem),
@@ -993,6 +993,24 @@ enum class DynamicZoneMemberStatus : uint8_t
 	LinkDead
 };

+enum LDoNThemes {
+	Unused = 0,
+	GUK,
+	MIR,
+	MMC,
+	RUJ,
+	TAK
+};
+
+enum LDoNThemeBits {
+	UnusedBit = 0,
+	GUKBit = 1,
+	MIRBit = 2,
+	MMCBit = 4,
+	RUJBit = 8,
+	TAKBit = 16
+};
+
 enum StartZoneIndex {
    Odus = 0,
    Qeynos,
@@ -1114,5 +1132,4 @@ enum ExpSource
 namespace DoorType {
 	constexpr uint32 BuyerStall = 155;
 }
-
 #endif /*COMMON_EQ_CONSTANTS_H*/
@@ -47,7 +47,6 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		ClientUnknown::constants::EXPANSION_BIT,
 		ClientUnknown::constants::EXPANSIONS_MASK,
 		ClientUnknown::INULL,
-		ClientUnknown::INULL,
 		ClientUnknown::INULL
 	),
 	/*[ClientVersion::Client62] =*/
@@ -56,7 +55,6 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		Client62::constants::EXPANSION_BIT,
 		Client62::constants::EXPANSIONS_MASK,
 		Client62::INULL,
-		Client62::INULL,
 		Client62::INULL
 	),
 	/*[ClientVersion::Titanium] =*/
@@ -65,8 +63,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		Titanium::constants::EXPANSION_BIT,
 		Titanium::constants::EXPANSIONS_MASK,
 		Titanium::constants::CHARACTER_CREATION_LIMIT,
-		Titanium::constants::SAY_LINK_BODY_SIZE,
-		Titanium::INULL
+		Titanium::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::SoF] =*/
 	EQ::constants::LookupEntry(
@@ -74,8 +71,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		SoF::constants::EXPANSION_BIT,
 		SoF::constants::EXPANSIONS_MASK,
 		SoF::constants::CHARACTER_CREATION_LIMIT,
-		SoF::constants::SAY_LINK_BODY_SIZE,
-		SoF::INULL
+		SoF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::SoD] =*/
 	EQ::constants::LookupEntry(
@@ -83,8 +79,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		SoD::constants::EXPANSION_BIT,
 		SoD::constants::EXPANSIONS_MASK,
 		SoD::constants::CHARACTER_CREATION_LIMIT,
-		SoD::constants::SAY_LINK_BODY_SIZE,
-		SoD::INULL
+		SoD::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::UF] =*/
 	EQ::constants::LookupEntry(
@@ -92,8 +87,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		UF::constants::EXPANSION_BIT,
 		UF::constants::EXPANSIONS_MASK,
 		UF::constants::CHARACTER_CREATION_LIMIT,
-		UF::constants::SAY_LINK_BODY_SIZE,
-		UF::INULL
+		UF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::RoF] =*/
 	EQ::constants::LookupEntry(
@@ -101,8 +95,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		RoF::constants::EXPANSION_BIT,
 		RoF::constants::EXPANSIONS_MASK,
 		RoF::constants::CHARACTER_CREATION_LIMIT,
-		RoF::constants::SAY_LINK_BODY_SIZE,
-		RoF::INULL
+		RoF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::RoF2] =*/
 	EQ::constants::LookupEntry(
@@ -110,8 +103,7 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		RoF2::constants::EXPANSION_BIT,
 		RoF2::constants::EXPANSIONS_MASK,
 		RoF2::constants::CHARACTER_CREATION_LIMIT,
-		RoF2::constants::SAY_LINK_BODY_SIZE,
-		RoF2::constants::MAX_BAZAAR_TRADERS
+		RoF2::constants::SAY_LINK_BODY_SIZE
 	)
 };

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

@@ -3742,8 +3742,7 @@ struct GetItems_Struct{

 struct BecomeTrader_Struct {
 	uint32 action;
-	uint16 zone_id;
-	uint16 zone_instance_id;
+	uint32 zone_id;
 	uint32 trader_id;
 	uint32 entity_id;
 	char   trader_name[64];
@@ -4283,10 +4282,6 @@ struct NewCombine_Struct {
 /*04*/
 };

-struct TradeSkillRecipeInspect_Struct {
-	uint32 recipe_id;
-	uint32 padding[17]; // unknown
-};

 //client requesting favorite recipies
 struct TradeskillFavorites_Struct {
@@ -5823,21 +5818,6 @@ struct ChangeSize_Struct
 /*16*/
 };

-struct ChangePetName_Struct {
-/*00*/ char new_pet_name[64];
-/*40*/ char pet_owner_name[64];
-/*80*/ int  response_code;
-};
-
-enum ChangePetNameResponse : int {
-	Denied      = 0,        // 5167 You have requested an invalid name or a Customer Service Representative has denied your name request.  Please try another name.
-	Accepted    = 1,        // 5976 Your request for a name change was successful.
-	Timeout     = -3,        // 5979 You must wait longer before submitting another name request. Please try again in a few minutes.
-	NotEligible = -4,    // 5980 Your character is not eligible for a name change.
-	Pending     = -5,        // 5193 You already have a name change pending.  Please wait until it is fully processed before attempting another name change.
-	Unhandled   = -1
-};
-
 // New OpCode/Struct for SoD+
 struct GroupMakeLeader_Struct
 {
@@ -6367,7 +6347,6 @@ enum BazaarTraderBarterActions {
 	TraderAck2                   = 22,
 	AddTraderToBazaarWindow      = 24,
 	RemoveTraderFromBazaarWindow = 25,
-	FirstOpenSearch              = 26,
 	ClickTrader                  = 28,
 	DeliveryCostUpdate           = 29
 };
@@ -6407,7 +6386,6 @@ struct BazaarSearchResultsFromDB_Struct {
 	uint32      icon_id;
 	uint32      sum_charges;
 	uint32      trader_zone_id;
-	int32       trader_zone_instance_id;
 	uint32      trader_entity_id;
 	uint32      item_stat;
 	bool        stackable;
@@ -6429,7 +6407,6 @@ struct BazaarSearchResultsFromDB_Struct {
 			CEREAL_NVP(icon_id),
 			CEREAL_NVP(sum_charges),
 			CEREAL_NVP(trader_zone_id),
-			CEREAL_NVP(trader_zone_instance_id),
 			CEREAL_NVP(trader_entity_id),
 			CEREAL_NVP(item_stat),
 			CEREAL_NVP(stackable),
@@ -6459,90 +6436,6 @@ struct BuylineItemDetails_Struct {
 	uint32      item_quantity;
 };

-struct PickZoneEntry_Struct {
-	int16 zone_id;
-	int16 unknown;
-	int32 player_count;
-	int32 instance_id;
-};
-
-struct PickZoneWindow_Struct {
-	char                 padding000[64];
-	int64                session_id;
-	int8                 option_count;
-	char                 padding073[23];
-	PickZoneEntry_Struct entries[10];
-};
-
-struct PickZone_Struct {
-	int64 session_id;
-	int32 selection_id;
-};
-
-struct EvolveItemToggle {
-	uint32 action;
-	uint32 unknown_004;
-	uint64 unique_id;
-	uint32 percentage;
-	uint32 activated;
-};
-
-struct EvolveXPWindowReceive {
-	uint32 action;
-	uint32 unknown_004;
-	uint64 item1_unique_id;
-	uint64 item2_unique_id;
-};
-
-struct EvolveItemMessaging {
-	uint32 action;
-	char   serialized_data[];
-};
-
-struct EvolveXPWindowSend {
-	/*000*/    uint32   action;
-	/*004*/    uint64   item1_unique_id;
-	/*012*/    uint64   item2_unique_id;
-	/*020*/    uint32   compatibility;
-	/*024*/    uint32   max_transfer_level;
-	/*028*/    uint8    item1_present;
-	/*029*/ uint8       item2_present;
-	/*030*/ std::string serialize_item_1;
-	/*034*/ std::string serialize_item_2;
-
-	template<class Archive>
-	void serialize(Archive &archive)
-	{
-		archive(
-			CEREAL_NVP(action),
-			CEREAL_NVP(item1_unique_id),
-			CEREAL_NVP(item2_unique_id),
-			CEREAL_NVP(compatibility),
-			CEREAL_NVP(max_transfer_level),
-			CEREAL_NVP(item1_present),
-			CEREAL_NVP(item2_present),
-			CEREAL_NVP(serialize_item_1),
-			CEREAL_NVP(serialize_item_2)
-		);
-	}
-};
-
-struct EvolveTransfer {
-	uint32 item_from_id;
-	uint32 item_from_current_amount;
-	uint32 item_to_id;
-	uint32 item_to_current_amount;
-	uint32 compatibility;
-	uint32 max_transfer_level;
-};
-
-struct EvolveGetNextItem {
-	uint32 new_item_id;
-	uint64 new_current_amount;
-	uint64 from_current_amount;
-	uint32 max_transfer_level;
-};
-
 // Restore structure packing to default
 #pragma pack()

@@ -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();
@@ -147,8 +147,6 @@ void EQEmuConfig::parse_config()
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
-	QSHost             = _root["server"]["queryserver"].get("host", "localhost").asString();
-	QSPort             = Strings::ToUnsignedInt(_root["server"]["queryserver"].get("port", "9500").asString());

 	/**
 	 * Zones
@@ -81,9 +81,7 @@ class EQEmuConfig
 		std::string QSDatabaseUsername;
 		std::string QSDatabasePassword;
 		std::string QSDatabaseDB;
-		uint16      QSDatabasePort;
-		std::string QSHost;
-		int         QSPort;
+		uint16 QSDatabasePort;

 		// From <files/>
 		std::string SpellsFile;
@@ -139,9 +137,9 @@ class EQEmuConfig
 		{

 		}
+		virtual ~EQEmuConfig() {}

 	public:
-		virtual ~EQEmuConfig() {}

 		// Produce a const singleton
 		static const EQEmuConfig *get()
@@ -25,8 +25,6 @@
 #include "repositories/discord_webhooks_repository.h"
 #include "repositories/logsys_categories_repository.h"
 #include "termcolor/rang.hpp"
-#include "path_manager.h"
-#include "file.h"

 #include <iostream>
 #include <string>
@@ -87,7 +85,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	 * Set Defaults
 	 */
 	log_settings[Logs::Crash].log_to_console                = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Crash].log_to_file                   = static_cast<uint8>(Logs::General);
 	log_settings[Logs::MySQLError].log_to_console           = static_cast<uint8>(Logs::General);
 	log_settings[Logs::NPCScaling].log_to_gmsay             = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay              = static_cast<uint8>(Logs::General);
@@ -105,8 +102,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	log_settings[Logs::QuestErrors].log_to_console          = static_cast<uint8>(Logs::General);
 	log_settings[Logs::EqTime].log_to_console               = static_cast<uint8>(Logs::General);
 	log_settings[Logs::EqTime].log_to_gmsay                 = static_cast<uint8>(Logs::General);
-	log_settings[Logs::NpcHandin].log_to_console            = static_cast<uint8>(Logs::General);
-	log_settings[Logs::NpcHandin].log_to_gmsay              = static_cast<uint8>(Logs::General);

 	/**
 	 * RFC 5424
@@ -537,11 +532,6 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
 	EQEmuLogSys::CloseFileLogs();

-	if (!File::Exists(path.GetLogPath())) {
-		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
-		File::Makedir(path.GetLogPath());
-	}
-
 	/**
 	 * When loading settings, we must have been given a reason in category based logging to output to a file in order to even create or open one...
 	 */
@@ -601,8 +591,6 @@ void EQEmuLogSys::SilenceConsoleLogging()
 		log_settings[log_index].is_category_enabled = 0;
 	}

-	log_settings[Logs::MySQLError].log_to_console = static_cast<uint8>(Logs::MySQLError);
-	log_settings[Logs::Error].log_to_console = static_cast<uint8>(Logs::Error);
 	log_settings[Logs::Crash].log_to_console = static_cast<uint8>(Logs::General);
 }

@@ -142,13 +142,6 @@ namespace Logs {
 		EqTime,
 		Corpses,
 		XTargets,
-		EvolveItem,
-		PositionUpdate,
-		KSM,
-		BotSettings,
-		BotSpellChecks,
-		BotSpellTypeChecks,
-		NpcHandin,
 		MaxCategoryID /* Don't Remove this */
 	};

@@ -249,14 +242,7 @@ namespace Logs {
 		"Zoning",
 		"EqTime",
 		"Corpses",
-		"XTargets",
-		"EvolveItem",
-		"PositionUpdate",
-		"KSM", // Kernel Samepage Merging
-		"Bot Settings",
-		"Bot Spell Checks",
-		"Bot Spell Type Checks",
-		"NpcHandin"
+		"XTargets"
 	};
 }

@@ -131,16 +131,6 @@
        OutF(LogSys, Logs::Detail, Logs::Error, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

-#define LogEvolveItem(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::EvolveItem))\
-        OutF(LogSys, Logs::General, Logs::EvolveItem, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogEvolveItemDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::EvolveItem))\
-        OutF(LogSys, Logs::Detail, Logs::EvolveItem, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogGuilds(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::Guilds))\
        OutF(LogSys, Logs::General, Logs::Guilds, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -854,66 +844,6 @@
        OutF(LogSys, Logs::Detail, Logs::XTargets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

-#define LogPositionUpdate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::PositionUpdate))\
-        OutF(LogSys, Logs::General, Logs::PositionUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogPositionUpdateDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::PositionUpdate))\
-        OutF(LogSys, Logs::Detail, Logs::PositionUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__); \
-} while (0)
-
-#define LogKSM(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::KSM))\
-        OutF(LogSys, Logs::General, Logs::KSM, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogKSMDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::KSM))\
-        OutF(LogSys, Logs::Detail, Logs::KSM, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSettings(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::BotSettings))\
-        OutF(LogSys, Logs::General, Logs::BotSettings, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSettingsDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::BotSettings))\
-        OutF(LogSys, Logs::Detail, Logs::BotSettings, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSpellChecks(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::BotSpellChecks))\
-        OutF(LogSys, Logs::General, Logs::BotSpellChecks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSpellChecksDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::BotSpellChecks))\
-        OutF(LogSys, Logs::Detail, Logs::BotSpellChecks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSpellTypeChecks(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::BotSpellTypeChecks))\
-        OutF(LogSys, Logs::General, Logs::BotSpellTypeChecks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogBotSpellTypeChecksDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::BotSpellTypeChecks))\
-        OutF(LogSys, Logs::Detail, Logs::BotSpellTypeChecks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogNpcHandin(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::NpcHandin))\
-        OutF(LogSys, Logs::General, Logs::NpcHandin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogNpcHandinDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::NpcHandin))\
-        OutF(LogSys, Logs::Detail, Logs::NpcHandin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define Log(debug_level, log_category, message, ...) do {\
    if (LogSys.IsLogEnabled(debug_level, log_category))\
        LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -714,18 +714,6 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 				h.charges > 1 ? fmt::format(" Charges: {}", h.charges) : "",
 				h.attuned ? " (Attuned)" : ""
 			);
-
-			for (int i = 0; i < h.augment_ids.size(); i++) {
-				if (!Strings::EqualFold(h.augment_names[i], "None")) {
-					const uint8 slot_id = (i + 1);
-					handin_items_info += fmt::format(
-						"Augment {}: {} ({})\n",
-						slot_id,
-						h.augment_names[i],
-						h.augment_ids[i]
-					);
-				}
-			}
 		}
 	}

@@ -739,18 +727,6 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 				r.charges > 1 ? fmt::format(" Charges: {}", r.charges) : "",
 				r.attuned ? " (Attuned)" : ""
 			);
-
-			for (int i = 0; i < r.augment_ids.size(); i++) {
-				if (!Strings::EqualFold(r.augment_names[i], "None")) {
-					const uint8 slot_id = (i + 1);
-					return_items_info += fmt::format(
-						"Augment {}: {} ({})\n",
-						slot_id,
-						r.augment_names[i],
-						r.augment_ids[i]
-					);
-				}
-			}
 		}
 	}

@@ -1081,51 +1057,51 @@ std::string PlayerEventDiscordFormatter::FormatTradeEvent(
 	if (!e.character_1_give_items.empty()) {
 		for (const auto &i: e.character_1_give_items) {
 			std::string augment_info;
-			if (i.augment_1_id > 0) {
+			if (i.aug_1_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 1: {} ({})",
-					i.augment_1_name,
-					i.augment_1_id
+					i.aug_1_item_name,
+					i.aug_1_item_id
 				);
 			}

-			if (i.augment_2_id > 0) {
+			if (i.aug_2_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 2: {} ({})",
-					i.augment_2_name,
-					i.augment_2_id
+					i.aug_2_item_name,
+					i.aug_2_item_id
 				);
 			}

-			if (i.augment_3_id > 0) {
+			if (i.aug_3_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 3: {} ({})",
-					i.augment_3_name,
-					i.augment_3_id
+					i.aug_3_item_name,
+					i.aug_3_item_id
 				);
 			}

-			if (i.augment_4_id > 0) {
+			if (i.aug_4_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 4: {} ({})\n",
-					i.augment_4_name,
-					i.augment_4_id
+					i.aug_4_item_name,
+					i.aug_4_item_id
 				);
 			}

-			if (i.augment_5_id > 0) {
+			if (i.aug_5_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 5: {} ({})\n",
-					i.augment_5_name,
-					i.augment_5_id
+					i.aug_5_item_name,
+					i.aug_5_item_id
 				);
 			}

-			if (i.augment_6_id > 0) {
+			if (i.aug_6_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 6: {} ({})",
-					i.augment_6_name,
-					i.augment_6_id
+					i.aug_6_item_name,
+					i.aug_6_item_id
 				);
 			}

@@ -1146,51 +1122,51 @@ std::string PlayerEventDiscordFormatter::FormatTradeEvent(
 	if (!e.character_2_give_items.empty()) {
 		for (const auto &i: e.character_2_give_items) {
 			std::string augment_info;
-			if (i.augment_1_id > 0) {
+			if (i.aug_1_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 1: {} ({})",
-					i.augment_1_name,
-					i.augment_1_id
+					i.aug_1_item_name,
+					i.aug_1_item_id
 				);
 			}

-			if (i.augment_2_id > 0) {
+			if (i.aug_2_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 2: {} ({})",
-					i.augment_2_name,
-					i.augment_2_id
+					i.aug_2_item_name,
+					i.aug_2_item_id
 				);
 			}

-			if (i.augment_3_id > 0) {
+			if (i.aug_3_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 3: {} ({})",
-					i.augment_3_name,
-					i.augment_3_id
+					i.aug_3_item_name,
+					i.aug_3_item_id
 				);
 			}

-			if (i.augment_4_id > 0) {
+			if (i.aug_4_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 4: {} ({})\n",
-					i.augment_4_name,
-					i.augment_4_id
+					i.aug_4_item_name,
+					i.aug_4_item_id
 				);
 			}

-			if (i.augment_5_id > 0) {
+			if (i.aug_5_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 5: {} ({})\n",
-					i.augment_5_name,
-					i.augment_5_id
+					i.aug_5_item_name,
+					i.aug_5_item_id
 				);
 			}

-			if (i.augment_6_id > 0) {
+			if (i.aug_6_item_id > 0) {
 				augment_info += fmt::format(
 					"Augment 6: {} ({})",
-					i.augment_6_name,
-					i.augment_6_id
+					i.aug_6_item_name,
+					i.aug_6_item_id
 				);
 			}

@@ -1,21 +1,14 @@
-#include "player_event_logs.h"
 #include <cereal/archives/json.hpp>
-
+#include "player_event_logs.h"
+#include "player_event_discord_formatter.h"
 #include "../platform.h"
 #include "../rulesys.h"
-#include "player_event_discord_formatter.h"
-#include "../repositories/player_event_loot_items_repository.h"
-#include "../repositories/player_event_merchant_sell_repository.h"
-#include "../repositories/player_event_merchant_purchase_repository.h"
-#include "../repositories/player_event_npc_handin_repository.h"
-#include "../repositories/player_event_npc_handin_entries_repository.h"

 const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour

 // general initialization routine
 void PlayerEventLogs::Init()
 {
-
 	m_process_batch_events_timer.SetTimer(RuleI(Logging, BatchPlayerEventProcessIntervalSeconds) * 1000);
 	m_process_retention_truncation_timer.SetTimer(PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL);

@@ -28,7 +21,6 @@ void PlayerEventLogs::Init()
 		m_settings[i].event_enabled      = 1;
 		m_settings[i].retention_days     = 0;
 		m_settings[i].discord_webhook_id = 0;
-		m_settings[i].etl_enabled        = false;
 	}

 	SetSettingsDefaults();
@@ -73,7 +65,6 @@ void PlayerEventLogs::Init()
 			c.event_name     = PlayerEvent::EventName[i];
 			c.event_enabled  = m_settings[i].event_enabled;
 			c.retention_days = m_settings[i].retention_days;
-			c.etl_enabled    = false;
 			settings_to_insert.emplace_back(c);
 		}
 	}
@@ -82,8 +73,6 @@ void PlayerEventLogs::Init()
 		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
 	}

-	LoadEtlIds();
-
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();

@@ -132,319 +121,23 @@ void PlayerEventLogs::ProcessBatchQueue()
 		return;
 	}

-	static std::map<uint32, uint32> counter{};
-	counter.clear();
-	for (auto const &e: m_record_batch_queue) {
-		counter[e.event_type_id]++;
-	}
-
 	BenchTimer benchmark;

-	EtlQueues etl_queues{};
-	for (const auto &[type, count]: counter) {
-		if (count > 0) {
-			switch (type) {
-				case PlayerEvent::TRADE:
-					etl_queues.trade.reserve(count);
-					break;
-				case PlayerEvent::SPEECH:
-					etl_queues.speech.reserve(count);
-					break;
-				case PlayerEvent::LOOT_ITEM:
-					etl_queues.loot_items.reserve(count);
-					break;
-				case PlayerEvent::KILLED_NPC:
-					etl_queues.killed_npc.reserve(count);
-					break;
-				case PlayerEvent::NPC_HANDIN:
-					etl_queues.npc_handin.reserve(count);
-					break;
-				case PlayerEvent::AA_PURCHASE:
-					etl_queues.aa_purchase.reserve(count);
-					break;
-				case PlayerEvent::MERCHANT_SELL:
-					etl_queues.merchant_sell.reserve(count);
-					break;
-				case PlayerEvent::KILLED_RAID_NPC:
-					etl_queues.killed_raid_npc.reserve(count);
-					break;
-				case PlayerEvent::KILLED_NAMED_NPC:
-					etl_queues.killed_named_npc.reserve(count);
-					break;
-				case PlayerEvent::MERCHANT_PURCHASE:
-					etl_queues.merchant_purchase.reserve(count);
-					break;
-				default:
-					break;
-			}
-		}
-	}
-
-	// Helper to deserialize event data
-	auto Deserialize = [](const std::string &data, auto &out) {
-		std::stringstream        ss(data);
-		cereal::JSONInputArchive ar(ss);
-		out.serialize(ar);
-	};
-
-	// Helper to assign ETL table ID
-	auto                                                                                                          AssignEtlId      = [&](
-		PlayerEventLogsRepository::PlayerEventLogs &r,
-		PlayerEvent::EventType type
-	) {
-		if (m_etl_settings.contains(type)) {
-			r.etl_table_id = m_etl_settings.at(type).next_id++;
-		}
-	};
-
-	// Define event processors
-	std::unordered_map<PlayerEvent::EventType, std::function<void(PlayerEventLogsRepository::PlayerEventLogs &)>> event_processors = {
-		{
-			PlayerEvent::EventType::LOOT_ITEM,         [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::LootItemEvent                           in{};
-			PlayerEventLootItemsRepository::PlayerEventLootItems out{};
-			Deserialize(r.event_data, in);
-
-			out.charges      = in.charges;
-			out.corpse_name  = in.corpse_name;
-			out.item_id      = in.item_id;
-			out.item_name    = in.item_name;
-			out.augment_1_id = in.augment_1_id;
-			out.augment_2_id = in.augment_2_id;
-			out.augment_3_id = in.augment_3_id;
-			out.augment_4_id = in.augment_4_id;
-			out.augment_5_id = in.augment_5_id;
-			out.augment_6_id = in.augment_6_id;
-			out.npc_id       = in.npc_id;
-			out.created_at   = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::LOOT_ITEM);
-			etl_queues.loot_items.push_back(out);
-		}
-		},
-		{
-			PlayerEvent::EventType::MERCHANT_SELL,     [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::MerchantSellEvent                             in{};
-			PlayerEventMerchantSellRepository::PlayerEventMerchantSell out{};
-			Deserialize(r.event_data, in);
-
-			out.npc_id                  = in.npc_id;
-			out.merchant_name           = in.merchant_name;
-			out.merchant_type           = in.merchant_type;
-			out.item_id                 = in.item_id;
-			out.item_name               = in.item_name;
-			out.charges                 = in.charges;
-			out.cost                    = in.cost;
-			out.alternate_currency_id   = in.alternate_currency_id;
-			out.player_money_balance    = in.player_money_balance;
-			out.player_currency_balance = in.player_currency_balance;
-			out.created_at              = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::MERCHANT_SELL);
-			etl_queues.merchant_sell.push_back(out);
-		}},
-		{
-			PlayerEvent::EventType::MERCHANT_PURCHASE, [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::MerchantPurchaseEvent                                 in{};
-			PlayerEventMerchantPurchaseRepository::PlayerEventMerchantPurchase out{};
-			Deserialize(r.event_data, in);
-
-			out.npc_id                  = in.npc_id;
-			out.merchant_name           = in.merchant_name;
-			out.merchant_type           = in.merchant_type;
-			out.item_id                 = in.item_id;
-			out.item_name               = in.item_name;
-			out.charges                 = in.charges;
-			out.cost                    = in.cost;
-			out.alternate_currency_id   = in.alternate_currency_id;
-			out.player_money_balance    = in.player_money_balance;
-			out.player_currency_balance = in.player_currency_balance;
-			out.created_at              = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::MERCHANT_PURCHASE);
-			etl_queues.merchant_purchase.push_back(out);
-		}},
-		{
-			PlayerEvent::EventType::NPC_HANDIN,        [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::HandinEvent                             in{};
-			PlayerEventNpcHandinRepository::PlayerEventNpcHandin out{};
-			Deserialize(r.event_data, in);
-
-			out.npc_id          = in.npc_id;
-			out.npc_name        = in.npc_name;
-			out.handin_copper   = in.handin_money.copper;
-			out.handin_silver   = in.handin_money.silver;
-			out.handin_gold     = in.handin_money.gold;
-			out.handin_platinum = in.handin_money.platinum;
-			out.return_copper   = in.return_money.copper;
-			out.return_silver   = in.return_money.silver;
-			out.return_gold     = in.return_money.gold;
-			out.return_platinum = in.return_money.platinum;
-			out.is_quest_handin = in.is_quest_handin;
-			out.created_at      = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::NPC_HANDIN);
-			etl_queues.npc_handin.push_back(out);
-
-			for (const auto &i: in.handin_items) {
-				PlayerEventNpcHandinEntriesRepository::PlayerEventNpcHandinEntries entry{};
-				entry.player_event_npc_handin_id = r.etl_table_id;
-				entry.item_id                    = i.item_id;
-				entry.charges                    = i.charges;
-				entry.type                       = 1;
-				etl_queues.npc_handin_entries.push_back(entry);
-			}
-			for (const auto &i: in.return_items) {
-				PlayerEventNpcHandinEntriesRepository::PlayerEventNpcHandinEntries entry{};
-				entry.player_event_npc_handin_id = r.etl_table_id;
-				entry.item_id                    = i.item_id;
-				entry.charges                    = i.charges;
-				entry.type                       = 2;
-				etl_queues.npc_handin_entries.push_back(entry);
-			}
-		}},
-		{
-			PlayerEvent::EventType::TRADE,             [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::TradeEvent                      in{};
-			PlayerEventTradeRepository::PlayerEventTrade out{};
-			Deserialize(r.event_data, in);
-
-			out.char1_id       = in.character_1_id;
-			out.char2_id       = in.character_2_id;
-			out.char1_copper   = in.character_1_give_money.copper;
-			out.char1_silver   = in.character_1_give_money.silver;
-			out.char1_gold     = in.character_1_give_money.gold;
-			out.char1_platinum = in.character_1_give_money.platinum;
-			out.char2_copper   = in.character_2_give_money.copper;
-			out.char2_silver   = in.character_2_give_money.silver;
-			out.char2_gold     = in.character_2_give_money.gold;
-			out.char2_platinum = in.character_2_give_money.platinum;
-			out.created_at     = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::TRADE);
-			etl_queues.trade.push_back(out);
-
-			for (const auto &i: in.character_1_give_items) {
-				PlayerEventTradeEntriesRepository::PlayerEventTradeEntries entry{};
-				entry.player_event_trade_id = r.etl_table_id;
-				entry.char_id               = in.character_1_id;
-				entry.item_id               = i.item_id;
-				entry.charges               = i.charges;
-				entry.slot                  = i.slot;
-				etl_queues.trade_entries.push_back(entry);
-			}
-			for (const auto &i: in.character_2_give_items) {
-				PlayerEventTradeEntriesRepository::PlayerEventTradeEntries entry{};
-				entry.player_event_trade_id = r.etl_table_id;
-				entry.char_id               = in.character_2_id;
-				entry.item_id               = i.item_id;
-				entry.charges               = i.charges;
-				entry.slot                  = i.slot;
-				etl_queues.trade_entries.push_back(entry);
-			}
-		}},
-		{
-			PlayerEvent::EventType::SPEECH,            [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::PlayerSpeech                      in{};
-			PlayerEventSpeechRepository::PlayerEventSpeech out{};
-			Deserialize(r.event_data, in);
-
-			out.from_char_id = in.from;
-			out.to_char_id   = in.to;
-			out.type         = in.type;
-			out.min_status   = in.min_status;
-			out.message      = in.message;
-			out.guild_id     = in.guild_id;
-			out.created_at   = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::SPEECH);
-			etl_queues.speech.push_back(out);
-		}},
-		{
-			PlayerEvent::EventType::KILLED_NPC,        [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::KilledNPCEvent                          in{};
-			PlayerEventKilledNpcRepository::PlayerEventKilledNpc out{};
-			Deserialize(r.event_data, in);
-
-			out.npc_id                        = in.npc_id;
-			out.npc_name                      = in.npc_name;
-			out.combat_time_seconds           = in.combat_time_seconds;
-			out.total_damage_per_second_taken = in.total_damage_per_second_taken;
-			out.total_heal_per_second_taken   = in.total_heal_per_second_taken;
-			out.created_at                    = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::KILLED_NPC);
-			etl_queues.killed_npc.push_back(out);
-		}},
-		{
-			PlayerEvent::EventType::AA_PURCHASE,       [&](PlayerEventLogsRepository::PlayerEventLogs &r) {
-			PlayerEvent::AAPurchasedEvent                          in{};
-			PlayerEventAaPurchaseRepository::PlayerEventAaPurchase out{};
-			Deserialize(r.event_data, in);
-
-			out.aa_ability_id = in.aa_id;
-			out.cost          = in.aa_cost;
-			out.previous_id   = in.aa_previous_id;
-			out.next_id       = in.aa_next_id;
-			out.created_at    = r.created_at;
-
-			AssignEtlId(r, PlayerEvent::EventType::AA_PURCHASE);
-			etl_queues.aa_purchase.push_back(out);
-		}},
-	};
-
-	// Process the batch queue
-	for (auto &r: m_record_batch_queue) {
-		if (m_settings[r.event_type_id].etl_enabled) {
-			auto it = event_processors.find(static_cast<PlayerEvent::EventType>(r.event_type_id));
-			if (it != event_processors.end()) {
-				it->second(r);  // Call the appropriate lambda
-				r.event_data = "{}"; // Clear event data
-			}
-			else {
-				LogError("Non-Implemented ETL routing [{}]", r.event_type_id);
-			}
-		}
-	}
-
-	// Helper to flush and clear queues
-	auto flush_queue = [&](auto insert_many, auto &queue) {
-		if (!queue.empty()) {
-			insert_many(*m_database, queue);
-			queue.clear();
-		}
-	};
-
 	// flush many
 	PlayerEventLogsRepository::InsertMany(*m_database, m_record_batch_queue);
-
-	// flush etl queues
-	flush_queue(PlayerEventLootItemsRepository::InsertMany, etl_queues.loot_items);
-	flush_queue(PlayerEventMerchantSellRepository::InsertMany, etl_queues.merchant_sell);
-	flush_queue(PlayerEventMerchantPurchaseRepository::InsertMany, etl_queues.merchant_purchase);
-	flush_queue(PlayerEventNpcHandinRepository::InsertMany, etl_queues.npc_handin);
-	flush_queue(PlayerEventNpcHandinEntriesRepository::InsertMany, etl_queues.npc_handin_entries);
-	flush_queue(PlayerEventTradeRepository::InsertMany, etl_queues.trade);
-	flush_queue(PlayerEventTradeEntriesRepository::InsertMany, etl_queues.trade_entries);
-	flush_queue(PlayerEventSpeechRepository::InsertMany, etl_queues.speech);
-	flush_queue(PlayerEventKilledNpcRepository::InsertMany, etl_queues.killed_npc);
-	flush_queue(PlayerEventKilledNamedNpcRepository::InsertMany, etl_queues.killed_named_npc);
-	flush_queue(PlayerEventKilledRaidNpcRepository::InsertMany, etl_queues.killed_raid_npc);
-	flush_queue(PlayerEventAaPurchaseRepository::InsertMany, etl_queues.aa_purchase);
-
-	LogPlayerEvents(
+	LogPlayerEventsDetail(
 		"Processing batch player event log queue of [{}] took [{}]",
 		m_record_batch_queue.size(),
 		benchmark.elapsed()
 	);

 	// empty
-	m_record_batch_queue.clear();
+	m_record_batch_queue = {};
 	m_batch_queue_lock.unlock();
 }

 // adds a player event to the queue
-void PlayerEventLogs::AddToQueue(PlayerEventLogsRepository::PlayerEventLogs &log)
+void PlayerEventLogs::AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &log)
 {
 	m_batch_queue_lock.lock();
 	m_record_batch_queue.emplace_back(log);
@@ -895,7 +588,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			break;
 		}
 		default: {
-			LogPlayerEventsDetail(
+			LogInfo(
 				"Player event [{}] ({}) Discord formatter not implemented",
 				e.player_event_log.event_type_name,
 				e.player_event_log.event_type_id
@@ -909,8 +602,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 // general process function, used in world or QS depending on rule Logging:PlayerEventsQSProcess
 void PlayerEventLogs::Process()
 {
-	if (m_process_batch_events_timer.Check() ||
-		m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
+	if (m_process_batch_events_timer.Check() || m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
 		ProcessBatchQueue();
 	}

@@ -921,115 +613,29 @@ void PlayerEventLogs::Process()

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

-	// Map of repository-specific deletion functions
-	std::unordered_map<PlayerEvent::EventType, std::function<uint32(const std::string &)>> repository_deleters = {
-		{
-			PlayerEvent::LOOT_ITEM,         [&](const std::string &condition) {
-			return PlayerEventLootItemsRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::MERCHANT_SELL,     [&](const std::string &condition) {
-			return PlayerEventMerchantSellRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::MERCHANT_PURCHASE, [&](const std::string &condition) {
-			return PlayerEventMerchantPurchaseRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::NPC_HANDIN,        [&](const std::string &condition) {
-			uint32 deleted_count = PlayerEventNpcHandinRepository::DeleteWhere(*m_database, condition);
-			deleted_count += PlayerEventNpcHandinEntriesRepository::DeleteWhere(*m_database, condition);
-			return deleted_count;
-		}},
-		{
-			PlayerEvent::TRADE,             [&](const std::string &condition) {
-			uint32 deleted_count = PlayerEventTradeRepository::DeleteWhere(*m_database, condition);
-			deleted_count += PlayerEventTradeEntriesRepository::DeleteWhere(*m_database, condition);
-			return deleted_count;
-		}},
-		{
-			PlayerEvent::SPEECH,            [&](const std::string &condition) {
-			return PlayerEventSpeechRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::KILLED_NPC,        [&](const std::string &condition) {
-			return PlayerEventKilledNpcRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::KILLED_NAMED_NPC,  [&](const std::string &condition) {
-			return PlayerEventKilledNamedNpcRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::KILLED_RAID_NPC,   [&](const std::string &condition) {
-			return PlayerEventKilledRaidNpcRepository::DeleteWhere(*m_database, condition);
-		}},
-		{
-			PlayerEvent::AA_PURCHASE,       [&](const std::string &condition) {
-			return PlayerEventAaPurchaseRepository::DeleteWhere(*m_database, condition);
-		}}
-	};
-
-	// Group event types by retention interval
-	std::unordered_map<int, std::vector<int>> retention_groups;
-	for (int                                  i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
+	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		if (m_settings[i].retention_days > 0) {
-			retention_groups[m_settings[i].retention_days].push_back(i);
-		}
-	}
+			int deleted_count = PlayerEventLogsRepository::DeleteWhere(
+				*m_database,
+				fmt::format(
+					"event_type_id = {} AND created_at < (NOW() - INTERVAL {} DAY)",
+					i,
+					m_settings[i].retention_days
+				)
+			);

-	for (const auto &[retention_days, event_types]: retention_groups) {
-		std::string condition = fmt::format(
-			"created_at < (NOW() - INTERVAL {} DAY)",
-			retention_days
-		);
-
-		// Handle ETL deletions for each event type in the group
-		uint32   total_deleted_count = 0;
-		for (int event_type_id: event_types) {
-			if (m_settings[event_type_id].etl_enabled) {
-				auto it = repository_deleters.find(static_cast<PlayerEvent::EventType>(m_settings[event_type_id].id));
-				if (it != repository_deleters.end()) {
-					total_deleted_count += it->second(condition);
-				}
-				else {
-					LogError("Non-Implemented ETL Event Type [{}]", static_cast<uint32>(m_settings[event_type_id].id));
-				}
+			if (deleted_count > 0) {
+				LogInfo(
+					"Truncated [{}] events of type [{}] ({}) older than [{}] days",
+					deleted_count,
+					PlayerEvent::EventName[i],
+					i,
+					m_settings[i].retention_days
+				);
 			}
 		}
-
-		if (total_deleted_count > 0) {
-			LogInfo(
-				"Truncated [{}] ETL events older than [{}] days",
-				total_deleted_count,
-				retention_days
-			);
-		}
-
-		// Batch deletion for player_event_logs
-		std::string event_type_ids = fmt::format(
-			"({})",
-			fmt::join(event_types, ", ")
-		);
-
-		uint32 deleted_count = PlayerEventLogsRepository::DeleteWhere(
-			*m_database,
-			fmt::format(
-				"event_type_id IN {} AND {}",
-				event_type_ids,
-				condition
-			)
-		);
-
-		if (deleted_count > 0) {
-			LogInfo(
-				"Truncated [{}] events of types [{}] older than [{}] days",
-				deleted_count,
-				event_type_ids,
-				retention_days
-			);
-		}
 	}
 }

@@ -1101,144 +707,8 @@ void PlayerEventLogs::SetSettingsDefaults()
 	m_settings[PlayerEvent::PARCEL_RETRIEVE].event_enabled           = 1;
 	m_settings[PlayerEvent::PARCEL_DELETE].event_enabled             = 1;
 	m_settings[PlayerEvent::BARTER_TRANSACTION].event_enabled        = 1;
-	m_settings[PlayerEvent::EVOLVE_ITEM].event_enabled               = 1;
-	m_settings[PlayerEvent::SPEECH].event_enabled                    = 0;

 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;
 	}
 }
-
-void PlayerEventLogs::LoadEtlIds()
-{
-	auto e = [&](auto p) -> bool {
-		for (PlayerEventLogSettingsRepository::PlayerEventLogSettings const &c: m_settings) {
-			if (c.id == p) {
-				return c.etl_enabled ? true : false;
-			}
-		}
-
-		return false;
-	};
-
-	m_etl_settings.clear();
-	m_etl_settings = {
-		{
-			PlayerEvent::LOOT_ITEM,
-			{
-				.enabled = e(PlayerEvent::LOOT_ITEM),
-				.table_name = "player_event_loot_items",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventLootItemsRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::MERCHANT_SELL,
-			{
-				.enabled = e(PlayerEvent::MERCHANT_SELL),
-				.table_name = "player_event_merchant_sell",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventMerchantSellRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::MERCHANT_PURCHASE,
-			{
-				.enabled = e(PlayerEvent::MERCHANT_PURCHASE),
-				.table_name = "player_event_merchant_purchase",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventMerchantPurchaseRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::NPC_HANDIN,
-			{
-				.enabled = e(PlayerEvent::NPC_HANDIN),
-				.table_name = "player_event_npc_handin",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventNpcHandinRepository::TableName()))
-
-			}
-		},
-		{
-			PlayerEvent::TRADE,
-			{
-				.enabled = e(PlayerEvent::TRADE),
-				.table_name = "player_event_trade",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventTradeRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::SPEECH,
-			{
-				.enabled = e(PlayerEvent::SPEECH),
-				.table_name = "player_event_speech",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventSpeechRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::KILLED_NPC,
-			{
-				.enabled = e(PlayerEvent::KILLED_NPC),
-				.table_name = "player_event_killed_npc",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventKilledNpcRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::KILLED_NAMED_NPC,
-			{
-				.enabled = e(PlayerEvent::KILLED_NAMED_NPC),
-				.table_name = "player_event_killed_named_npc",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventKilledNamedNpcRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::KILLED_RAID_NPC,
-			{
-				.enabled = e(PlayerEvent::KILLED_RAID_NPC),
-				.table_name = "player_event_killed_raid_npc",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventKilledRaidNpcRepository::TableName()))
-			}
-		},
-		{
-			PlayerEvent::AA_PURCHASE,
-			{
-				.enabled = e(PlayerEvent::AA_PURCHASE),
-				.table_name = "player_event_aa_purchase",
-				.next_id = static_cast<int64>(m_database->GetNextTableId(PlayerEventAaPurchaseRepository::TableName()))
-			}
-		}
-	};
-
-	for (auto &e: m_etl_settings) {
-		LogPlayerEventsDetail(
-			"ETL Settings [{}] Enabled [{}] Table [{}] NextId [{}]",
-			PlayerEvent::EventName[e.first],
-			e.second.enabled,
-			e.second.table_name,
-			e.second.next_id
-		);
-	}
-}
-
-bool PlayerEventLogs::LoadDatabaseConnection()
-{
-	const auto c = EQEmuConfig::get();
-
-	LogInfo(
-		"Connecting to MySQL for PlayerEvents [{}]@[{}]:[{}]",
-		c->DatabaseUsername.c_str(),
-		c->DatabaseHost.c_str(),
-		c->DatabasePort
-	);
-
-	if (!player_event_database.Connect(
-		c->DatabaseHost.c_str(),
-		c->DatabaseUsername.c_str(),
-		c->DatabasePassword.c_str(),
-		c->DatabaseDB.c_str(),
-		c->DatabasePort
-	)) {
-		LogError("Cannot continue without a database connection for player events.");
-		return false;
-	}
-
-	SetDatabase(&player_event_database);
-	return true;
-}
@@ -1,38 +1,19 @@
 #ifndef EQEMU_PLAYER_EVENT_LOGS_H
 #define EQEMU_PLAYER_EVENT_LOGS_H

+#include "../repositories/player_event_log_settings_repository.h"
+#include "player_events.h"
+#include "../servertalk.h"
+#include "../repositories/player_event_logs_repository.h"
+#include "../timer.h"
+#include "../json/json_archive_single_line.h"
 #include <cereal/archives/json.hpp>
 #include <mutex>
-#include "../json/json_archive_single_line.h"
-#include "../servertalk.h"
-#include "../timer.h"
-#include "../eqemu_config.h"
-
-#include "../repositories/player_event_log_settings_repository.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../repositories/player_event_loot_items_repository.h"
-#include "../repositories/player_event_merchant_purchase_repository.h"
-#include "../repositories/player_event_merchant_sell_repository.h"
-#include "../repositories/player_event_npc_handin_repository.h"
-#include "../repositories/player_event_npc_handin_entries_repository.h"
-#include "../repositories/player_event_trade_repository.h"
-#include "../repositories/player_event_trade_entries_repository.h"
-#include "../repositories/player_event_speech_repository.h"
-#include "../repositories/player_event_killed_npc_repository.h"
-#include "../repositories/player_event_killed_named_npc_repository.h"
-#include "../repositories/player_event_killed_raid_npc_repository.h"
-#include "../repositories/player_event_aa_purchase_repository.h"
-
-

 class PlayerEventLogs {
 public:
-	Database player_event_database{};
-
 	void Init();
-	bool LoadDatabaseConnection();
 	void ReloadSettings();
-	void LoadEtlIds();
 	PlayerEventLogs *SetDatabase(Database *db);
 	bool ValidateDatabaseConnection();
 	bool IsEventEnabled(PlayerEvent::EventType event);
@@ -40,7 +21,7 @@ public:
 	void Process();

 	// batch queue
-	void AddToQueue(PlayerEventLogsRepository::PlayerEventLogs &logs);
+	void AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &logs);

 	// main event record generic function
 	// can ingest any struct event types
@@ -78,29 +59,7 @@ public:
 	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);

 	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
-
-	struct EtlQueues {
-		std::vector<PlayerEventLootItemsRepository::PlayerEventLootItems>               loot_items;
-		std::vector<PlayerEventMerchantPurchaseRepository::PlayerEventMerchantPurchase> merchant_purchase;
-		std::vector<PlayerEventMerchantSellRepository::PlayerEventMerchantSell>         merchant_sell;
-		std::vector<PlayerEventNpcHandinRepository::PlayerEventNpcHandin>               npc_handin;
-		std::vector<PlayerEventNpcHandinEntriesRepository::PlayerEventNpcHandinEntries> npc_handin_entries;
-		std::vector<PlayerEventTradeRepository::PlayerEventTrade>                       trade;
-		std::vector<PlayerEventTradeEntriesRepository::PlayerEventTradeEntries>         trade_entries;
-		std::vector<PlayerEventSpeechRepository::PlayerEventSpeech>                     speech;
-		std::vector<PlayerEventKilledNpcRepository::PlayerEventKilledNpc>               killed_npc;
-		std::vector<PlayerEventKilledNamedNpcRepository::PlayerEventKilledNamedNpc>     killed_named_npc;
-		std::vector<PlayerEventKilledRaidNpcRepository::PlayerEventKilledRaidNpc>       killed_raid_npc;
-		std::vector<PlayerEventAaPurchaseRepository::PlayerEventAaPurchase>             aa_purchase;
-	};
-
 private:
-	struct EtlSettings {
-		bool        enabled;
-		std::string table_name;
-		int64       next_id;
-	};
-
 	Database                                                 *m_database; // reference to database
 	PlayerEventLogSettingsRepository::PlayerEventLogSettings m_settings[PlayerEvent::EventType::MAX]{};

@@ -110,8 +69,6 @@ private:
 	static std::unique_ptr<ServerPacket>
 	BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e);

-	std::map<PlayerEvent::EventType, EtlSettings>  m_etl_settings{};
-
 	// timers
 	Timer m_process_batch_events_timer; // events processing timer
 	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
@@ -121,9 +78,6 @@ private:
 	void ProcessBatchQueue();
 	void ProcessRetentionTruncation();
 	void SetSettingsDefaults();
-
-public:
-	std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
 };

 extern PlayerEventLogs player_event_logs;
@@ -4,7 +4,6 @@
 #include <string>
 #include <cereal/cereal.hpp>
 #include "../types.h"
-#include "../rulesys.h"
 #include "../repositories/player_event_logs_repository.h"

 namespace PlayerEvent {
@@ -63,8 +62,6 @@ namespace PlayerEvent {
 		PARCEL_RETRIEVE,
 		PARCEL_DELETE,
 		BARTER_TRANSACTION,
-		SPEECH,
-		EVOLVE_ITEM,
 		MAX // dont remove
 	};

@@ -127,9 +124,7 @@ namespace PlayerEvent {
 		"Parcel Item Sent",
 		"Parcel Item Retrieved",
 		"Parcel Prune Routine",
-		"Barter Transaction",
-		"Player Speech",
-		"Evolve Item Update"
+		"Barter Transaction"
 	};

 	// Generic struct used by all events
@@ -209,12 +204,12 @@ namespace PlayerEvent {
 		std::string item_name;
 		uint16      to_slot;
 		int16       charges;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
+		uint32      aug1;
+		uint32      aug2;
+		uint32      aug3;
+		uint32      aug4;
+		uint32      aug5;
+		uint32      aug6;
 		bool        attuned;

 		// cereal
@@ -226,57 +221,56 @@ namespace PlayerEvent {
 				CEREAL_NVP(item_name),
 				CEREAL_NVP(to_slot),
 				CEREAL_NVP(charges),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
+				CEREAL_NVP(aug1),
+				CEREAL_NVP(aug2),
+				CEREAL_NVP(aug3),
+				CEREAL_NVP(aug4),
+				CEREAL_NVP(aug5),
+				CEREAL_NVP(aug6),
 				CEREAL_NVP(attuned)
 			);
 		}
 	};

 	// used in Trade event
-	// struct TradeItem {
-	// 	int64       item_id;
-	// 	std::string item_name;
-	// 	int32       slot;
-	//
-	// 	// cereal
-	// 	template<class Archive>
-	// 	void serialize(Archive &ar)
-	// 	{
-	// 		ar(
-	// 			CEREAL_NVP(item_id),
-	// 			CEREAL_NVP(item_name),
-	// 			CEREAL_NVP(slot)
-	// 		);
-	// 	}
-	// };
+	struct TradeItem {
+		int64       item_id;
+		std::string item_name;
+		int32       slot;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(slot)
+			);
+		}
+	};

 	// used in Trade event
 	class TradeItemEntry {
 	public:
 		uint16      slot;
 		uint32      item_id;
-		uint32      augment_1_id;
-		std::string augment_1_name;
-		uint32      augment_2_id;
-		std::string augment_2_name;
-		uint32      augment_3_id;
-		std::string augment_3_name;
-		uint32      augment_4_id;
-		std::string augment_4_name;
-		uint32      augment_5_id;
-		std::string augment_5_name;
-		uint32      augment_6_id;
-		std::string augment_6_name;
 		std::string item_name;
 		uint16      charges;
+		uint32      aug_1_item_id;
+		std::string aug_1_item_name;
+		uint32      aug_2_item_id;
+		std::string aug_2_item_name;
+		uint32      aug_3_item_id;
+		std::string aug_3_item_name;
+		uint32      aug_4_item_id;
+		std::string aug_4_item_name;
+		uint32      aug_5_item_id;
+		std::string aug_5_item_name;
+		uint32      aug_6_item_id;
+		std::string aug_6_item_name;
 		bool        in_bag;

-
 		// cereal
 		template<class Archive>
 		void serialize(Archive &ar)
@@ -284,20 +278,12 @@ namespace PlayerEvent {
 			ar(
 				CEREAL_NVP(slot),
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_1_name),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_2_name),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_1_name),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_4_name),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_5_name),
-				CEREAL_NVP(augment_6_id),
-				CEREAL_NVP(augment_6_name),
-				CEREAL_NVP(item_name),
 				CEREAL_NVP(charges),
+				CEREAL_NVP(aug_1_item_id),
+				CEREAL_NVP(aug_2_item_id),
+				CEREAL_NVP(aug_3_item_id),
+				CEREAL_NVP(aug_4_item_id),
+				CEREAL_NVP(aug_5_item_id),
 				CEREAL_NVP(in_bag)
 			);
 		}
@@ -411,9 +397,9 @@ namespace PlayerEvent {

 	struct AAPurchasedEvent {
 		uint32 aa_id;
-		int32  aa_cost;
-		int32  aa_previous_id;
-		int32  aa_next_id;
+		int32 aa_cost;
+		int32 aa_previous_id;
+		int32 aa_next_id;

 		// cereal
 		template<class Archive>
@@ -430,12 +416,6 @@ namespace PlayerEvent {

 	struct ForageSuccessEvent {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		std::string item_name;

 		// cereal
@@ -444,12 +424,6 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(item_name)
 			);
 		}
@@ -457,12 +431,6 @@ namespace PlayerEvent {

 	struct FishSuccessEvent {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		std::string item_name;

 		// cereal
@@ -471,12 +439,6 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(item_name)
 			);
 		}
@@ -486,13 +448,6 @@ namespace PlayerEvent {
 		uint32      item_id;
 		std::string item_name;
 		int16       charges;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
-		bool        attuned;
 		std::string reason;

 		// cereal
@@ -502,15 +457,8 @@ namespace PlayerEvent {
 			ar(
 				CEREAL_NVP(item_id),
 				CEREAL_NVP(item_name),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
-				CEREAL_NVP(attuned),
-				CEREAL_NVP(reason)
+				CEREAL_NVP(reason),
+				CEREAL_NVP(charges)
 			);
 		}
 	};
@@ -553,12 +501,6 @@ namespace PlayerEvent {
 		uint32      item_id;
 		std::string item_name;
 		int16       charges;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		uint32      npc_id;
 		std::string corpse_name;

@@ -570,12 +512,6 @@ namespace PlayerEvent {
 				CEREAL_NVP(item_id),
 				CEREAL_NVP(item_name),
 				CEREAL_NVP(charges),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(npc_id),
 				CEREAL_NVP(corpse_name)
 			);
@@ -788,12 +724,6 @@ namespace PlayerEvent {

 	struct DroppedItemEvent {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		std::string item_name;
 		int16       slot_id;
 		uint32      charges;
@@ -804,12 +734,6 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(item_name),
 				CEREAL_NVP(slot_id),
 				CEREAL_NVP(charges)
@@ -865,12 +789,6 @@ namespace PlayerEvent {

 	struct TraderPurchaseEvent {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		std::string item_name;
 		uint32      trader_id;
 		std::string trader_name;
@@ -886,12 +804,6 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(item_name),
 				CEREAL_NVP(trader_id),
 				CEREAL_NVP(trader_name),
@@ -905,12 +817,6 @@ namespace PlayerEvent {

 	struct TraderSellEvent {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		std::string item_name;
 		uint32      buyer_id;
 		std::string buyer_name;
@@ -926,12 +832,6 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(item_name),
 				CEREAL_NVP(buyer_id),
 				CEREAL_NVP(buyer_name),
@@ -1062,16 +962,8 @@ namespace PlayerEvent {
 	};

 	struct GuildTributeDonateItem {
-		uint32 item_id;
-		uint32 augment_1_id;
-		uint32 augment_2_id;
-		uint32 augment_3_id;
-		uint32 augment_4_id;
-		uint32 augment_5_id;
-		uint32 augment_6_id;
-		int16  charges;
-		bool   attuned;
-		uint32 guild_favor;
+		uint32      item_id;
+		uint32 		guild_favor;

 		// cereal
 		template<class Archive>
@@ -1079,20 +971,14 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(guild_favor)
 			);
 		}
 	};

 	struct GuildTributeDonatePlat {
-		uint32 plat;
-		uint32 guild_favor;
+		uint32      plat;
+		uint32 		guild_favor;

 		// cereal
 		template<class Archive>
@@ -1107,15 +993,15 @@ namespace PlayerEvent {

 	struct ParcelRetrieve {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		uint32      quantity;
 		std::string from_player_name;
 		uint32      sent_date;
+		uint32      aug_slot_1;
+		uint32      aug_slot_2;
+		uint32      aug_slot_3;
+		uint32      aug_slot_4;
+		uint32      aug_slot_5;
+		uint32      aug_slot_6;

 		// cereal
 		template<class Archive>
@@ -1123,31 +1009,31 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(quantity),
 				CEREAL_NVP(from_player_name),
-				CEREAL_NVP(sent_date)
+				CEREAL_NVP(sent_date),
+				CEREAL_NVP(aug_slot_1),
+				CEREAL_NVP(aug_slot_2),
+				CEREAL_NVP(aug_slot_3),
+				CEREAL_NVP(aug_slot_4),
+				CEREAL_NVP(aug_slot_5),
+				CEREAL_NVP(aug_slot_6)
 			);
 		}
 	};

 	struct ParcelSend {
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		uint32      quantity;
 		std::string from_player_name;
 		std::string to_player_name;
 		uint32      sent_date;
+		uint32      aug_slot_1;
+		uint32      aug_slot_2;
+		uint32      aug_slot_3;
+		uint32      aug_slot_4;
+		uint32      aug_slot_5;
+		uint32      aug_slot_6;

 		// cereal
 		template<class Archive>
@@ -1155,33 +1041,33 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(quantity),
 				CEREAL_NVP(from_player_name),
 				CEREAL_NVP(to_player_name),
-				CEREAL_NVP(sent_date)
+				CEREAL_NVP(sent_date),
+				CEREAL_NVP(aug_slot_1),
+				CEREAL_NVP(aug_slot_2),
+				CEREAL_NVP(aug_slot_3),
+				CEREAL_NVP(aug_slot_4),
+				CEREAL_NVP(aug_slot_5),
+				CEREAL_NVP(aug_slot_6)
 			);
 		}
 	};

 	struct ParcelDelete {
-		uint32      char_id;
 		uint32      item_id;
-		uint32      augment_1_id;
-		uint32      augment_2_id;
-		uint32      augment_3_id;
-		uint32      augment_4_id;
-		uint32      augment_5_id;
-		uint32      augment_6_id;
 		uint32      quantity;
-		uint32      sent_date;
+		uint32      char_id;
 		std::string from_name;
 		std::string note;
+		uint32      sent_date;
+		uint32      aug_slot_1;
+		uint32      aug_slot_2;
+		uint32      aug_slot_3;
+		uint32      aug_slot_4;
+		uint32      aug_slot_5;
+		uint32      aug_slot_6;

 		// cereal
 		template<class Archive>
@@ -1189,18 +1075,18 @@ namespace PlayerEvent {
 		{
 			ar(
 				CEREAL_NVP(item_id),
-				CEREAL_NVP(augment_1_id),
-				CEREAL_NVP(augment_2_id),
-				CEREAL_NVP(augment_3_id),
-				CEREAL_NVP(augment_4_id),
-				CEREAL_NVP(augment_5_id),
-				CEREAL_NVP(augment_6_id),
 				CEREAL_NVP(quantity),
 				CEREAL_NVP(char_id),
 				CEREAL_NVP(from_name),
 				CEREAL_NVP(note),
-				CEREAL_NVP(sent_date)
-			);
+				CEREAL_NVP(sent_date),
+				CEREAL_NVP(aug_slot_1),
+				CEREAL_NVP(aug_slot_2),
+				CEREAL_NVP(aug_slot_3),
+				CEREAL_NVP(aug_slot_4),
+				CEREAL_NVP(aug_slot_5),
+				CEREAL_NVP(aug_slot_6)
+				);
 		}
 	};

@@ -1229,97 +1115,30 @@ namespace PlayerEvent {
 			);
 		}
 	};
-
-	struct EvolveItem {
-		std::string status;
-		uint32      item_id;
-		uint64      unique_id;
-		std::string item_name;
-		uint32      level;
-		double      progression;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(status),
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(unique_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(level),
-				CEREAL_NVP(progression)
-			);
-		}
-	};
-
-	struct PlayerSpeech {
-		std::string to;
-		std::string from;
-		uint32      guild_id;
-		int16       min_status;
-		uint32      type;
-		std::string message;
-
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(to),
-				CEREAL_NVP(from),
-				CEREAL_NVP(guild_id),
-				CEREAL_NVP(min_status),
-				CEREAL_NVP(type),
-				CEREAL_NVP(message)
-			);
-		}
-	};
 }

 #endif //EQEMU_PLAYER_EVENTS_H

 #define RecordPlayerEventLog(event_type, event_data) do {\
    if (player_event_logs.IsEventEnabled(event_type)) {\
-        if (RuleB(Logging, PlayerEventsQSProcess)) {\
-            QServ->SendPacket(\
-                player_event_logs.RecordEvent(\
-                    event_type,\
-                    GetPlayerEvent(),\
-                    event_data\
-                ).get()\
-            );\
-        }                                                                                                          \
-        else {                                                                                                     \
-            worldserver.SendPacket(\
-                player_event_logs.RecordEvent(\
-                    event_type,\
-                    GetPlayerEvent(),\
-                    event_data\
-                ).get()\
-            );\
-        }\
+        worldserver.SendPacket(\
+            player_event_logs.RecordEvent(\
+                event_type,\
+                GetPlayerEvent(),\
+                event_data\
+            ).get()\
+        );\
    }\
 } while (0)

 #define RecordPlayerEventLogWithClient(c, event_type, event_data) do {\
    if (player_event_logs.IsEventEnabled(event_type)) {\
-        if (RuleB(Logging, PlayerEventsQSProcess)) {\
-            QServ->SendPacket(\
-                player_event_logs.RecordEvent(\
-                    event_type,\
-                    (c)->GetPlayerEvent(),\
-                    event_data\
-                ).get()\
-            );\
-        }\
-        else {\
-            worldserver.SendPacket(\
-                player_event_logs.RecordEvent(\
-                    event_type,\
-                    (c)->GetPlayerEvent(),\
-                    event_data\
-                ).get()\
-            );\
-        }\
+        worldserver.SendPacket(\
+            player_event_logs.RecordEvent(\
+                event_type,\
+                (c)->GetPlayerEvent(),\
+                event_data\
+            ).get()\
+        );\
    }\
 } while (0)
@@ -1,303 +0,0 @@
-#include "evolving_items.h"
-#include "item_instance.h"
-#include "events/player_event_logs.h"
-#include "repositories/character_evolving_items_repository.h"
-
-EvolvingItemsManager::EvolvingItemsManager()
-{
-	m_db         = nullptr;
-	m_content_db = nullptr;
-}
-
-void EvolvingItemsManager::LoadEvolvingItems() const
-{
-	auto const &results = ItemsEvolvingDetailsRepository::All(*m_content_db);
-
-	if (results.empty()) {
-		return;
-	}
-
-	std::ranges::transform(
-		results.begin(),
-		results.end(),
-		std::inserter(
-			evolving_items_manager.GetEvolvingItemsCache(),
-			evolving_items_manager.GetEvolvingItemsCache().end()
-		),
-		[](const ItemsEvolvingDetailsRepository::ItemsEvolvingDetails &x) {
-			return std::make_pair(x.item_id, x);
-		}
-	);
-}
-
-void EvolvingItemsManager::SetDatabase(Database *db)
-{
-	m_db = db;
-}
-
-void EvolvingItemsManager::SetContentDatabase(Database *db)
-{
-	m_content_db = db;
-}
-
-double EvolvingItemsManager::CalculateProgression(const uint64 current_amount, const uint32 item_id)
-{
-	if (!evolving_items_manager.GetEvolvingItemsCache().contains(item_id)) {
-		return 0;
-	}
-
-	return evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount > 0
-		? static_cast<double>(current_amount)
-		  / static_cast<double>(evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount) * 100
-		: 0;
-}
-
-void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_id, const EQ::ItemInstance &inst) const
-{
-	inst.SetEvolveEquipped(false);
-	if (inst.IsEvolving() && slot_id <= EQ::invslot::EQUIPMENT_END && slot_id >= EQ::invslot::EQUIPMENT_BEGIN) {
-		inst.SetEvolveEquipped(true);
-	}
-
-	if (!inst.IsEvolving()) {
-		return;
-	}
-
-	if (!inst.GetEvolveUniqueID()) {
-		auto e = CharacterEvolvingItemsRepository::NewEntity();
-
-		e.character_id  = char_id;
-		e.item_id       = inst.GetID();
-		e.equipped      = inst.GetEvolveEquipped();
-		e.final_item_id = evolving_items_manager.GetFinalItemID(inst);
-
-		auto r = CharacterEvolvingItemsRepository::InsertOne(*m_db, e);
-		e.id   = r.id;
-
-		inst.SetEvolveUniqueID(e.id);
-		inst.SetEvolveCharID(e.character_id);
-		inst.SetEvolveItemID(e.item_id);
-		inst.SetEvolveFinalItemID(e.final_item_id);
-
-		return;
-	}
-
-	CharacterEvolvingItemsRepository::SetEquipped(*m_db, inst.GetEvolveUniqueID(), inst.GetEvolveEquipped());
-}
-
-uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const
-{
-	const auto start_iterator = std::ranges::find_if(
-		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		evolving_items_manager.GetEvolvingItemsCache().cend(),
-		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
-			return a.second.item_evo_id == inst.GetEvolveLoreID();
-		}
-	);
-
-	if (start_iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
-		return 0;
-	}
-
-	const auto final_id = std::ranges::max_element(
-		start_iterator,
-		evolving_items_manager.GetEvolvingItemsCache().cend(),
-		[&](
-		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a,
-		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &b
-	) {
-			return a.second.item_evo_id == b.second.item_evo_id &&
-			       a.second.item_evolve_level < b.second.item_evolve_level;
-		}
-	);
-
-	return final_id->first;
-}
-
-uint32 EvolvingItemsManager::GetNextEvolveItemID(const EQ::ItemInstance &inst) const
-{
-	int8 const current_level = inst.GetEvolveLvl();
-
-	const auto iterator = std::ranges::find_if(
-		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		evolving_items_manager.GetEvolvingItemsCache().cend(),
-		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
-			return a.second.item_evo_id == inst.GetEvolveLoreID() &&
-			       a.second.item_evolve_level == current_level + 1;
-		}
-	);
-
-	if (iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
-		return 0;
-	}
-
-	return iterator->first;
-}
-
-ItemsEvolvingDetailsRepository::ItemsEvolvingDetails EvolvingItemsManager::GetEvolveItemDetails(const uint64 unique_id)
-{
-	if (GetEvolvingItemsCache().contains(unique_id)) {
-		return GetEvolvingItemsCache().at(unique_id);
-	}
-
-	return ItemsEvolvingDetailsRepository::NewEntity();
-}
-
-std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> EvolvingItemsManager::GetEvolveIDItems(
-	const uint32 evolve_id
-)
-{
-	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> e{};
-
-	for (auto const &[key, value]: GetEvolvingItemsCache()) {
-		if (value.item_evo_id == evolve_id) {
-			e.push_back(value);
-		}
-	}
-
-	std::ranges::sort(
-		e.begin(),
-		e.end(),
-		[&](
-		ItemsEvolvingDetailsRepository::ItemsEvolvingDetails const &a,
-		ItemsEvolvingDetailsRepository::ItemsEvolvingDetails const &b
-	) {
-			return a.item_evolve_level < b.item_evolve_level;
-		}
-	);
-
-	return e;
-}
-
-uint64 EvolvingItemsManager::GetTotalEarnedXP(const EQ::ItemInstance &inst)
-{
-	if (!inst) {
-		return 0;
-	}
-
-	uint64 xp                 = inst.GetEvolveCurrentAmount();
-	auto evolve_id_item_cache = GetEvolveIDItems(inst.GetEvolveLoreID());
-	auto current_level        = inst.GetEvolveLvl();
-
-	for (auto const &i: evolve_id_item_cache) {
-		if (i.item_evolve_level < current_level) {
-			xp += i.required_amount;
-		}
-	}
-
-	return xp;
-}
-
-EvolveGetNextItem EvolvingItemsManager::GetNextItemByXP(const EQ::ItemInstance &inst_in, const int64 in_xp)
-{
-	EvolveGetNextItem ets{};
-	const auto        evolve_items   = GetEvolveIDItems(inst_in.GetEvolveLoreID());
-	uint32            max_transfer_level = 0;
-	int64             xp                  = in_xp;
-
-	for (auto const &e: evolve_items) {
-		if (e.item_evolve_level < inst_in.GetEvolveLvl()) {
-			continue;
-		}
-
-		int64 have = 0;
-		if (e.item_evolve_level == inst_in.GetEvolveLvl()) {
-			have = inst_in.GetEvolveCurrentAmount();
-		}
-
-		const auto required = e.required_amount;
-		const int64 need    = required - have;
-		const int64 balance = xp - need;
-
-		if (balance <= 0) {
-			ets.new_current_amount  = have + xp;
-			ets.new_item_id         = e.item_id;
-			ets.from_current_amount = 0;
-			ets.max_transfer_level  = max_transfer_level;
-			return ets;
-		}
-
-		xp = balance;
-		max_transfer_level += 1;
-
-		ets.new_current_amount  = required;
-		ets.new_item_id         = e.item_id;
-		ets.from_current_amount = balance - required;
-		ets.max_transfer_level  = max_transfer_level;
-	}
-
-	return ets;
-}
-
-EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
-	const EQ::ItemInstance &inst_from,
-	const EQ::ItemInstance &inst_to
-)
-{
-	EvolveTransfer ets{};
-
-	auto evolving_details_inst_from = evolving_items_manager.GetEvolveItemDetails(inst_from.GetID());
-	auto evolving_details_inst_to   = evolving_items_manager.GetEvolveItemDetails(inst_to.GetID());
-
-	if (!evolving_details_inst_from.id || !evolving_details_inst_to.id) {
-		return ets;
-	}
-
-	if (evolving_details_inst_from.type == evolving_details_inst_to.type) {
-		uint32 compatibility = 0;
-		uint64 xp            = 0;
-		if (evolving_details_inst_from.sub_type == evolving_details_inst_to.sub_type) {
-			compatibility = 100;
-		}
-		else {
-			compatibility = 30;
-		}
-
-		xp           = evolving_items_manager.GetTotalEarnedXP(inst_from) * compatibility / 100;
-		auto results = evolving_items_manager.GetNextItemByXP(inst_to, xp);
-
-		ets.item_from_id             = evolving_items_manager.GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
-		ets.item_from_current_amount = results.from_current_amount;
-		ets.item_to_id               = results.new_item_id;
-		ets.item_to_current_amount   = results.new_current_amount;
-		ets.compatibility            = compatibility;
-		ets.max_transfer_level       = results.max_transfer_level;
-	}
-
-	return ets;
-}
-
-uint32 EvolvingItemsManager::GetFirstItemInLoreGroup(const uint32 lore_id)
-{
-	for (auto const &[key, value]: GetEvolvingItemsCache()) {
-		if (value.item_evo_id == lore_id && value.item_evolve_level == 1) {
-			return key;
-		}
-	}
-
-	return 0;
-}
-
-uint32 EvolvingItemsManager::GetFirstItemInLoreGroupByItemID(const uint32 item_id)
-{
-	for (auto const &[key, value]: GetEvolvingItemsCache()) {
-		if (value.item_id == item_id) {
-			for (auto const &[key2, value2]: GetEvolvingItemsCache()) {
-				if (value2.item_evo_id == value.item_evo_id && value2.item_evolve_level == 1) {
-					return key;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-void EvolvingItemsManager::LoadPlayerEvent(const EQ::ItemInstance &inst, PlayerEvent::EvolveItem &e)
-{
-	e.item_id     = inst.GetID();
-	e.item_name   = inst.GetItem() ? inst.GetItem()->Name : std::string();
-	e.level       = inst.GetEvolveLvl();
-	e.progression = inst.GetEvolveProgression();
-	e.unique_id   = inst.GetEvolveUniqueID();
-}
@@ -1,67 +0,0 @@
-#ifndef EVOLVING_H
-#define EVOLVING_H
-
-#include "shareddb.h"
-#include "events/player_events.h"
-#include "repositories/items_evolving_details_repository.h"
-
-namespace EQ {
-	class ItemInstance;
-}
-
-namespace EvolvingItems {
-	namespace Actions {
-		constexpr int8 UPDATE_ITEMS            = 0;
-		constexpr int8 TRANSFER_WINDOW_OPEN    = 1;
-		constexpr int8 TRANSFER_WINDOW_DETAILS = 2;
-		constexpr int8 TRANSFER_XP             = 3;
-		constexpr int8 FINAL_RESULT            = 4;
-	}
-
-	namespace Types {
-		constexpr int8 AMOUNT_OF_EXP     = 1;
-		constexpr int8 NUMBER_OF_KILLS   = 2;
-		constexpr int8 SPECIFIC_MOB_RACE = 3;
-		constexpr int8 SPECIFIC_ZONE_ID  = 4;
-	}
-
-	namespace SubTypes {
-		constexpr int8 ALL_EXP   = 0;
-		constexpr int8 SOLO_EXP  = 1;
-		constexpr int8 GROUP_EXP = 2;
-		constexpr int8 RAID_EXP  = 3;
-	}
-}
-
-class EvolvingItemsManager
-{
-public:
-	EvolvingItemsManager();
-	void SetDatabase(Database *db);
-	void SetContentDatabase(Database *db);
-
-	void LoadEvolvingItems() const;
-	void DoLootChecks(uint32 char_id, uint16 slot_id, const EQ::ItemInstance &inst) const;
-	uint32 GetFinalItemID(const EQ::ItemInstance &inst) const;
-	uint32 GetNextEvolveItemID(const EQ::ItemInstance &inst) const;
-	uint32 GetFirstItemInLoreGroup(uint32 lore_id);
-	uint32 GetFirstItemInLoreGroupByItemID(uint32 item_id);
-	uint64 GetTotalEarnedXP(const EQ::ItemInstance &inst);
-	static double CalculateProgression(uint64 current_amount, uint32 item_id);
-	static void LoadPlayerEvent(const EQ::ItemInstance &inst, PlayerEvent::EvolveItem &e);
-
-	ItemsEvolvingDetailsRepository::ItemsEvolvingDetails GetEvolveItemDetails(uint64 id);
-	EvolveTransfer DetermineTransferResults(const EQ::ItemInstance& inst_from, const EQ::ItemInstance& inst_to);
-	EvolveGetNextItem GetNextItemByXP(const EQ::ItemInstance &inst_in, int64 in_xp);
-	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails>& GetEvolvingItemsCache() { return evolving_items_cache; }
-	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> GetEvolveIDItems(uint32 evolve_id);
-
-private:
-	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> evolving_items_cache;
-	Database *                                                             m_db;
-	Database *                                                             m_content_db;
-};
-
-extern EvolvingItemsManager evolving_items_manager;
-
-#endif //EVOLVING_H
@@ -336,7 +336,6 @@ bool EQ::InventoryProfile::SwapItem(
 			return false;
 		}

-		source_item_instance->SetEvolveEquipped(false);
 		if (EQ::ValueWithin(destination_slot, invslot::EQUIPMENT_BEGIN, invslot::EQUIPMENT_END)) {
 			auto source_item = source_item_instance->GetItem();
 			if (!source_item) {
@@ -358,9 +357,6 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapLevel;
 				return false;
 			}
-			if (source_item_instance->IsEvolving() > 0) {
-				source_item_instance->SetEvolveEquipped(true);
-			}
 		}
 	}

@@ -370,7 +366,6 @@ bool EQ::InventoryProfile::SwapItem(
 			return false;
 		}

-		destination_item_instance->SetEvolveEquipped(false);
 		if (EQ::ValueWithin(source_slot, invslot::EQUIPMENT_BEGIN, invslot::EQUIPMENT_END)) {
 			auto destination_item = destination_item_instance->GetItem();
 			if (!destination_item) {
@@ -392,9 +387,6 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapLevel;
 				return false;
 			}
-			if (destination_item_instance->IsEvolving()) {
-				destination_item_instance->SetEvolveEquipped(true);
-			}
 		}
 	}

@@ -609,9 +601,9 @@ bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
 	return has_equipped;
 }

-uint32 EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
+int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
 {
-	uint32 quantity = 0;
+	int quantity = 0;
 	ItemInstance* item = nullptr;

 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -640,9 +632,9 @@ bool EQ::InventoryProfile::HasItemEquippedByID(uint32 item_id)
 	return has_equipped;
 }

-uint32 EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
+int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
 {
-	uint32 quantity = 0;
+	int quantity = 0;
 	ItemInstance* item = nullptr;

 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -1414,19 +1406,13 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	int16 result      = INVALID_INDEX;
 	int16 parent_slot = INVALID_INDEX;

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

 	inline std::list<EQ::ItemInstance*>::const_iterator cbegin() { return m_list.cbegin(); }
 	inline std::list<EQ::ItemInstance*>::const_iterator cend() { return m_list.cend(); }
-	inline std::list<EQ::ItemInstance*>::iterator begin() { return m_list.begin(); }
-	inline std::list<EQ::ItemInstance*>::iterator end() { return m_list.end(); }

 	inline int size() { return static_cast<int>(m_list.size()); } // TODO: change to size_t
 	inline bool empty() { return m_list.empty(); }
@@ -149,13 +147,13 @@ namespace EQ
 		bool HasItemEquippedByID(uint32 item_id);

 		// Check how many of a specific item the player has equipped by Item ID
-		uint32 CountItemEquippedByID(uint32 item_id);
+		int CountItemEquippedByID(uint32 item_id);

 		// Check if player has a specific augment equipped by Item ID
 		bool HasAugmentEquippedByID(uint32 item_id);

 		// Check how many of a specific augment the player has equipped by Item ID
-		uint32 CountAugmentEquippedByID(uint32 item_id);
+		int CountAugmentEquippedByID(uint32 item_id);

 		// Get a list of augments from a specific slot ID
 		std::vector<uint32> GetAugmentIDsBySlotID(int16 slot_id);
@@ -206,13 +204,6 @@ namespace EQ
 		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, bool value);
 		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
 		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
-
-		std::map<int16, ItemInstance*>& GetWorn() { return m_worn; }
-		std::map<int16, ItemInstance*>& GetPersonal() { return m_inv; }
-		int16 HasEvolvingItem(uint64 evolve_unique_id, uint8 quantity, uint8 where);
-
-		inline int16 PushItem(int16 slot_id, ItemInstance* inst) { return _PutItem(slot_id, inst); }
-
 	protected:
 		///////////////////////////////
 		// Protected Methods
@@ -233,8 +224,6 @@ namespace EQ
 		int16 _HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity);
 		int16 _HasItemByLoreGroup(std::map<int16, ItemInstance*>& bucket, uint32 loregroup);
 		int16 _HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup);
-		int16 _HasEvolvingItem(std::map<int16, ItemInstance*>& bucket, uint64 evolve_unique_id, uint8 quantity);
-		int16 _HasEvolvingItem(ItemInstQueue& iqueue, uint64 evolve_unique_id, uint8 quantity);


 		// Player inventory
@@ -220,34 +220,6 @@ bool EQ::ItemData::IsType1HWeapon() const
 	return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing) || (ItemType == item::ItemTypeMartial));
 }

-bool EQ::ItemData::IsPetUsable() const
-{
-	if (ItemClass == item::ItemClassBag) {
-		return true;
-	}
-
-	// if it's a misc item and has slots, it's wearable
-	// this item type is conflated with many other item types
-	if (ItemClass == item::ItemTypeMisc && Slots != 0) {
-		return true;
-	}
-
-	switch (ItemType) {
-		case item::ItemType1HBlunt:
-		case item::ItemType1HSlash:
-		case item::ItemType1HPiercing:
-		case item::ItemType2HBlunt:
-		case item::ItemType2HSlash:
-		case item::ItemTypeMartial:
-		case item::ItemTypeShield:
-		case item::ItemTypeArmor:
-		case item::ItemTypeJewelry:
-			return true;
-		default:
-			return false;
-	}
-}
-
 bool EQ::ItemData::IsType2HWeapon() const
 {
 	return ((ItemType == item::ItemType2HBlunt) || (ItemType == item::ItemType2HSlash) || (ItemType == item::ItemType2HPiercing));
@@ -550,7 +550,6 @@ namespace EQ
 		bool IsType1HWeapon() const;
 		bool IsType2HWeapon() const;
 		bool IsTypeShield() const;
-		bool IsPetUsable() const;
 		bool IsQuestItem() const;

 		static bool CheckLoreConflict(const ItemData* l_item, const ItemData* r_item);
@@ -25,7 +25,6 @@
 #include "rulesys.h"
 #include "shareddb.h"
 #include "strings.h"
-#include "evolving_items.h"

 //#include "../common/light_source.h"

@@ -77,10 +76,6 @@ EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
 		m_color = m_item->Color;
 	}

-	if (IsEvolving()) {
-		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
-	}
-
 	m_SerialNumber  = GetNextItemInstSerialNumber();
 }

@@ -100,10 +95,6 @@ EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges
 		m_color = 0;
 	}

-	if (IsEvolving()) {
-		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
-	}
-
 	m_SerialNumber  = GetNextItemInstSerialNumber();
 }

@@ -155,6 +146,7 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)

 	m_exp       = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
+	m_activated = copy.m_activated;

 	if (copy.m_scaledItem) {
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
@@ -162,7 +154,12 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 		m_scaledItem = nullptr;
 	}

-	m_evolving_details    = copy.m_evolving_details;
+	if (copy.m_evolveInfo) {
+		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
+	} else {
+		m_evolveInfo = nullptr;
+	}
+
 	m_scaling             = copy.m_scaling;
 	m_ornamenticon        = copy.m_ornamenticon;
 	m_ornamentidfile      = copy.m_ornamentidfile;
@@ -177,6 +174,7 @@ EQ::ItemInstance::~ItemInstance()
 	Clear();
 	safe_delete(m_item);
 	safe_delete(m_scaledItem);
+	safe_delete(m_evolveInfo);
 }

 // Query item type
@@ -1032,6 +1030,29 @@ void EQ::ItemInstance::ScaleItem() {
 	m_scaledItem->CharmFileID = 0;	// this stops the client from trying to scale the item itself.
 }

+bool EQ::ItemInstance::EvolveOnAllKills() const {
+	return (m_evolveInfo && m_evolveInfo->AllKills);
+}
+
+int8 EQ::ItemInstance::GetMaxEvolveLvl() const {
+	if (m_evolveInfo)
+		return m_evolveInfo->MaxLvl;
+	else
+		return 0;
+}
+
+uint32 EQ::ItemInstance::GetKillsNeeded(uint8 currentlevel) {
+	uint32 kills = -1;	// default to -1 (max uint32 value) because this value is usually divided by, so we don't want to ever return zero.
+	if (m_evolveInfo)
+		if (currentlevel != m_evolveInfo->MaxLvl)
+			kills = m_evolveInfo->LvlKills[currentlevel - 1];
+
+	if (kills == 0)
+		kills = -1;
+
+	return kills;
+}
+
 void EQ::ItemInstance::SetTimer(std::string name, uint32 time) {
 	Timer t(time);
 	t.Start(time, false);
@@ -1785,18 +1806,6 @@ std::vector<uint32> EQ::ItemInstance::GetAugmentIDs() const
 	return augments;
 }

-std::vector<std::string> EQ::ItemInstance::GetAugmentNames() const
-{
-	std::vector<std::string> augment_names;
-
-	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; slot_id++) {
-		const auto augment = GetAugment(slot_id);
-		augment_names.push_back(augment ? augment->GetItem()->Name : "None");
-	}
-
-	return augment_names;
-}
-
 int EQ::ItemInstance::GetItemRegen(bool augments) const
 {
 	int        stat = 0;
@@ -1942,54 +1951,28 @@ void EQ::ItemInstance::ClearGUIDMap()
 {
 	guids.clear();
 }
-
-bool EQ::ItemInstance::TransferOwnership(Database &db, const uint32 to_char_id) const
-{
-	if (!to_char_id || !IsEvolving()) {
-		return false;
-	}
-
-	SetEvolveCharID(to_char_id);
-	CharacterEvolvingItemsRepository::UpdateCharID(db, GetEvolveUniqueID(), to_char_id);
-	return true;
+//
+// class EvolveInfo
+//
+EvolveInfo::EvolveInfo() {
+	// nothing here yet
 }

-uint32 EQ::ItemInstance::GetAugmentEvolveUniqueID(uint8 augment_index) const
-{
-	if (!m_item || !m_item->IsClassCommon()) {
-		return 0;
-	}
-
-	const auto item = GetItem(augment_index);
-	if (item) {
-		return item->GetEvolveUniqueID();
-	}
-
-	return 0;
+EvolveInfo::EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10) {
+	FirstItem = first;
+	MaxLvl = max;
+	AllKills = allkills;
+	LvlKills[0] = L2;
+	LvlKills[1] = L3;
+	LvlKills[2] = L4;
+	LvlKills[3] = L5;
+	LvlKills[4] = L6;
+	LvlKills[5] = L7;
+	LvlKills[6] = L8;
+	LvlKills[7] = L9;
+	LvlKills[8] = L10;
 }

-void EQ::ItemInstance::SetTimer(std::string name, uint32 time) const{
-	Timer t(time);
-	t.Start(time, false);
-	m_timers[name] = t;
-}
-
-void EQ::ItemInstance::SetEvolveEquipped(const bool in) const
-{
-	if (!IsEvolving()) {
-		return;
-	}
-
-	m_evolving_details.equipped = in;
-	if (in && !GetTimers().contains("evolve")) {
-		SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping));
-		return;
-	}
-
-	if (in) {
-		GetTimers().at("evolve").SetTimer(RuleI(EvolvingItems, DelayUponEquipping));
-		return;
-	}
-
-	GetTimers().at("evolve").Disable();
+EvolveInfo::~EvolveInfo() {
+
 }
@@ -23,7 +23,6 @@

 #ifndef COMMON_ITEM_INSTANCE_H
 #define COMMON_ITEM_INSTANCE_H
-#include "evolving_items.h"


 class ItemParse;			// Parses item packets
@@ -35,7 +34,6 @@ class EvolveInfo;			// Stores information about an evolving item family
 #include "../common/bodytypes.h"
 #include "../common/deity.h"
 #include "../common/memory_buffer.h"
-#include "../common/repositories/character_evolving_items_repository.h"

 #include <map>

@@ -207,9 +205,13 @@ namespace EQ
 		bool IsDroppable(bool recurse = true) const;

 		bool IsScaling() const				{ return m_scaling; }
+		bool IsEvolving() const				{ return (m_evolveLvl >= 1); }
 		uint32 GetExp() const				{ return m_exp; }
 		void SetExp(uint32 exp)				{ m_exp = exp; }
 		void AddExp(uint32 exp)				{ m_exp += exp; }
+		bool IsActivated()					{ return m_activated; }
+		void SetActivated(bool activated)	{ m_activated = activated; }
+		int8 GetEvolveLvl() const			{ return m_evolveLvl; }
 		void SetScaling(bool v)				{ m_scaling = v; }
 		uint32 GetOrnamentationIcon() const							{ return m_ornamenticon; }
 		void SetOrnamentIcon(uint32 ornament_icon)					{ m_ornamenticon = ornament_icon; }
@@ -224,6 +226,9 @@ namespace EQ

 		void Initialize(SharedDatabase *db = nullptr);
 		void ScaleItem();
+		bool EvolveOnAllKills() const;
+		int8 GetMaxEvolveLvl() const;
+		uint32 GetKillsNeeded(uint8 currentlevel);

 		std::string Serialize(int16 slot_id) const { InternalSerializedItem_Struct s; s.slot_id = slot_id; s.inst = (const void*)this; std::string ser; ser.assign((char*)&s, sizeof(InternalSerializedItem_Struct)); return ser; }
 		void Serialize(OutBuffer& ob, int16 slot_id) const { InternalSerializedItem_Struct isi; isi.slot_id = slot_id; isi.inst = (const void*)this; ob.write((const char*)&isi, sizeof(isi)); }
@@ -231,9 +236,8 @@ namespace EQ
 		inline int32 GetSerialNumber() const { return m_SerialNumber; }
 		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }

-		std::map<std::string, ::Timer>& GetTimers() const { return m_timers; }
+		std::map<std::string, ::Timer>& GetTimers() { return m_timers; }
 		void SetTimer(std::string name, uint32 time);
-		void SetTimer(std::string name, uint32 time) const;
 		void StopTimer(std::string name);
 		void ClearTimers();

@@ -305,38 +309,9 @@ namespace EQ
 		int GetItemSkillsStat(EQ::skills::SkillType skill, bool augments = false) const;
 		uint32 GetItemGuildFavor() const;
 		std::vector<uint32> GetAugmentIDs() const;
-		std::vector<std::string> GetAugmentNames() const;
 		static void AddGUIDToMap(uint64 existing_serial_number);
 		static void ClearGUIDMap();

-		// evolving items stuff
-		CharacterEvolvingItemsRepository::CharacterEvolvingItems &GetEvolvingDetails() const { return m_evolving_details; }
-
-		int8             GetEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingLevel; } return false; }
-		bool             IsEvolving() const { if (GetItem()) { return GetItem()->EvolvingItem; } return false; }
-		int8             GetMaxEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingMax; } return false; }
-		bool             GetEvolveActivated() const { return m_evolving_details.activated ? true : false; }
-		bool             GetEvolveEquipped() const { return m_evolving_details.equipped ? true : false; }
-		double           GetEvolveProgression() const { return m_evolving_details.progression; }
-		uint64           GetEvolveUniqueID() const { return m_evolving_details.id; }
-		uint32           GetEvolveCharID() const { return m_evolving_details.character_id; }
-		uint32           GetEvolveItemID() const { return m_evolving_details.item_id; }
-		uint32           GetEvolveLoreID() const { if (GetItem()) { return GetItem()->EvolvingID; } return false; }
-		uint64           GetEvolveCurrentAmount() const { return m_evolving_details.current_amount; }
-		uint32           GetEvolveFinalItemID() const { return m_evolving_details.final_item_id; }
-		uint32           GetAugmentEvolveUniqueID(uint8 augment_index) const;
-		void             SetEvolveEquipped(const bool in) const;
-		void             SetEvolveActivated(const bool in) const { m_evolving_details.activated = in; }
-		void             SetEvolveProgression(const double in) const { m_evolving_details.progression = in; }
-		void             SetEvolveUniqueID(const uint64 in) const { m_evolving_details.id = in; }
-		void             SetEvolveCharID(const uint32 in) const { m_evolving_details.character_id = in; }
-		void             SetEvolveItemID(const uint32 in) const { m_evolving_details.item_id = in; }
-		void             SetEvolveCurrentAmount(const uint64 in) const { m_evolving_details.current_amount = in; }
-		void             SetEvolveAddToCurrentAmount(const uint64 in) const { m_evolving_details.current_amount += in; }
-		void             SetEvolveFinalItemID(const uint32 in) const { m_evolving_details.final_item_id = in; }
-		bool             TransferOwnership(Database& db, const uint32 to_char_id) const;
-		void             CalculateEvolveProgression() const { m_evolving_details.progression = evolving_items_manager.CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
-
 	protected:
 		//////////////////////////
 		// Protected Members
@@ -348,32 +323,48 @@ namespace EQ

 		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }

-		ItemInstTypes    m_use_type{ItemInstNormal};// Usage type for item
-		const ItemData * m_item{nullptr};           // Ptr to item data
-		int16            m_charges{0};              // # of charges for chargeable items
-		uint32           m_price{0};                // Bazaar /trader price
-		uint32           m_color{0};
-		uint32           m_merchantslot{0};
-		int16            m_currentslot{0};
-		bool             m_attuned{false};
-		int32            m_merchantcount{1};//number avaliable on the merchant, -1=unlimited
-		int32            m_SerialNumber{0}; // Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32           m_exp{0};
-		int8             m_evolveLvl{0};
-		ItemData *       m_scaledItem{nullptr};
-		bool             m_scaling{false};
-		uint32           m_ornamenticon{0};
-		uint32           m_ornamentidfile{0};
-		uint32           m_new_id_file{0};
-		uint32           m_ornament_hero_model{0};
-		uint32           m_recast_timestamp{0};
-		int              m_task_delivered_count{0};
-		mutable CharacterEvolvingItemsRepository::CharacterEvolvingItems  m_evolving_details{};
+		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
+		const ItemData*		m_item {nullptr};		// Ptr to item data
+		int16				m_charges {0};	// # of charges for chargeable items
+		uint32				m_price {0};	// Bazaar /trader price
+		uint32				m_color {0};
+		uint32				m_merchantslot {0};
+		int16				m_currentslot {0};
+		bool				m_attuned {false};
+		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
+		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp {0};
+		int8				m_evolveLvl {0};
+		bool				m_activated {false};
+		ItemData*			m_scaledItem {nullptr};
+		::EvolveInfo*		m_evolveInfo {nullptr};
+		bool				m_scaling {false};
+		uint32				m_ornamenticon {0};
+		uint32				m_ornamentidfile {0};
+		uint32				m_new_id_file {0};
+		uint32				m_ornament_hero_model {0};
+		uint32				m_recast_timestamp {0};
+		int                 m_task_delivered_count {0};

 		// Items inside of this item (augs or contents) {};
-		std::map<uint8, ItemInstance*>         m_contents {}; // Zero-based index: min=0, max=9
-		std::map<std::string, std::string>     m_custom_data {};
-		mutable std::map<std::string, ::Timer> m_timers {};
+		std::map<uint8, ItemInstance*>		m_contents {}; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data {};
+		std::map<std::string, ::Timer>		m_timers {};
 	};
 }
+
+class EvolveInfo {
+public:
+	friend class EQ::ItemInstance;
+	//temporary
+	uint16				LvlKills[9];
+	uint32				FirstItem;
+	uint8				MaxLvl;
+	bool				AllKills;
+
+	EvolveInfo();
+	EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10);
+	~EvolveInfo();
+};
+
 #endif /*COMMON_ITEM_INSTANCE_H*/
@@ -1,220 +0,0 @@
-#ifndef EQEMU_KSM_HPP
-#define EQEMU_KSM_HPP
-
-#include "../eqemu_logsys.h"
-#include <iostream>
-#include <vector>
-#include <cstring>
-#ifdef _WIN32
-#include <malloc.h>  // For _aligned_malloc, _aligned_free
-#include <windows.h>
-#else
-#include <sys/mman.h>  // For madvise
-#include <unistd.h>    // For sysconf, sbrk
-#endif
-
-
-// Page-aligned allocator for std::vector
-template <typename T>
-class PageAlignedAllocator {
-public:
-	using value_type = T;
-
-	PageAlignedAllocator() noexcept = default;
-	template <typename U>
-	PageAlignedAllocator(const PageAlignedAllocator<U>&) noexcept {}
-
-	T* allocate(std::size_t n) {
-		void* ptr = nullptr;
-		size_t size = n * sizeof(T);
-
-#ifdef _WIN32
-		// Simply allocate memory without alignment
-        ptr = malloc(size);
-        if (!ptr) throw std::bad_alloc();
-#else
-		size_t alignment = getPageSize(); // Get the system's page size
-		if (posix_memalign(&ptr, alignment, size) != 0) {
-			throw std::bad_alloc();
-		}
-#endif
-		return static_cast<T*>(ptr);
-	}
-
-	void deallocate(T* p, std::size_t) noexcept {
-		free(p);
-	}
-
-private:
-	size_t getPageSize() const
-	{
-#ifdef _WIN32
-		SYSTEM_INFO sysInfo;
-		GetSystemInfo(&sysInfo);
-		return sysInfo.dwPageSize; // Page size in bytes
-#else
-		return static_cast<size_t>(sysconf(_SC_PAGESIZE));
-#endif
-	};
-};
-
-template <typename T, typename U>
-bool operator==(const PageAlignedAllocator<T>&, const PageAlignedAllocator<U>&) noexcept {
-	return true;
-}
-
-template <typename T, typename U>
-bool operator!=(const PageAlignedAllocator<T>&, const PageAlignedAllocator<U>&) noexcept {
-	return false;
-}
-
-// Kernel Samepage Merging (KSM) functionality
-namespace KSM {
-
-#ifdef _WIN32
-	// Windows-specific placeholder functions (no-op)
-    inline void CheckPageAlignment(void* ptr) {
-    }
-
-    inline void* AllocatePageAligned(size_t size) {
-        return memset(malloc(size), 0, size);
-    }
-
-    inline void MarkMemoryForKSM(void* start, size_t size) {
-    }
-
-    inline void AlignHeapToPageBoundary() {
-    }
-
-    inline void* MarkHeapStart() {
-        return nullptr;
-    }
-
-    inline size_t MeasureHeapUsage(void* start) {
-        return 0;
-    }
-#else
-	// Linux-specific functionality
-	inline void CheckPageAlignment(void* ptr) {
-		size_t page_size = sysconf(_SC_PAGESIZE);
-		if (reinterpret_cast<uintptr_t>(ptr) % page_size == 0) {
-			LogKSMDetail("Memory is page-aligned [{}]", ptr);
-		} else {
-			LogKSMDetail("Memory is NOT page-aligned [{}]", ptr);
-		}
-	}
-
-	inline void* AllocatePageAligned(size_t size) {
-		size_t page_size = sysconf(_SC_PAGESIZE);
-		void* aligned_ptr = nullptr;
-		if (posix_memalign(&aligned_ptr, page_size, size) != 0) {
-			LogKSM("Failed to allocate page-aligned memory on Linux. page_size [{}] size [{}] bytes", page_size, size);
-		}
-		std::memset(aligned_ptr, 0, size);
-		return aligned_ptr;
-	}
-
-	inline void MarkMemoryForKSM(void* start, size_t size) {
-		if (madvise(start, size, MADV_MERGEABLE) == 0) {
-			LogKSM("Marked memory for KSM | start [{}] size [{}] bytes", start, size);
-		} else {
-			perror("madvise failed");
-		}
-	}
-
-	inline void AlignHeapToPageBoundary() {
-		size_t page_size = sysconf(_SC_PAGESIZE);
-		if (page_size == 0) {
-			LogKSM("Failed to retrieve page size SC_PAGESIZE [{}]", page_size);
-			return;
-		}
-
-		void* current_break = sbrk(0);
-		if (current_break == (void*)-1) {
-			LogKSM("Failed to retrieve the current program break");
-			return;
-		}
-
-		uintptr_t current_address = reinterpret_cast<uintptr_t>(current_break);
-		size_t misalignment = current_address % page_size;
-
-		if (misalignment != 0) {
-			size_t adjustment = page_size - misalignment;
-			if (sbrk(adjustment) == (void*)-1) {
-				LogKSM("Failed to align heap to page boundary. adjustment [{}] bytes", adjustment);
-				return;
-			}
-		}
-
-		LogKSMDetail("Heap aligned to next page boundary. Current break [{}]", sbrk(0));
-	}
-
-	inline void* MarkHeapStart() {
-		void* current_pos = sbrk(0);
-		AlignHeapToPageBoundary();
-		return current_pos;
-	}
-
-	inline size_t MeasureHeapUsage(void* start) {
-		void* current_break = sbrk(0);
-		return static_cast<char*>(current_break) - static_cast<char*>(start);
-	}
-#endif
-
-
-	inline size_t getPageSize()
-	{
-#ifdef _WIN32
-		SYSTEM_INFO sysInfo;
-		GetSystemInfo(&sysInfo);
-		return sysInfo.dwPageSize; // Page size in bytes
-#else
-		return static_cast<size_t>(sysconf(_SC_PAGESIZE)); // POSIX page size
-#endif
-	};
-
-	template <typename T>
-	inline void PageAlignVectorAligned(std::vector<T, PageAlignedAllocator<T>>& vec) {
-		if (vec.empty()) {
-			return;
-		}
-
-		size_t page_size = getPageSize();
-		void* start = vec.data();
-		size_t size = vec.size() * sizeof(T);
-
-		// Check if the memory is page-aligned
-		if (reinterpret_cast<std::uintptr_t>(start) % page_size != 0) {
-			// Allocate a new aligned vector
-			std::vector<T, PageAlignedAllocator<T>> aligned_vec(vec.get_allocator());
-			aligned_vec.reserve(vec.capacity()); // Match capacity to avoid reallocation during copy
-
-			// Copy elements from the original vector
-			aligned_vec.insert(aligned_vec.end(), vec.begin(), vec.end());
-
-			// Swap the aligned vector with the original vector
-			vec.swap(aligned_vec);
-
-			// Clear the temporary aligned vector to free its memory
-			aligned_vec.clear();
-
-			// Verify the new alignment
-			start = vec.data();
-			if (reinterpret_cast<std::uintptr_t>(start) % page_size != 0) {
-				throw std::runtime_error("Failed to align vector memory to page boundaries.");
-			}
-
-			LogKSMDetail("Vector reallocated to ensure page alignment. start [{}] size [{}] bytes", start, size);
-		} else {
-			LogKSMDetail("Vector is already page-aligned. start [{}] size [{}] bytes", start, size);
-		}
-
-#ifndef _WIN32
-		// Mark memory for KSM (only on non-Windows systems)
-		MarkMemoryForKSM(start, size);
-#endif
-	}
-
-}
-
-#endif // EQEMU_KSM_HPP
@@ -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)
@@ -1091,109 +1091,70 @@ void EQ::Net::DaybreakConnection::ProcessResend()
 	}
 }

-// observed client receive window is 300 packets, 140KB
-constexpr size_t MAX_CLIENT_RECV_PACKETS_PER_WINDOW = 300;
-constexpr size_t MAX_CLIENT_RECV_BYTES_PER_WINDOW   = 140 * 1024;
-
 void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 {
 	if (m_status == DbProtocolStatus::StatusDisconnected) {
 		return;
 	}

-	if (m_streams[stream].sent_packets.empty()) {
-		return;
-	}
-
-	m_resend_packets_sent = 0;
-	m_resend_bytes_sent = 0;
-
-	auto now = Clock::now(); // Current time
+	auto resends = 0;
+	auto now = Clock::now();
 	auto s = &m_streams[stream];
+	for (auto &entry : s->sent_packets) {
+		auto time_since_last_send = std::chrono::duration_cast<std::chrono::milliseconds>(now - entry.second.last_sent);
+		if (entry.second.times_resent == 0) {
+			if ((size_t)time_since_last_send.count() > entry.second.resend_delay) {
+				auto &p = entry.second.packet;
+				if (p.Length() >= DaybreakHeader::size()) {
+					if (p.GetInt8(0) == 0 && p.GetInt8(1) >= OP_Fragment && p.GetInt8(1) <= OP_Fragment4) {
+						m_stats.resent_fragments++;
+					}
+					else {
+						m_stats.resent_full++;
+					}
+				}
+				else {
+					m_stats.resent_full++;
+				}
+				m_stats.resent_packets++;

-	// Get a reference resend delay (assume first packet represents the typical case)
-	if (!s->sent_packets.empty()) {
-		// Check if the first packet has timed out
-		auto &first_packet = s->sent_packets.begin()->second;
-		auto time_since_first_sent = std::chrono::duration_cast<std::chrono::milliseconds>(now - first_packet.first_sent).count();
-
-		// make sure that the first_packet in the list first_sent time is within the resend_delay and now
-		// if it is not, then we need to resend all packets in the list
-		if (time_since_first_sent <= first_packet.resend_delay && !m_acked_since_last_resend) {
-			LogNetcodeDetail(
-				"Not resending packets for stream [{}] time since first sent [{}] resend delay [{}] m_acked_since_last_resend [{}]",
-				stream,
-				time_since_first_sent,
-				first_packet.resend_delay,
-				m_acked_since_last_resend
-			);
-			return;
-		}
-
-		if (time_since_first_sent >= m_owner->m_options.resend_timeout) {
-			Close();
-			return;
-		}
-	}
-
-	if (LogSys.IsLogEnabled(Logs::Detail, Logs::Netcode)) {
-		size_t    total_size = 0;
-		for (auto &e: s->sent_packets) {
-			total_size += e.second.packet.Length();
-		}
-
-		LogNetcodeDetail(
-			"Resending packets for stream [{}] packet count [{}] total packet size [{}] m_acked_since_last_resend [{}]",
-			stream,
-			s->sent_packets.size(),
-			total_size,
-			m_acked_since_last_resend
-		);
-	}
-
-	for (auto &e: s->sent_packets) {
-		if (m_resend_packets_sent >= MAX_CLIENT_RECV_PACKETS_PER_WINDOW ||
-			m_resend_bytes_sent >= MAX_CLIENT_RECV_BYTES_PER_WINDOW) {
-			LogNetcodeDetail(
-				"Stopping resend because we hit thresholds m_resend_packets_sent [{}] max [{}] m_resend_bytes_sent [{}] max [{}]",
-				m_resend_packets_sent,
-				MAX_CLIENT_RECV_PACKETS_PER_WINDOW,
-				m_resend_bytes_sent,
-				MAX_CLIENT_RECV_BYTES_PER_WINDOW
-			);
-			break;
-		}
-
-		auto &sp = e.second;
-		auto &p  = sp.packet;
-		if (p.Length() >= DaybreakHeader::size()) {
-			if (p.GetInt8(0) == 0 && p.GetInt8(1) >= OP_Fragment && p.GetInt8(1) <= OP_Fragment4) {
-				m_stats.resent_fragments++;
-			}
-			else {
-				m_stats.resent_full++;
+				InternalBufferedSend(p);
+				entry.second.last_sent = now;
+				entry.second.times_resent++;
+				entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
+				resends++;
 			}
 		}
 		else {
-			m_stats.resent_full++;
+			auto time_since_first_sent = std::chrono::duration_cast<std::chrono::milliseconds>(now - entry.second.first_sent);
+			if (time_since_first_sent.count() >= m_owner->m_options.resend_timeout) {
+				Close();
+				return;
+			}
+
+			if ((size_t)time_since_last_send.count() > entry.second.resend_delay) {
+				auto &p = entry.second.packet;
+				if (p.Length() >= DaybreakHeader::size()) {
+					if (p.GetInt8(0) == 0 && p.GetInt8(1) >= OP_Fragment && p.GetInt8(1) <= OP_Fragment4) {
+						m_stats.resent_fragments++;
+					}
+					else {
+						m_stats.resent_full++;
+					}
+				}
+				else {
+					m_stats.resent_full++;
+				}
+				m_stats.resent_packets++;
+
+				InternalBufferedSend(p);
+				entry.second.last_sent = now;
+				entry.second.times_resent++;
+				entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
+				resends++;
+			}
 		}
-		m_stats.resent_packets++;
-
-		// Resend the packet
-		InternalBufferedSend(p);
-
-		m_resend_packets_sent++;
-		m_resend_bytes_sent += p.Length();
-		sp.last_sent = now;
-		sp.times_resent++;
-		sp.resend_delay = EQ::Clamp(
-			sp.resend_delay * 2,
-			m_owner->m_options.resend_delay_min,
-			m_owner->m_options.resend_delay_max
-		);
 	}
-
-	m_acked_since_last_resend = false;
 }

 void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
@@ -1214,7 +1175,6 @@ void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
 			m_rolling_ping = (m_rolling_ping * 2 + round_time) / 3;

 			iter = s->sent_packets.erase(iter);
-			m_acked_since_last_resend = true;
 		}
 		else {
 			++iter;
@@ -181,11 +181,6 @@ namespace EQ
 			Timestamp m_close_time;
 			double m_outgoing_budget;

-			// resend tracking
-			size_t m_resend_packets_sent = 0;
-			size_t m_resend_bytes_sent = 0;
-			bool m_acked_since_last_resend = false;
-
 			struct DaybreakSentPacket
 			{
 				DynamicPacket packet;
@@ -23,9 +23,6 @@ namespace EQ
 			bool Connected() const { return m_connecting != true; }

 			std::shared_ptr<EQ::Net::TCPConnection> Handle() { return m_connection; }
-
-			const std::unique_ptr<EQ::Timer> &GetTimer() const { return m_timer; }
-
 		private:
 			void Connect();
 			void ProcessData(EQ::Net::TCPConnection *c, const unsigned char *data, size_t length);
@@ -123,7 +123,7 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 {
 	size_t current = 0;
 	size_t total = m_buffer.size();
-	constexpr size_t ls_info_size = sizeof(LoginserverNewWorldRequest);
+	constexpr size_t ls_info_size = sizeof(ServerNewLSInfo_Struct);

 	while (current < total) {
 		auto left = total - current;
@@ -138,7 +138,7 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 		//this creates a small edge case where the exact size of a
 		//packet from the modern protocol can't be "43061256"
 		//so in send we pad it one byte if that's the case
-		if (leg_opcode == ServerOP_NewLSInfo && leg_size == sizeof(LoginserverNewWorldRequest)) {
+		if (leg_opcode == ServerOP_NewLSInfo && leg_size == sizeof(ServerNewLSInfo_Struct)) {
 			m_legacy_mode = true;
 			m_identifier = "World";
 			m_parent->ConnectionIdentified(this);
@@ -80,8 +80,6 @@ void EQ::Net::TCPConnection::Start() {
 			}
 		}
 		else if (nread == UV_EOF) {
-			connection->Disconnect();
-
 			if (buf->base) {
 				delete[] buf->base;
 			}
@@ -197,7 +197,6 @@ IN(OP_RecipeDetails, uint32);
 //there is also a complicated OP_RecipeDetails reply struct OUT
 IN(OP_RecipeAutoCombine, RecipeAutoCombine_Struct);
 IN(OP_TradeSkillCombine, NewCombine_Struct);
-IN(OP_TradeSkillRecipeInspect, TradeSkillRecipeInspect_Struct);
 IN(OP_ItemName, ItemNamePacket_Struct);
 IN(OP_AugmentItem, AugmentItem_Struct);
 IN(OP_ClickDoor, ClickDoor_Struct);
@@ -251,7 +250,6 @@ IN(OP_TraderBuy, TraderBuy_Struct);
 IN(OP_Trader, Trader_ShowItems_Struct);
 IN(OP_GMFind, GMSummon_Struct);
 IN(OP_PickPocket, PickPocket_Struct);
-IN(OP_PickZone, PickZone_Struct);
 IN(OP_Bind_Wound, BindWound_Struct);
 INr(OP_TrackTarget);
 INr(OP_Track);
@@ -5188,14 +5188,7 @@ namespace RoF

 		//sprintf(hdr.unknown000, "06e0002Y1W00");

-		strn0cpy(
-			hdr.unknown000,
-			fmt::format(
-				"{:016}\0",
-				packet_type == ItemPacketInvalid ? 0 : inst->GetSerialNumber()
-			).c_str(),
-			sizeof(hdr.unknown000)
-		);
+		snprintf(hdr.unknown000, sizeof(hdr.unknown000), "%016d", item->ID);

 		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 1000) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
 		hdr.unknown004 = 0;
@@ -433,9 +433,7 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint32, eq, i.item_icon);
 					VARSTRUCT_SKIP_TYPE(uint32, eq);
 				}
-
 				dest->QueuePacket(outapp.get());
-				safe_delete(in);
 				break;
 			}
 			default: {
@@ -470,8 +468,8 @@ namespace RoF2
 				}

 				auto p_size = 41 * results.size() + name_size + 14;
-				auto buffer = new char[p_size];
-				auto bufptr = buffer;
+				auto buffer = std::make_unique<char[]>(p_size);
+				auto bufptr = buffer.get();

 				VARSTRUCT_ENCODE_TYPE(uint32, bufptr, 0);
 				VARSTRUCT_ENCODE_TYPE(uint16, bufptr, results[0].trader_zone_id);
@@ -489,11 +487,10 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, i.item_stat);                          //itemstat
 				}

-				safe_delete_array(in->pBuffer);
+				safe_delete(in->pBuffer);
 				in->size    = p_size;
-				in->pBuffer = (uchar*)buffer;
+				in->pBuffer = (uchar *) buffer.get();
 				dest->QueuePacket(in);
-				safe_delete(in);

 				break;
 			}
@@ -503,22 +500,21 @@ namespace RoF2
 				break;
 			}
 			case WelcomeMessage: {
-				auto buffer = new char[sizeof(structs::BazaarWelcome_Struct)];
+				auto buffer = std::make_unique<char[]>(sizeof(structs::BazaarWelcome_Struct));
 				auto emu    = (BazaarWelcome_Struct *) in->pBuffer;
-				auto eq     = (structs::BazaarWelcome_Struct *) buffer;
+				auto eq     = (structs::BazaarWelcome_Struct *) buffer.get();

 				eq->action         = structs::RoF2BazaarTraderBuyerActions::WelcomeMessage;
 				eq->num_of_traders = emu->traders;
 				eq->num_of_items   = emu->items;

-				safe_delete_array(in->pBuffer);
+				safe_delete(in->pBuffer);
 				in->SetOpcode(OP_TraderShop);
 				in->size    = sizeof(structs::BazaarWelcome_Struct);
-				in->pBuffer = (uchar *)buffer;
+				in->pBuffer = (uchar *) buffer.get();

 				LogTrading("(RoF2) WelcomeMessage action <green>[{}]", action);
 				dest->QueuePacket(in);
-				safe_delete(in);

 				break;
 			}
@@ -587,21 +583,19 @@ namespace RoF2
 				auto outapp = new EQApplicationPacket(OP_TraderShop, sizeof(BecomeTrader_Struct));
 				auto eq     = (BecomeTrader_Struct *) outapp->pBuffer;

-				eq->action           = emu->action;
-				eq->entity_id        = emu->entity_id;
-				eq->trader_id        = emu->trader_id;
-				eq->zone_id          = emu->zone_id;
-				eq->zone_instance_id = emu->zone_instance_id;
+				eq->action    = emu->action;
+				eq->entity_id = emu->entity_id;
+				eq->trader_id = emu->trader_id;
+				eq->zone_id   = emu->zone_id;
 				strn0cpy(eq->trader_name, emu->trader_name, sizeof(eq->trader_name));

 				LogTrading(
-					"(RoF2) AddTraderToBazaarWindow action <green>[{}] trader_id <green>[{}] entity_id <green>[{}] "
-					"zone_id <green>[{}] zone_instance_id <green>[{}]",
+					"(RoF2) AddTraderToBazaarWindow action <green>[{}] trader_id <green>[{}] entity_id <green>[{}] zone_id <green>[{}]",
 					eq->action,
 					eq->trader_id,
 					eq->entity_id,
-					eq->zone_id,
-					eq->zone_instance_id);
+					eq->zone_id
+				);
 				dest->FastQueuePacket(&outapp);
 				break;
 			}
@@ -896,9 +890,7 @@ namespace RoF2
 					VARSTRUCT_ENCODE_TYPE(uint16, eq, b.buyer_zone_instance_id);
 					VARSTRUCT_ENCODE_STRING(eq, b.buyer_name.c_str());
 				}
-
 				dest->QueuePacket(outapp.get());
-				safe_delete(inapp);
 				break;
 			}
 			case Barter_RemoveFromMerchantWindow: {
@@ -969,7 +961,6 @@ namespace RoF2
 				VARSTRUCT_ENCODE_TYPE(uint32, eq, blsi.seller_quantity);

 				dest->QueuePacket(outapp.get());
-				safe_delete(inapp);
 				break;
 			}
 			default: {
@@ -1350,58 +1341,6 @@ namespace RoF2
 		dest->FastQueuePacket(&in, ack_req);
 	}

-	ENCODE(OP_EvolveItem)
-	{
-		EQApplicationPacket *in = *p;
-		*p                      = nullptr;
-
-		auto action = *reinterpret_cast<uint32 *>(in->pBuffer);
-
-		switch (action) {
-			case EvolvingItems::Actions::TRANSFER_WINDOW_DETAILS: {
-				auto emu = reinterpret_cast<EvolveItemMessaging *>(in->pBuffer);
-
-				EvolveXPWindowSend           e{};
-				EQ::Util::MemoryStreamReader ss(emu->serialized_data, in->size - sizeof(emu->action));
-				cereal::BinaryInputArchive ar(ss);
-				ar(e);
-
-				auto item_1 = static_cast<const EQ::ItemInstance *>(reinterpret_cast<EQ::InternalSerializedItem_Struct
-					*>(e.serialize_item_1.data())->inst);
-				auto item_2 = static_cast<const EQ::ItemInstance *>(reinterpret_cast<EQ::InternalSerializedItem_Struct
-					*>(e.serialize_item_2.data())->inst);
-
-				EQ::OutBuffer ob;
-
-				SerializeItem(ob, item_1, 0, 0, ItemPacketMerchant);
-				SerializeItem(ob, item_2, 0, 0, ItemPacketMerchant);
-
-				auto out = std::make_unique<EQApplicationPacket>(
-					OP_EvolveItem,
-					sizeof(EvolveXPWindowSendDetails_Struct) + ob.size()
-				);
-				auto data = reinterpret_cast<EvolveXPWindowSendDetails_Struct *>(out->pBuffer);
-
-				data->action             = e.action;
-				data->compatibility      = e.compatibility;
-				data->max_transfer_level = e.max_transfer_level;
-				data->item1_unique_id    = e.item1_unique_id;
-				data->item2_unique_id    = e.item2_unique_id;
-				data->item1_present      = e.item1_present;
-				data->item2_present      = e.item2_present;
-
-				memcpy(data->serialize_data, ob.str().data(), ob.size());
-				dest->QueuePacket(out.get());
-				safe_delete(in);
-				break;
-			}
-			default: {
-				dest->FastQueuePacket(&in);
-				break;
-			}
-		}
-	}
-
 	ENCODE(OP_ExpansionInfo)
 	{
 		ENCODE_LENGTH_EXACT(ExpansionInfo_Struct);
@@ -1904,11 +1843,11 @@ namespace RoF2
 			}
 		}

-		safe_delete_array(in->pBuffer);
+		auto outapp     = new EQApplicationPacket(OP_GuildsList);
+		outapp->size    = packet_size;
+		outapp->pBuffer = buffer;

-		in->pBuffer = buffer;
-		in->size    = packet_size;
-		dest->FastQueuePacket(&in);
+		dest->FastQueuePacket(&outapp);
 	}

 	ENCODE(OP_GuildTributeDonateItem)
@@ -2105,33 +2044,6 @@ namespace RoF2
        }
    }

-	ENCODE(OP_ItemPreviewRequest)
-	{
-		EQApplicationPacket* in = *p;
-		*p = nullptr;
-
-		uchar* in_buf = in->pBuffer;
-
-		auto int_item = (EQ::InternalSerializedItem_Struct*) in_buf;
-
-		EQ::OutBuffer           buf;
-		EQ::OutBuffer::pos_type last_pos = buf.tellp();
-
-		SerializeItem(buf, (const EQ::ItemInstance*) int_item->inst, int_item->slot_id, 0, ItemPacketInvalid);
-		if (buf.tellp() == last_pos) {
-			LogNetcode("RoF2::ENCODE(OP_ItemPreviewRequest) Serialization failed");
-			safe_delete_array(in_buf);
-			safe_delete(in);
-			return;
-		}
-
-		in->size    = buf.size();
-		in->pBuffer = buf.detach();
-
-		safe_delete_array(in_buf);
-		dest->FastQueuePacket(&in, ack_req);
-	}
-
 	ENCODE(OP_ItemVerifyReply)
 	{
 		ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct);
@@ -6306,11 +6218,6 @@ namespace RoF2
 				FINISH_DIRECT_DECODE();
 				break;
 			}
-			case structs::RoF2BazaarTraderBuyerActions::FirstOpenSearch: {
-				__packet->SetOpcode(OP_BazaarSearch);
-				LogTrading("(RoF2) First time opening Bazaar Search since zoning. Action <green>[{}]", action);
-				break;
-			}
 			case structs::RoF2BazaarTraderBuyerActions::WelcomeMessage: {
 				__packet->SetOpcode(OP_BazaarSearch);
 				LogTrading("(RoF2) WelcomeMessage action <green>[{}]", action);
@@ -6451,18 +6358,9 @@ namespace RoF2
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
 		strn0cpy(hdr.unknown000, fmt::format("{:016}\0", inst->GetSerialNumber()).c_str(),sizeof(hdr.unknown000));

-		hdr.stacksize = 1;
-
-		if (item->ID == PARCEL_MONEY_ITEM_ID) {
-			hdr.stacksize = inst->GetPrice();
-		} else if (inst->IsStackable()) {
-			if (inst->GetCharges() > std::numeric_limits<int16>::max()) {
-				hdr.stacksize = std::numeric_limits<uint32>::max();
-			} else {
-				hdr.stacksize = inst->GetCharges();
-			}
-		}
-
+		hdr.stacksize =
+			item->ID == PARCEL_MONEY_ITEM_ID ? inst->GetPrice() : (inst->IsStackable() ? ((inst->GetCharges() > 1000)
+				? 0xFFFFFFFF : inst->GetCharges()) : 1);
 		hdr.unknown004 = 0;

 		structs::InventorySlot_Struct slot_id{};
@@ -6484,11 +6382,6 @@ namespace RoF2
 		hdr.scaled_value   = (inst->IsScaling() ? (inst->GetExp() / 100) : 0);
 		hdr.instance_id    = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : inst->GetSerialNumber());
 		hdr.parcel_item_id = packet_type == ItemPacketParcel ? inst->GetID() : 0;
-		if (item->EvolvingItem) {
-			hdr.instance_id    = inst->GetEvolveUniqueID() & 0xFFFFFFFF; //lower dword
-			hdr.parcel_item_id = inst->GetEvolveUniqueID() >> 32;        //upper dword
-		}
-
 		hdr.last_cast_time = inst->GetRecastTimestamp();
 		hdr.charges        = (inst->IsStackable() ? (item->MaxCharges ? 1 : 0) : ((inst->GetCharges() > 254)
 			? 0xFFFFFFFF
@@ -6502,15 +6395,18 @@ namespace RoF2
 		ob.write((const char*)&hdr, sizeof(RoF2::structs::ItemSerializationHeader));

 		if (item->EvolvingItem > 0) {
-			RoF2::structs::EvolvingItem_Struct evotop;
+			RoF2::structs::EvolvingItem evotop;

-			evotop.final_item_id    = inst->GetEvolveFinalItemID();
-			evotop.evolve_level     = item->EvolvingLevel;
-			evotop.progress         = inst->GetEvolveProgression();
-			evotop.activated        = inst->GetEvolveActivated();
-			evotop.evolve_max_level = item->EvolvingMax;
+			evotop.unknown001 = 0;
+			evotop.unknown002 = 0;
+			evotop.unknown003 = 0;
+			evotop.unknown004 = 0;
+			evotop.evoLevel = item->EvolvingLevel;
+			evotop.progress = 0;
+			evotop.Activated = 1;
+			evotop.evomaxlevel = item->EvolvingMax;

-			ob.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem_Struct));
+			ob.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
 		}

 		/**
@@ -6884,13 +6780,12 @@ namespace RoF2
 		iqbs.Heirloom = 0;
 		iqbs.Placeable = 0;
 		iqbs.unknown28 = -1;
-		iqbs.unknown29 = packet_type == ItemPacketInvalid ? 0xFF : 0;
 		iqbs.unknown30 = -1;
 		iqbs.NoZone = 0;
 		iqbs.NoGround = 0;
 		iqbs.unknown37a = 0;	// (guessed position) New to RoF2
 		iqbs.unknown38 = 0;
-		iqbs.unknown39 = packet_type == ItemPacketInvalid ? 0 : 1;;
+		iqbs.unknown39 = 1;

 		ob.write((const char*)&iqbs, sizeof(RoF2::structs::ItemQuaternaryBodyStruct));

@@ -304,7 +304,6 @@ namespace RoF2

 		const size_t SAY_LINK_BODY_SIZE = 56;
 		const uint32 MAX_GUILD_ID       = 50000;
-		const uint32 MAX_BAZAAR_TRADERS = 600;

 	} /*constants*/

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
@@ -70,7 +70,6 @@ E(OP_DzMemberListName)
 E(OP_DzMemberListStatus)
 E(OP_DzSetLeaderName)
 E(OP_Emote)
-E(OP_EvolveItem)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
 E(OP_GMLastName)
@@ -92,7 +91,6 @@ E(OP_InspectBuffs)
 E(OP_InspectRequest)
 E(OP_ItemLinkResponse)
 E(OP_ItemPacket)
-E(OP_ItemPreviewRequest)
 E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
@@ -3119,8 +3119,7 @@ enum RoF2BazaarTraderBuyerActions {
 	BazaarInspect    = 18,
 	ClickTrader      = 28,
 	ItemMove         = 19,
-	ReconcileItems   = 20,
-	FirstOpenSearch  = 26
+	ReconcileItems   = 20
 };

 enum RoF2BuyerActions {
@@ -3935,11 +3934,6 @@ struct NewCombine_Struct
 /*24*/
 };

-struct TradeSkillRecipeInspect_Struct {
-	uint32 recipe_id;
-	uint32 padding[17];
-};
-

 //client requesting favorite recipies
 struct TradeskillFavorites_Struct {
@@ -4741,7 +4735,7 @@ struct ItemSerializationHeader
    /*036*/ uint32 merchant_slot;  // 1 if not a merchant item
    /*040*/ uint32 scaled_value;   // 0
    /*044*/ uint32 instance_id;    // unique instance id if not merchant item, else is merchant slot
-    /*048*/ uint32 parcel_item_id;
+    /*048*/ uint32 parcel_item_id; 
    /*052*/ uint32 last_cast_time; // Unix Time from PP of last cast for this recast type if recast delay > 0
    /*056*/ uint32 charges;        // Total Charges an item has (-1 for unlimited)
    /*060*/ uint32 inst_nodrop;    // 1 if the item is no drop (attuned items)
@@ -4751,13 +4745,16 @@ struct ItemSerializationHeader
    uint8          isEvolving;
 };

-struct EvolvingItem_Struct {
-	uint32 final_item_id;
-	int32  evolve_level;
+struct EvolvingItem {
+	uint8 unknown001;
+	uint8 unknown002;
+	uint8 unknown003;
+	uint8 unknown004;
+	int32 evoLevel;
 	double progress;
-	uint8  activated;
-	int32  evolve_max_level;
-	uint8  unknown005[4];
+	uint8 Activated;
+	int32 evomaxlevel;
+	uint8 unknown005[4];
 };

 struct ItemSerializationHeaderFinish
@@ -5430,32 +5427,6 @@ struct Parcel_Struct
 };
 	}; /*structs*/

-struct EvolveItemToggle_Struct {
-	uint32 action;
-	uint32 unknown_004;
-	uint64 unique_id;
-	uint32 percentage;
-	uint32 activated;
-};
-
-struct EvolveXPWindowReceive_Struct {
-	uint32 action;
-	uint32 unknown_004;
-	uint64 item1_unique_id;
-	uint64 item2_unique_id;
-};
-
-struct EvolveXPWindowSendDetails_Struct {
-	/*000*/	uint32 action;
-	/*004*/	uint64 item1_unique_id;
-	/*012*/	uint64 item2_unique_id;
-	/*020*/	uint32 compatibility;
-	/*024*/	uint32 max_transfer_level;
-	/*028*/	uint8  item1_present;
-	/*029*/ uint8  item2_present;
-	/*030*/ char   serialize_data[];
-};
-
 }; /*RoF2*/

 #endif /*COMMON_ROF2_STRUCTS_H*/
@@ -286,8 +286,8 @@ namespace Titanium

 		const size_t CHARACTER_CREATION_LIMIT = 8; // Hard-coded in client - DO NOT ALTER

-		const size_t SAY_LINK_BODY_SIZE       = 45;
-		const uint32 MAX_GUILD_ID             = 1500;
+		const size_t SAY_LINK_BODY_SIZE = 45;
+		const uint32 MAX_GUILD_ID       = 1500;

 	} /*constants*/

@@ -5,19 +5,31 @@
 #include "strings.h"

 #include <filesystem>
-
 namespace fs = std::filesystem;

+inline std::string striptrailingslash(const std::string &file_path)
+{
+	if (file_path.back() == '/' || file_path.back() == '\\') {
+		return file_path.substr(0, file_path.length() - 1);
+	}
+
+	return file_path;
+}
+
 void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();

+	if (!m_server_path.empty()) {
+		std::filesystem::current_path(m_server_path);
+	}
+
 	if (m_server_path.empty()) {
 		LogInfo("Failed to load server path");
 		return;
 	}

-	std::filesystem::current_path(m_server_path);
+	LogInfo("server [{}]", m_server_path);

 	if (!EQEmuConfig::LoadConfig()) {
 		LogError("Failed to load eqemu config");
@@ -26,64 +38,66 @@ void PathManager::LoadPaths()

 	const auto c = EQEmuConfig::get();

-	auto resolve_path = [&](const std::string& dir, const std::vector<std::string>& fallback_dirs = {}) -> std::string {
-		// relative
-		if (File::Exists((fs::path{m_server_path} / dir).string())) {
-			return fs::relative(fs::path{m_server_path} / dir).lexically_normal().string();
-		}
-
-		// absolute
-		if (File::Exists(fs::path{dir}.string())) {
-			return fs::absolute(fs::path{dir}).string();
-		}
-
-		// fallback search options if specified
-		for (const auto& fallback : fallback_dirs) {
-			if (File::Exists((fs::path{m_server_path} / fallback).string())) {
-				return fs::relative(fs::path{m_server_path} / fallback).lexically_normal().string();
-			}
-		}
-
-		// if all else fails, just set it to the config value
-		return dir;
-	};
-
-	m_maps_path          = resolve_path(c->MapDir, {"maps", "Maps"});
-	m_quests_path        = resolve_path(c->QuestDir);
-	m_plugins_path       = resolve_path(c->PluginDir);
-	m_lua_modules_path   = resolve_path(c->LuaModuleDir);
-	m_lua_mods_path      = resolve_path("mods");
-	m_patch_path         = resolve_path(c->PatchDir);
-	m_opcode_path        = resolve_path(c->OpcodeDir);
-	m_shared_memory_path = resolve_path(c->SharedMemDir);
-	m_log_path           = resolve_path(c->LogDir, {"logs"});
-
-	// Log all paths in a loop
-	std::vector<std::pair<std::string, std::string>> paths = {
-		{"server", m_server_path},
-		{"logs", m_log_path},
-		{"lua mods", m_lua_mods_path},
-		{"lua_modules", m_lua_modules_path},
-		{"maps", m_maps_path},
-		{"patches", m_patch_path},
-		{"opcode", m_opcode_path},
-		{"plugins", m_plugins_path},
-		{"quests", m_quests_path},
-		{"shared_memory", m_shared_memory_path}
-	};
-
-	constexpr int name_width   = 15;
-	constexpr int path_width   = 0;
-	constexpr int break_length = 70;
-
-	std::cout << std::endl;
-	LogInfo("{}", Strings::Repeat("-", break_length));
-	for (const auto& [name, in_path] : paths) {
-		if (!in_path.empty()) {
-			LogInfo("{:>{}} > [{:<{}}]", name, name_width, in_path, path_width);
-		}
+	// maps
+	if (File::Exists(fs::path{m_server_path + "/" + c->MapDir}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/" + c->MapDir}).string();
 	}
-	LogInfo("{}", Strings::Repeat("-", break_length));
+	else if (File::Exists(fs::path{m_server_path + "/maps"}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/maps"}).string();
+	}
+	else if (File::Exists(fs::path{m_server_path + "/Maps"}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/Maps"}).string();
+	}
+
+	// quests
+	if (File::Exists(fs::path{m_server_path + "/" + c->QuestDir}.string())) {
+		m_quests_path = fs::relative(fs::path{m_server_path + "/" + c->QuestDir}).string();
+	}
+
+	// plugins
+	if (File::Exists(fs::path{m_server_path + "/" + c->PluginDir}.string())) {
+		m_plugins_path = fs::relative(fs::path{m_server_path + "/" + c->PluginDir}).string();
+	}
+
+	// lua_modules
+	if (File::Exists(fs::path{m_server_path + "/" + c->LuaModuleDir}.string())) {
+		m_lua_modules_path = fs::relative(fs::path{m_server_path + "/" + c->LuaModuleDir}).string();
+	}
+
+	// lua mods
+	if (File::Exists(fs::path{ m_server_path + "/mods" }.string())) {
+		m_lua_mods_path = fs::relative(fs::path{ m_server_path + "/mods" }).string();
+	}
+
+	// patches
+	if (File::Exists(fs::path{m_server_path + "/" + c->PatchDir}.string())) {
+		m_patch_path = fs::relative(fs::path{m_server_path + "/" + c->PatchDir}).string();
+	}
+
+	// patches
+	if (File::Exists(fs::path{ m_server_path + "/" + c->OpcodeDir }.string())) {
+		m_opcode_path = fs::relative(fs::path{ m_server_path + "/" + c->OpcodeDir }).string();
+	}
+
+	// shared_memory_path
+	if (File::Exists(fs::path{m_server_path + "/" + c->SharedMemDir}.string())) {
+		m_shared_memory_path = fs::relative(fs::path{ m_server_path + "/" + c->SharedMemDir }).string();
+	}
+
+	// logging path
+	if (File::Exists(fs::path{m_server_path + "/" + c->LogDir}.string())) {
+		m_log_path = fs::relative(fs::path{m_server_path + "/" + c->LogDir}).string();
+	}
+
+	LogInfo("logs path [{}]", m_log_path);
+	LogInfo("lua mods path [{}]", m_lua_mods_path);
+	LogInfo("lua_modules path [{}]", m_lua_modules_path);
+	LogInfo("maps path [{}]", m_maps_path);
+	LogInfo("patches path [{}]", m_patch_path);
+	LogInfo("opcode path [{}]", m_opcode_path);
+	LogInfo("plugins path [{}]", m_plugins_path);
+	LogInfo("quests path [{}]", m_quests_path);
+	LogInfo("shared_memory path [{}]", m_shared_memory_path);
 }

 const std::string &PathManager::GetServerPath() const
@@ -49,23 +49,23 @@ public:
 		std::string field;

 		switch (theme_id) {
-			case LDoNTheme::GUK: {
+			case LDoNThemes::GUK: {
 				field = "guk_";
 				break;
 			}
-			case LDoNTheme::MIR: {
+			case LDoNThemes::MIR: {
 				field = "mir_";
 				break;
 			}
-			case LDoNTheme::MMC: {
+			case LDoNThemes::MMC: {
 				field = "mmc_";
 				break;
 			}
-			case LDoNTheme::RUJ: {
+			case LDoNThemes::RUJ: {
 				field = "ruj_";
 				break;
 			}
-			case LDoNTheme::TAK: {
+			case LDoNThemes::TAK: {
 				field = "tak_";
 				break;
 			}
@@ -1,416 +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_BOT_BLOCKED_BUFFS_REPOSITORY_H
-#define EQEMU_BASE_BOT_BLOCKED_BUFFS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseBotBlockedBuffsRepository {
-public:
-	struct BotBlockedBuffs {
-		uint32_t bot_id;
-		uint32_t spell_id;
-		uint8_t  blocked;
-		uint8_t  blocked_pet;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("bot_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"bot_id",
-			"spell_id",
-			"blocked",
-			"blocked_pet",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"bot_id",
-			"spell_id",
-			"blocked",
-			"blocked_pet",
-		};
-	}
-
-	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("bot_blocked_buffs");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static BotBlockedBuffs NewEntity()
-	{
-		BotBlockedBuffs e{};
-
-		e.bot_id      = 0;
-		e.spell_id    = 0;
-		e.blocked     = 0;
-		e.blocked_pet = 0;
-
-		return e;
-	}
-
-	static BotBlockedBuffs GetBotBlockedBuffs(
-		const std::vector<BotBlockedBuffs> &bot_blocked_buffss,
-		int bot_blocked_buffs_id
-	)
-	{
-		for (auto &bot_blocked_buffs : bot_blocked_buffss) {
-			if (bot_blocked_buffs.bot_id == bot_blocked_buffs_id) {
-				return bot_blocked_buffs;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static BotBlockedBuffs FindOne(
-		Database& db,
-		int bot_blocked_buffs_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				bot_blocked_buffs_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			BotBlockedBuffs e{};
-
-			e.bot_id      = row[0] ? static_cast<uint32_t>(atoi(row[0])) : 0;
-			e.spell_id    = row[1] ? static_cast<uint32_t>(atoi(row[1])) : 0;
-			e.blocked     = row[2] ? static_cast<uint8_t>(atoi(row[2])) : 0;
-			e.blocked_pet = row[3] ? static_cast<uint8_t>(atoi(row[3])) : 0;
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int bot_blocked_buffs_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				bot_blocked_buffs_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const BotBlockedBuffs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[0] + " = " + std::to_string(e.bot_id));
-		v.push_back(columns[1] + " = " + std::to_string(e.spell_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.blocked));
-		v.push_back(columns[3] + " = " + std::to_string(e.blocked_pet));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.bot_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static BotBlockedBuffs InsertOne(
-		Database& db,
-		BotBlockedBuffs e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.bot_id));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.blocked));
-		v.push_back(std::to_string(e.blocked_pet));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.bot_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<BotBlockedBuffs> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.bot_id));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.blocked));
-			v.push_back(std::to_string(e.blocked_pet));
-
-			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<BotBlockedBuffs> All(Database& db)
-	{
-		std::vector<BotBlockedBuffs> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			BotBlockedBuffs e{};
-
-			e.bot_id      = row[0] ? static_cast<uint32_t>(atoi(row[0])) : 0;
-			e.spell_id    = row[1] ? static_cast<uint32_t>(atoi(row[1])) : 0;
-			e.blocked     = row[2] ? static_cast<uint8_t>(atoi(row[2])) : 0;
-			e.blocked_pet = row[3] ? static_cast<uint8_t>(atoi(row[3])) : 0;
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<BotBlockedBuffs> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<BotBlockedBuffs> 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) {
-			BotBlockedBuffs e{};
-
-			e.bot_id      = row[0] ? static_cast<uint32_t>(atoi(row[0])) : 0;
-			e.spell_id    = row[1] ? static_cast<uint32_t>(atoi(row[1])) : 0;
-			e.blocked     = row[2] ? static_cast<uint8_t>(atoi(row[2])) : 0;
-			e.blocked_pet = row[3] ? static_cast<uint8_t>(atoi(row[3])) : 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 BotBlockedBuffs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.bot_id));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.blocked));
-		v.push_back(std::to_string(e.blocked_pet));
-
-		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<BotBlockedBuffs> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.bot_id));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.blocked));
-			v.push_back(std::to_string(e.blocked_pet));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_BOT_BLOCKED_BUFFS_REPOSITORY_H
@@ -64,6 +64,13 @@ public:
 		int16_t     poison;
 		int16_t     disease;
 		int16_t     corruption;
+		uint32_t    show_helm;
+		uint32_t    follow_distance;
+		uint8_t     stop_melee_level;
+		int32_t     expansion_bitmask;
+		uint8_t     enforce_spell_settings;
+		uint8_t     archery_setting;
+		uint32_t    caster_range;
 	};

 	static std::string PrimaryKey()
@@ -119,6 +126,13 @@ public:
 			"poison",
 			"disease",
 			"corruption",
+			"show_helm",
+			"follow_distance",
+			"stop_melee_level",
+			"expansion_bitmask",
+			"enforce_spell_settings",
+			"archery_setting",
+			"caster_range",
 		};
 	}

@@ -170,6 +184,13 @@ public:
 			"poison",
 			"disease",
 			"corruption",
+			"show_helm",
+			"follow_distance",
+			"stop_melee_level",
+			"expansion_bitmask",
+			"enforce_spell_settings",
+			"archery_setting",
+			"caster_range",
 		};
 	}

@@ -255,7 +276,13 @@ public:
 		e.poison                 = 0;
 		e.disease                = 0;
 		e.corruption             = 0;
-
+		e.show_helm              = 0;
+		e.follow_distance        = 200;
+		e.stop_melee_level       = 255;
+		e.expansion_bitmask      = -1;
+		e.enforce_spell_settings = 0;
+		e.archery_setting        = 0;
+		e.caster_range           = 300;

 		return e;
 	}
@@ -337,6 +364,13 @@ public:
 			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
 			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
 			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;

 			return e;
 		}
@@ -349,25 +383,14 @@ public:
 		int bot_data_id
 	)
 	{
-		std::string query;
-
-		if (RuleB(Bots, BotSoftDeletes)) {
-			query = fmt::format(
-				"UPDATE {} SET name = SUBSTRING(CONCAT(name, '-deleted-', UNIX_TIMESTAMP()), 1, 64) WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				bot_data_id
-			);
-		}
-		else {
-			query = fmt::format(
+		auto results = db.QueryDatabase(
+			fmt::format(
 				"DELETE FROM {} WHERE {} = {}",
 				TableName(),
 				PrimaryKey(),
 				bot_data_id
-			);
-		}
-		auto results = db.QueryDatabase(query);
+			)
+		);

 		return (results.Success() ? results.RowsAffected() : 0);
 	}
@@ -425,6 +448,13 @@ public:
 		v.push_back(columns[42] + " = " + std::to_string(e.poison));
 		v.push_back(columns[43] + " = " + std::to_string(e.disease));
 		v.push_back(columns[44] + " = " + std::to_string(e.corruption));
+		v.push_back(columns[45] + " = " + std::to_string(e.show_helm));
+		v.push_back(columns[46] + " = " + std::to_string(e.follow_distance));
+		v.push_back(columns[47] + " = " + std::to_string(e.stop_melee_level));
+		v.push_back(columns[48] + " = " + std::to_string(e.expansion_bitmask));
+		v.push_back(columns[49] + " = " + std::to_string(e.enforce_spell_settings));
+		v.push_back(columns[50] + " = " + std::to_string(e.archery_setting));
+		v.push_back(columns[51] + " = " + std::to_string(e.caster_range));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -491,6 +521,13 @@ public:
 		v.push_back(std::to_string(e.poison));
 		v.push_back(std::to_string(e.disease));
 		v.push_back(std::to_string(e.corruption));
+		v.push_back(std::to_string(e.show_helm));
+		v.push_back(std::to_string(e.follow_distance));
+		v.push_back(std::to_string(e.stop_melee_level));
+		v.push_back(std::to_string(e.expansion_bitmask));
+		v.push_back(std::to_string(e.enforce_spell_settings));
+		v.push_back(std::to_string(e.archery_setting));
+		v.push_back(std::to_string(e.caster_range));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -565,6 +602,13 @@ public:
 			v.push_back(std::to_string(e.poison));
 			v.push_back(std::to_string(e.disease));
 			v.push_back(std::to_string(e.corruption));
+			v.push_back(std::to_string(e.show_helm));
+			v.push_back(std::to_string(e.follow_distance));
+			v.push_back(std::to_string(e.stop_melee_level));
+			v.push_back(std::to_string(e.expansion_bitmask));
+			v.push_back(std::to_string(e.enforce_spell_settings));
+			v.push_back(std::to_string(e.archery_setting));
+			v.push_back(std::to_string(e.caster_range));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -643,6 +687,13 @@ public:
 			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
 			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
 			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;

 			all_entries.push_back(e);
 		}
@@ -712,6 +763,13 @@ public:
 			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
 			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
 			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;

 			all_entries.push_back(e);
 		}
@@ -831,6 +889,13 @@ public:
 		v.push_back(std::to_string(e.poison));
 		v.push_back(std::to_string(e.disease));
 		v.push_back(std::to_string(e.corruption));
+		v.push_back(std::to_string(e.show_helm));
+		v.push_back(std::to_string(e.follow_distance));
+		v.push_back(std::to_string(e.stop_melee_level));
+		v.push_back(std::to_string(e.expansion_bitmask));
+		v.push_back(std::to_string(e.enforce_spell_settings));
+		v.push_back(std::to_string(e.archery_setting));
+		v.push_back(std::to_string(e.caster_range));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -898,6 +963,13 @@ public:
 			v.push_back(std::to_string(e.poison));
 			v.push_back(std::to_string(e.disease));
 			v.push_back(std::to_string(e.corruption));
+			v.push_back(std::to_string(e.show_helm));
+			v.push_back(std::to_string(e.follow_distance));
+			v.push_back(std::to_string(e.stop_melee_level));
+			v.push_back(std::to_string(e.expansion_bitmask));
+			v.push_back(std::to_string(e.enforce_spell_settings));
+			v.push_back(std::to_string(e.archery_setting));
+			v.push_back(std::to_string(e.caster_range));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1,464 +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_BOT_SETTINGS_REPOSITORY_H
-#define EQEMU_BASE_BOT_SETTINGS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseBotSettingsRepository {
-public:
-	struct BotSettings {
-		uint32_t    character_id;
-		uint32_t    bot_id;
-		uint8_t     stance;
-		uint16_t    setting_id;
-		uint8_t     setting_type;
-		int32_t     value;
-		std::string category_name;
-		std::string setting_name;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("character_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"character_id",
-			"bot_id",
-			"stance",
-			"setting_id",
-			"setting_type",
-			"value",
-			"category_name",
-			"setting_name",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"character_id",
-			"bot_id",
-			"stance",
-			"setting_id",
-			"setting_type",
-			"value",
-			"category_name",
-			"setting_name",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("bot_settings");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static BotSettings NewEntity()
-	{
-		BotSettings e{};
-
-		e.character_id	= 0;
-		e.bot_id        = 0;
-		e.stance        = 0;
-		e.setting_id    = 0;
-		e.setting_type  = 0;
-		e.value         = 0;
-		e.category_name = "";
-		e.setting_name  = "";
-
-		return e;
-	}
-
-	static BotSettings GetBotSettings(
-		const std::vector<BotSettings> &bot_settingss,
-		int bot_settings_id
-	)
-	{
-		for (auto &bot_settings : bot_settingss) {
-			if (bot_settings.character_id == bot_settings_id) {
-				return bot_settings;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static BotSettings FindOne(
-		Database& db,
-		int bot_settings_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				bot_settings_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			BotSettings e{};
-
-			e.character_id	= row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.bot_id        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.stance        = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.setting_id    = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.setting_type  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.value         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.category_name = row[6] ? row[6] : "";
-			e.setting_name  = row[7] ? row[7] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int bot_settings_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				bot_settings_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const BotSettings &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[0] + " = " + std::to_string(e.character_id));
-		v.push_back(columns[1] + " = " + std::to_string(e.bot_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.stance));
-		v.push_back(columns[3] + " = " + std::to_string(e.setting_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.setting_type));
-		v.push_back(columns[5] + " = " + std::to_string(e.value));
-		v.push_back(columns[6] + " = '" + Strings::Escape(e.category_name) + "'");
-		v.push_back(columns[7] + " = '" + Strings::Escape(e.setting_name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.character_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static BotSettings InsertOne(
-		Database& db,
-		BotSettings e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.bot_id));
-		v.push_back(std::to_string(e.stance));
-		v.push_back(std::to_string(e.setting_id));
-		v.push_back(std::to_string(e.setting_type));
-		v.push_back(std::to_string(e.value));
-		v.push_back("'" + Strings::Escape(e.category_name) + "'");
-		v.push_back("'" + Strings::Escape(e.setting_name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.character_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<BotSettings> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.bot_id));
-			v.push_back(std::to_string(e.stance));
-			v.push_back(std::to_string(e.setting_id));
-			v.push_back(std::to_string(e.setting_type));
-			v.push_back(std::to_string(e.value));
-			v.push_back("'" + Strings::Escape(e.category_name) + "'");
-			v.push_back("'" + Strings::Escape(e.setting_name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<BotSettings> All(Database& db)
-	{
-		std::vector<BotSettings> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			BotSettings e{};
-
-			e.character_id	= row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.bot_id        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.stance        = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.setting_id    = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.setting_type  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.value         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.category_name = row[6] ? row[6] : "";
-			e.setting_name  = row[7] ? row[7] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<BotSettings> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<BotSettings> 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) {
-			BotSettings e{};
-
-			e.character_id	= row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.bot_id        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.stance        = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.setting_id    = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.setting_type  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.value         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.category_name = row[6] ? row[6] : "";
-			e.setting_name  = row[7] ? row[7] : "";
-
-			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 BotSettings &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.bot_id));
-		v.push_back(std::to_string(e.stance));
-		v.push_back(std::to_string(e.setting_id));
-		v.push_back(std::to_string(e.setting_type));
-		v.push_back(std::to_string(e.value));
-		v.push_back("'" + Strings::Escape(e.category_name) + "'");
-		v.push_back("'" + Strings::Escape(e.setting_name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<BotSettings> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.bot_id));
-			v.push_back(std::to_string(e.stance));
-			v.push_back(std::to_string(e.setting_id));
-			v.push_back(std::to_string(e.setting_type));
-			v.push_back(std::to_string(e.value));
-			v.push_back("'" + Strings::Escape(e.category_name) + "'");
-			v.push_back("'" + Strings::Escape(e.setting_name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_BOT_SETTINGS_REPOSITORY_H
@@ -123,7 +123,6 @@ public:
 		uint32_t    aa_points_old;
 		uint32_t    e_last_invsnapshot;
 		time_t      deleted_at;
-		uint8_t     illusion_block;
 	};

 	static std::string PrimaryKey()
@@ -238,7 +237,6 @@ public:
 			"aa_points_old",
 			"e_last_invsnapshot",
 			"deleted_at",
-			"illusion_block",
 		};
 	}

@@ -349,7 +347,6 @@ public:
 			"aa_points_old",
 			"e_last_invsnapshot",
 			"UNIX_TIMESTAMP(deleted_at)",
-			"illusion_block",
 		};
 	}

@@ -494,7 +491,6 @@ public:
 		e.aa_points_old           = 0;
 		e.e_last_invsnapshot      = 0;
 		e.deleted_at              = 0;
-		e.illusion_block          = 0;

 		return e;
 	}
@@ -635,7 +631,6 @@ public:
 			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
 			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
 			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;

 			return e;
 		}
@@ -772,7 +767,6 @@ public:
 		v.push_back(columns[101] + " = " + std::to_string(e.aa_points_old));
 		v.push_back(columns[102] + " = " + std::to_string(e.e_last_invsnapshot));
 		v.push_back(columns[103] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-		v.push_back(columns[104] + " = " + std::to_string(e.illusion_block));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -898,7 +892,6 @@ public:
 		v.push_back(std::to_string(e.aa_points_old));
 		v.push_back(std::to_string(e.e_last_invsnapshot));
 		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-		v.push_back(std::to_string(e.illusion_block));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1032,7 +1025,6 @@ public:
 			v.push_back(std::to_string(e.aa_points_old));
 			v.push_back(std::to_string(e.e_last_invsnapshot));
 			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-			v.push_back(std::to_string(e.illusion_block));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1170,7 +1162,6 @@ public:
 			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
 			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
 			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1299,7 +1290,6 @@ public:
 			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
 			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
 			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1478,7 +1468,6 @@ public:
 		v.push_back(std::to_string(e.aa_points_old));
 		v.push_back(std::to_string(e.e_last_invsnapshot));
 		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-		v.push_back(std::to_string(e.illusion_block));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1605,7 +1594,6 @@ public:
 			v.push_back(std::to_string(e.aa_points_old));
 			v.push_back(std::to_string(e.e_last_invsnapshot));
 			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-			v.push_back(std::to_string(e.illusion_block));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1,475 +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_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
-#define EQEMU_BASE_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseCharacterEvolvingItemsRepository {
-public:
-	struct CharacterEvolvingItems {
-		uint64_t id;
-		uint32_t character_id;
-		uint32_t item_id;
-		uint8_t  activated;
-		uint8_t  equipped;
-		int64_t  current_amount;
-		double   progression;
-		uint32_t final_item_id;
-		time_t   deleted_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"character_id",
-			"item_id",
-			"activated",
-			"equipped",
-			"current_amount",
-			"progression",
-			"final_item_id",
-			"deleted_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"character_id",
-			"item_id",
-			"activated",
-			"equipped",
-			"current_amount",
-			"progression",
-			"final_item_id",
-			"UNIX_TIMESTAMP(deleted_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("character_evolving_items");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static CharacterEvolvingItems NewEntity()
-	{
-		CharacterEvolvingItems e{};
-
-		e.id             = 0;
-		e.character_id   = 0;
-		e.item_id        = 0;
-		e.activated      = 0;
-		e.equipped       = 0;
-		e.current_amount = 0;
-		e.progression    = 0;
-		e.final_item_id  = 0;
-		e.deleted_at     = 0;
-
-		return e;
-	}
-
-	static CharacterEvolvingItems GetCharacterEvolvingItems(
-		const std::vector<CharacterEvolvingItems> &character_evolving_itemss,
-		int character_evolving_items_id
-	)
-	{
-		for (auto &character_evolving_items : character_evolving_itemss) {
-			if (character_evolving_items.id == character_evolving_items_id) {
-				return character_evolving_items;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static CharacterEvolvingItems FindOne(
-		Database& db,
-		int character_evolving_items_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				character_evolving_items_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			CharacterEvolvingItems e{};
-
-			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
-			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int character_evolving_items_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				character_evolving_items_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const CharacterEvolvingItems &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.character_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.activated));
-		v.push_back(columns[4] + " = " + std::to_string(e.equipped));
-		v.push_back(columns[5] + " = " + std::to_string(e.current_amount));
-		v.push_back(columns[6] + " = " + std::to_string(e.progression));
-		v.push_back(columns[7] + " = " + std::to_string(e.final_item_id));
-		v.push_back(columns[8] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static CharacterEvolvingItems InsertOne(
-		Database& db,
-		CharacterEvolvingItems e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.activated));
-		v.push_back(std::to_string(e.equipped));
-		v.push_back(std::to_string(e.current_amount));
-		v.push_back(std::to_string(e.progression));
-		v.push_back(std::to_string(e.final_item_id));
-		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<CharacterEvolvingItems> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.activated));
-			v.push_back(std::to_string(e.equipped));
-			v.push_back(std::to_string(e.current_amount));
-			v.push_back(std::to_string(e.progression));
-			v.push_back(std::to_string(e.final_item_id));
-			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<CharacterEvolvingItems> All(Database& db)
-	{
-		std::vector<CharacterEvolvingItems> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			CharacterEvolvingItems e{};
-
-			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
-			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<CharacterEvolvingItems> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<CharacterEvolvingItems> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			CharacterEvolvingItems e{};
-
-			e.id             = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.character_id   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id        = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.activated      = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.equipped       = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.progression    = row[6] ? strtod(row[6], nullptr) : 0;
-			e.final_item_id  = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.deleted_at     = strtoll(row[8] ? row[8] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterEvolvingItems &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.activated));
-		v.push_back(std::to_string(e.equipped));
-		v.push_back(std::to_string(e.current_amount));
-		v.push_back(std::to_string(e.progression));
-		v.push_back(std::to_string(e.final_item_id));
-		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterEvolvingItems> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.activated));
-			v.push_back(std::to_string(e.equipped));
-			v.push_back(std::to_string(e.current_amount));
-			v.push_back(std::to_string(e.progression));
-			v.push_back(std::to_string(e.final_item_id));
-			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
@@ -1,392 +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_CHARACTER_PET_NAME_REPOSITORY_H
-#define EQEMU_BASE_CHARACTER_PET_NAME_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseCharacterPetNameRepository {
-public:
-	struct CharacterPetName {
-		int32_t     character_id;
-		std::string name;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("character_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"character_id",
-			"name",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"character_id",
-			"name",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("character_pet_name");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static CharacterPetName NewEntity()
-	{
-		CharacterPetName e{};
-
-		e.character_id = 0;
-		e.name         = "";
-
-		return e;
-	}
-
-	static CharacterPetName GetCharacterPetName(
-		const std::vector<CharacterPetName> &character_pet_names,
-		int character_pet_name_id
-	)
-	{
-		for (auto &character_pet_name : character_pet_names) {
-			if (character_pet_name.character_id == character_pet_name_id) {
-				return character_pet_name;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static CharacterPetName FindOne(
-		Database& db,
-		int character_pet_name_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				character_pet_name_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			CharacterPetName e{};
-
-			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name         = row[1] ? row[1] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int character_pet_name_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				character_pet_name_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const CharacterPetName &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[0] + " = " + std::to_string(e.character_id));
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.character_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static CharacterPetName InsertOne(
-		Database& db,
-		CharacterPetName e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.character_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.character_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<CharacterPetName> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.character_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<CharacterPetName> All(Database& db)
-	{
-		std::vector<CharacterPetName> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			CharacterPetName e{};
-
-			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name         = row[1] ? row[1] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<CharacterPetName> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<CharacterPetName> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			CharacterPetName e{};
-
-			e.character_id = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name         = row[1] ? row[1] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterPetName &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.character_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterPetName> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.character_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_CHARACTER_PET_NAME_REPOSITORY_H
@@ -23,7 +23,6 @@ public:
 		std::string key_;
 		std::string value;
 		uint32_t    expires;
-		int64_t     account_id;
 		int64_t     character_id;
 		int64_t     npc_id;
 		int64_t     bot_id;
@@ -37,7 +36,6 @@ public:
 				CEREAL_NVP(key_),
 				CEREAL_NVP(value),
 				CEREAL_NVP(expires),
-				CEREAL_NVP(account_id),
 				CEREAL_NVP(character_id),
 				CEREAL_NVP(npc_id),
 				CEREAL_NVP(bot_id)
@@ -57,7 +55,6 @@ public:
 			"`key`",
 			"value",
 			"expires",
-			"account_id",
 			"character_id",
 			"npc_id",
 			"bot_id",
@@ -71,7 +68,6 @@ public:
 			"`key`",
 			"value",
 			"expires",
-			"account_id",
 			"character_id",
 			"npc_id",
 			"bot_id",
@@ -119,7 +115,6 @@ public:
 		e.key_         = "";
 		e.value        = "";
 		e.expires      = 0;
-		e.account_id   = 0;
 		e.character_id = 0;
 		e.npc_id       = 0;
 		e.bot_id       = 0;
@@ -163,10 +158,9 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
+			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;

 			return e;
 		}
@@ -203,10 +197,9 @@ public:
 		v.push_back(columns[1] + " = '" + Strings::Escape(e.key_) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.value) + "'");
 		v.push_back(columns[3] + " = " + std::to_string(e.expires));
-		v.push_back(columns[4] + " = " + std::to_string(e.account_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.character_id));
-		v.push_back(columns[6] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.bot_id));
+		v.push_back(columns[4] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[5] + " = " + std::to_string(e.npc_id));
+		v.push_back(columns[6] + " = " + std::to_string(e.bot_id));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -232,7 +225,6 @@ public:
 		v.push_back("'" + Strings::Escape(e.key_) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));
-		v.push_back(std::to_string(e.account_id));
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
@@ -269,7 +261,6 @@ public:
 			v.push_back("'" + Strings::Escape(e.key_) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));
-			v.push_back(std::to_string(e.account_id));
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));
@@ -310,10 +301,9 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
+			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;

 			all_entries.push_back(e);
 		}
@@ -342,10 +332,9 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
+			e.character_id = row[4] ? strtoll(row[4], nullptr, 10) : 0;
+			e.npc_id       = row[5] ? strtoll(row[5], nullptr, 10) : 0;
+			e.bot_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;

 			all_entries.push_back(e);
 		}
@@ -424,7 +413,6 @@ public:
 		v.push_back("'" + Strings::Escape(e.key_) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));
-		v.push_back(std::to_string(e.account_id));
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
@@ -454,7 +442,6 @@ public:
 			v.push_back("'" + Strings::Escape(e.key_) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));
-			v.push_back(std::to_string(e.account_id));
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));
@@ -1,511 +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_FIND_LOCATION_REPOSITORY_H
-#define EQEMU_BASE_FIND_LOCATION_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseFindLocationRepository {
-public:
-	struct FindLocation {
-		uint32_t    id;
-		std::string zone;
-		int32_t     version;
-		int8_t      min_expansion;
-		int8_t      max_expansion;
-		std::string content_flags;
-		std::string content_flags_disabled;
-		int32_t     type;
-		int32_t     zone_id;
-		float       x;
-		float       y;
-		float       z;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"zone",
-			"version",
-			"min_expansion",
-			"max_expansion",
-			"content_flags",
-			"content_flags_disabled",
-			"type",
-			"zone_id",
-			"x",
-			"y",
-			"z",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"zone",
-			"version",
-			"min_expansion",
-			"max_expansion",
-			"content_flags",
-			"content_flags_disabled",
-			"type",
-			"zone_id",
-			"x",
-			"y",
-			"z",
-		};
-	}
-
-	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("find_location");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static FindLocation NewEntity()
-	{
-		FindLocation e{};
-
-		e.id                     = 0;
-		e.zone                   = "";
-		e.version                = 0;
-		e.min_expansion          = -1;
-		e.max_expansion          = -1;
-		e.content_flags          = "";
-		e.content_flags_disabled = "";
-		e.type                   = 0;
-		e.zone_id                = 0;
-		e.x                      = 0;
-		e.y                      = 0;
-		e.z                      = 0;
-
-		return e;
-	}
-
-	static FindLocation GetFindLocation(
-		const std::vector<FindLocation> &find_locations,
-		int find_location_id
-	)
-	{
-		for (auto &find_location : find_locations) {
-			if (find_location.id == find_location_id) {
-				return find_location;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static FindLocation FindOne(
-		Database& db,
-		int find_location_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				find_location_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			FindLocation 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.min_expansion          = row[3] ? static_cast<int8_t>(atoi(row[3])) : -1;
-			e.max_expansion          = row[4] ? static_cast<int8_t>(atoi(row[4])) : -1;
-			e.content_flags          = row[5] ? row[5] : "";
-			e.content_flags_disabled = row[6] ? row[6] : "";
-			e.type                   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.zone_id                = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
-			e.x                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.y                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.z                      = row[11] ? strtof(row[11], nullptr) : 0;
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int find_location_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				find_location_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const FindLocation &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.min_expansion));
-		v.push_back(columns[4] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[5] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[6] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
-		v.push_back(columns[7] + " = " + std::to_string(e.type));
-		v.push_back(columns[8] + " = " + std::to_string(e.zone_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.x));
-		v.push_back(columns[10] + " = " + std::to_string(e.y));
-		v.push_back(columns[11] + " = " + std::to_string(e.z));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static FindLocation InsertOne(
-		Database& db,
-		FindLocation 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.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) + "'");
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-
-		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<FindLocation> &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.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) + "'");
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-
-			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<FindLocation> All(Database& db)
-	{
-		std::vector<FindLocation> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			FindLocation 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.min_expansion          = row[3] ? static_cast<int8_t>(atoi(row[3])) : -1;
-			e.max_expansion          = row[4] ? static_cast<int8_t>(atoi(row[4])) : -1;
-			e.content_flags          = row[5] ? row[5] : "";
-			e.content_flags_disabled = row[6] ? row[6] : "";
-			e.type                   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.zone_id                = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
-			e.x                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.y                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.z                      = row[11] ? strtof(row[11], nullptr) : 0;
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<FindLocation> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<FindLocation> 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) {
-			FindLocation 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.min_expansion          = row[3] ? static_cast<int8_t>(atoi(row[3])) : -1;
-			e.max_expansion          = row[4] ? static_cast<int8_t>(atoi(row[4])) : -1;
-			e.content_flags          = row[5] ? row[5] : "";
-			e.content_flags_disabled = row[6] ? row[6] : "";
-			e.type                   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
-			e.zone_id                = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
-			e.x                      = row[9] ? strtof(row[9], nullptr) : 0;
-			e.y                      = row[10] ? strtof(row[10], nullptr) : 0;
-			e.z                      = row[11] ? strtof(row[11], nullptr) : 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 FindLocation &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.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) + "'");
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-
-		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<FindLocation> &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.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) + "'");
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-
-			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_FIND_LOCATION_REPOSITORY_H
@@ -1,451 +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_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
-#define EQEMU_BASE_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseItemsEvolvingDetailsRepository {
-public:
-	struct ItemsEvolvingDetails {
-		uint32_t id;
-		uint32_t item_evo_id;
-		uint32_t item_evolve_level;
-		uint32_t item_id;
-		uint32_t type;
-		uint32_t sub_type;
-		int64_t  required_amount;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"item_evo_id",
-			"item_evolve_level",
-			"item_id",
-			"type",
-			"sub_type",
-			"required_amount",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"item_evo_id",
-			"item_evolve_level",
-			"item_id",
-			"type",
-			"sub_type",
-			"required_amount",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("items_evolving_details");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static ItemsEvolvingDetails NewEntity()
-	{
-		ItemsEvolvingDetails e{};
-
-		e.id                = 0;
-		e.item_evo_id       = 0;
-		e.item_evolve_level = 0;
-		e.item_id           = 0;
-		e.type              = 0;
-		e.sub_type          = 0;
-		e.required_amount   = 0;
-
-		return e;
-	}
-
-	static ItemsEvolvingDetails GetItemsEvolvingDetails(
-		const std::vector<ItemsEvolvingDetails> &items_evolving_detailss,
-		int items_evolving_details_id
-	)
-	{
-		for (auto &items_evolving_details : items_evolving_detailss) {
-			if (items_evolving_details.id == items_evolving_details_id) {
-				return items_evolving_details;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static ItemsEvolvingDetails FindOne(
-		Database& db,
-		int items_evolving_details_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				items_evolving_details_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			ItemsEvolvingDetails e{};
-
-			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_evolve_level = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int items_evolving_details_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				items_evolving_details_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const ItemsEvolvingDetails &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.item_evo_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.item_evolve_level));
-		v.push_back(columns[3] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.type));
-		v.push_back(columns[5] + " = " + std::to_string(e.sub_type));
-		v.push_back(columns[6] + " = " + std::to_string(e.required_amount));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static ItemsEvolvingDetails InsertOne(
-		Database& db,
-		ItemsEvolvingDetails e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.item_evo_id));
-		v.push_back(std::to_string(e.item_evolve_level));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.sub_type));
-		v.push_back(std::to_string(e.required_amount));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<ItemsEvolvingDetails> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.item_evo_id));
-			v.push_back(std::to_string(e.item_evolve_level));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.sub_type));
-			v.push_back(std::to_string(e.required_amount));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<ItemsEvolvingDetails> All(Database& db)
-	{
-		std::vector<ItemsEvolvingDetails> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			ItemsEvolvingDetails e{};
-
-			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_evolve_level = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<ItemsEvolvingDetails> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<ItemsEvolvingDetails> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			ItemsEvolvingDetails e{};
-
-			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_evo_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_evolve_level = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type              = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.sub_type          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.required_amount   = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const ItemsEvolvingDetails &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.item_evo_id));
-		v.push_back(std::to_string(e.item_evolve_level));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.sub_type));
-		v.push_back(std::to_string(e.required_amount));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<ItemsEvolvingDetails> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.item_evo_id));
-			v.push_back(std::to_string(e.item_evolve_level));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.sub_type));
-			v.push_back(std::to_string(e.required_amount));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
@@ -123,7 +123,7 @@ public:
 		int8_t      legtexture;
 		int8_t      feettexture;
 		int8_t      light;
-		float       walkspeed;
+		int8_t      walkspeed;
 		int32_t     peqid;
 		int8_t      unique_;
 		int8_t      fixed;
@@ -148,7 +148,6 @@ public:
 		int32_t     faction_amount;
 		uint8_t     keeps_sold_items;
 		uint8_t     is_parcel_merchant;
-		uint8_t     multiquest_enabled;
 	};

 	static std::string PrimaryKey()
@@ -288,7 +287,6 @@ public:
 			"faction_amount",
 			"keeps_sold_items",
 			"is_parcel_merchant",
-			"multiquest_enabled",
 		};
 	}

@@ -424,7 +422,6 @@ public:
 			"faction_amount",
 			"keeps_sold_items",
 			"is_parcel_merchant",
-			"multiquest_enabled",
 		};
 	}

@@ -594,7 +591,6 @@ public:
 		e.faction_amount         = 0;
 		e.keeps_sold_items       = 1;
 		e.is_parcel_merchant     = 0;
-		e.multiquest_enabled     = 0;

 		return e;
 	}
@@ -735,7 +731,7 @@ public:
 			e.legtexture             = row[101] ? static_cast<int8_t>(atoi(row[101])) : 0;
 			e.feettexture            = row[102] ? static_cast<int8_t>(atoi(row[102])) : 0;
 			e.light                  = row[103] ? static_cast<int8_t>(atoi(row[103])) : 0;
-			e.walkspeed              = row[104] ? strtof(row[104], nullptr) : 0;
+			e.walkspeed              = row[104] ? static_cast<int8_t>(atoi(row[104])) : 0;
 			e.peqid                  = row[105] ? static_cast<int32_t>(atoi(row[105])) : 0;
 			e.unique_                = row[106] ? static_cast<int8_t>(atoi(row[106])) : 0;
 			e.fixed                  = row[107] ? static_cast<int8_t>(atoi(row[107])) : 0;
@@ -760,7 +756,6 @@ public:
 			e.faction_amount         = row[126] ? static_cast<int32_t>(atoi(row[126])) : 0;
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
-			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;

 			return e;
 		}
@@ -922,7 +917,6 @@ public:
 		v.push_back(columns[126] + " = " + std::to_string(e.faction_amount));
 		v.push_back(columns[127] + " = " + std::to_string(e.keeps_sold_items));
 		v.push_back(columns[128] + " = " + std::to_string(e.is_parcel_merchant));
-		v.push_back(columns[129] + " = " + std::to_string(e.multiquest_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1073,7 +1067,6 @@ public:
 		v.push_back(std::to_string(e.faction_amount));
 		v.push_back(std::to_string(e.keeps_sold_items));
 		v.push_back(std::to_string(e.is_parcel_merchant));
-		v.push_back(std::to_string(e.multiquest_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1232,7 +1225,6 @@ public:
 			v.push_back(std::to_string(e.faction_amount));
 			v.push_back(std::to_string(e.keeps_sold_items));
 			v.push_back(std::to_string(e.is_parcel_merchant));
-			v.push_back(std::to_string(e.multiquest_enabled));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1370,7 +1362,7 @@ public:
 			e.legtexture             = row[101] ? static_cast<int8_t>(atoi(row[101])) : 0;
 			e.feettexture            = row[102] ? static_cast<int8_t>(atoi(row[102])) : 0;
 			e.light                  = row[103] ? static_cast<int8_t>(atoi(row[103])) : 0;
-			e.walkspeed              = row[104] ? strtof(row[104], nullptr) : 0;
+			e.walkspeed              = row[104] ? static_cast<int8_t>(atoi(row[104])) : 0;
 			e.peqid                  = row[105] ? static_cast<int32_t>(atoi(row[105])) : 0;
 			e.unique_                = row[106] ? static_cast<int8_t>(atoi(row[106])) : 0;
 			e.fixed                  = row[107] ? static_cast<int8_t>(atoi(row[107])) : 0;
@@ -1395,7 +1387,6 @@ public:
 			e.faction_amount         = row[126] ? static_cast<int32_t>(atoi(row[126])) : 0;
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
-			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1524,7 +1515,7 @@ public:
 			e.legtexture             = row[101] ? static_cast<int8_t>(atoi(row[101])) : 0;
 			e.feettexture            = row[102] ? static_cast<int8_t>(atoi(row[102])) : 0;
 			e.light                  = row[103] ? static_cast<int8_t>(atoi(row[103])) : 0;
-			e.walkspeed              = row[104] ? strtof(row[104], nullptr) : 0;
+			e.walkspeed              = row[104] ? static_cast<int8_t>(atoi(row[104])) : 0;
 			e.peqid                  = row[105] ? static_cast<int32_t>(atoi(row[105])) : 0;
 			e.unique_                = row[106] ? static_cast<int8_t>(atoi(row[106])) : 0;
 			e.fixed                  = row[107] ? static_cast<int8_t>(atoi(row[107])) : 0;
@@ -1549,7 +1540,6 @@ public:
 			e.faction_amount         = row[126] ? static_cast<int32_t>(atoi(row[126])) : 0;
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
-			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1753,7 +1743,6 @@ public:
 		v.push_back(std::to_string(e.faction_amount));
 		v.push_back(std::to_string(e.keeps_sold_items));
 		v.push_back(std::to_string(e.is_parcel_merchant));
-		v.push_back(std::to_string(e.multiquest_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1905,7 +1894,6 @@ public:
 			v.push_back(std::to_string(e.faction_amount));
 			v.push_back(std::to_string(e.keeps_sold_items));
 			v.push_back(std::to_string(e.is_parcel_merchant));
-			v.push_back(std::to_string(e.multiquest_enabled));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -144,7 +144,6 @@ public:
 			e.texture       = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.helm_texture  = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.gender        = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 2;
-			e.size_modifier = row[5] ? (strtof(row[5], nullptr) > 0.0f ? strtof(row[5], nullptr) : 1) : 1;
 			e.face          = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;

 			return e;
@@ -288,7 +287,6 @@ public:
 			e.texture       = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.helm_texture  = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.gender        = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 2;
-			e.size_modifier = row[5] ? (strtof(row[5], nullptr) > 0.0f ? strtof(row[5], nullptr) : 1) : 1;
 			e.face          = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;

 			all_entries.push_back(e);
@@ -319,7 +317,6 @@ public:
 			e.texture       = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.helm_texture  = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.gender        = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 2;
-			e.size_modifier = row[5] ? (strtof(row[5], nullptr) > 0.0f ? strtof(row[5], nullptr) : 1) : 1;
 			e.face          = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;

 			all_entries.push_back(e);
@@ -1,439 +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_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventAaPurchaseRepository {
-public:
-	struct PlayerEventAaPurchase {
-		uint64_t id;
-		int32_t  aa_ability_id;
-		int32_t  cost;
-		int32_t  previous_id;
-		int32_t  next_id;
-		time_t   created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"aa_ability_id",
-			"cost",
-			"previous_id",
-			"next_id",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"aa_ability_id",
-			"cost",
-			"previous_id",
-			"next_id",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_aa_purchase");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventAaPurchase NewEntity()
-	{
-		PlayerEventAaPurchase e{};
-
-		e.id            = 0;
-		e.aa_ability_id = 0;
-		e.cost          = 0;
-		e.previous_id   = 0;
-		e.next_id       = 0;
-		e.created_at    = 0;
-
-		return e;
-	}
-
-	static PlayerEventAaPurchase GetPlayerEventAaPurchase(
-		const std::vector<PlayerEventAaPurchase> &player_event_aa_purchases,
-		int player_event_aa_purchase_id
-	)
-	{
-		for (auto &player_event_aa_purchase : player_event_aa_purchases) {
-			if (player_event_aa_purchase.id == player_event_aa_purchase_id) {
-				return player_event_aa_purchase;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventAaPurchase FindOne(
-		Database& db,
-		int player_event_aa_purchase_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_aa_purchase_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventAaPurchase e{};
-
-			e.id            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.aa_ability_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.cost          = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.previous_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.next_id       = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.created_at    = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_aa_purchase_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_aa_purchase_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventAaPurchase &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.aa_ability_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.cost));
-		v.push_back(columns[3] + " = " + std::to_string(e.previous_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.next_id));
-		v.push_back(columns[5] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventAaPurchase InsertOne(
-		Database& db,
-		PlayerEventAaPurchase e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.aa_ability_id));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.previous_id));
-		v.push_back(std::to_string(e.next_id));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventAaPurchase> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.aa_ability_id));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.previous_id));
-			v.push_back(std::to_string(e.next_id));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventAaPurchase> All(Database& db)
-	{
-		std::vector<PlayerEventAaPurchase> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventAaPurchase e{};
-
-			e.id            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.aa_ability_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.cost          = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.previous_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.next_id       = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.created_at    = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventAaPurchase> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventAaPurchase> 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) {
-			PlayerEventAaPurchase e{};
-
-			e.id            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.aa_ability_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.cost          = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.previous_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.next_id       = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.created_at    = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventAaPurchase &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.aa_ability_id));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.previous_id));
-		v.push_back(std::to_string(e.next_id));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventAaPurchase> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.aa_ability_id));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.previous_id));
-			v.push_back(std::to_string(e.next_id));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
@@ -1,451 +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_PLAYER_EVENT_KILLED_NAMED_NPC_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_KILLED_NAMED_NPC_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventKilledNamedNpcRepository {
-public:
-	struct PlayerEventKilledNamedNpc {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string npc_name;
-		uint32_t    combat_time_seconds;
-		uint64_t    total_damage_per_second_taken;
-		uint64_t    total_heal_per_second_taken;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_killed_named_npc");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventKilledNamedNpc NewEntity()
-	{
-		PlayerEventKilledNamedNpc e{};
-
-		e.id                            = 0;
-		e.npc_id                        = 0;
-		e.npc_name                      = "";
-		e.combat_time_seconds           = 0;
-		e.total_damage_per_second_taken = 0;
-		e.total_heal_per_second_taken   = 0;
-		e.created_at                    = 0;
-
-		return e;
-	}
-
-	static PlayerEventKilledNamedNpc GetPlayerEventKilledNamedNpc(
-		const std::vector<PlayerEventKilledNamedNpc> &player_event_killed_named_npcs,
-		int player_event_killed_named_npc_id
-	)
-	{
-		for (auto &player_event_killed_named_npc : player_event_killed_named_npcs) {
-			if (player_event_killed_named_npc.id == player_event_killed_named_npc_id) {
-				return player_event_killed_named_npc;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventKilledNamedNpc FindOne(
-		Database& db,
-		int player_event_killed_named_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_killed_named_npc_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventKilledNamedNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_killed_named_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_killed_named_npc_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventKilledNamedNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.combat_time_seconds));
-		v.push_back(columns[4] + " = " + std::to_string(e.total_damage_per_second_taken));
-		v.push_back(columns[5] + " = " + std::to_string(e.total_heal_per_second_taken));
-		v.push_back(columns[6] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventKilledNamedNpc InsertOne(
-		Database& db,
-		PlayerEventKilledNamedNpc e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventKilledNamedNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventKilledNamedNpc> All(Database& db)
-	{
-		std::vector<PlayerEventKilledNamedNpc> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventKilledNamedNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventKilledNamedNpc> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventKilledNamedNpc> 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) {
-			PlayerEventKilledNamedNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventKilledNamedNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventKilledNamedNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_KILLED_NAMED_NPC_REPOSITORY_H
@@ -1,451 +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_PLAYER_EVENT_KILLED_NPC_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_KILLED_NPC_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventKilledNpcRepository {
-public:
-	struct PlayerEventKilledNpc {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string npc_name;
-		uint32_t    combat_time_seconds;
-		uint64_t    total_damage_per_second_taken;
-		uint64_t    total_heal_per_second_taken;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_killed_npc");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventKilledNpc NewEntity()
-	{
-		PlayerEventKilledNpc e{};
-
-		e.id                            = 0;
-		e.npc_id                        = 0;
-		e.npc_name                      = "";
-		e.combat_time_seconds           = 0;
-		e.total_damage_per_second_taken = 0;
-		e.total_heal_per_second_taken   = 0;
-		e.created_at                    = 0;
-
-		return e;
-	}
-
-	static PlayerEventKilledNpc GetPlayerEventKilledNpc(
-		const std::vector<PlayerEventKilledNpc> &player_event_killed_npcs,
-		int player_event_killed_npc_id
-	)
-	{
-		for (auto &player_event_killed_npc : player_event_killed_npcs) {
-			if (player_event_killed_npc.id == player_event_killed_npc_id) {
-				return player_event_killed_npc;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventKilledNpc FindOne(
-		Database& db,
-		int player_event_killed_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_killed_npc_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventKilledNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_killed_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_killed_npc_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventKilledNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.combat_time_seconds));
-		v.push_back(columns[4] + " = " + std::to_string(e.total_damage_per_second_taken));
-		v.push_back(columns[5] + " = " + std::to_string(e.total_heal_per_second_taken));
-		v.push_back(columns[6] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventKilledNpc InsertOne(
-		Database& db,
-		PlayerEventKilledNpc e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventKilledNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventKilledNpc> All(Database& db)
-	{
-		std::vector<PlayerEventKilledNpc> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventKilledNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventKilledNpc> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventKilledNpc> 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) {
-			PlayerEventKilledNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventKilledNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventKilledNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_KILLED_NPC_REPOSITORY_H
@@ -1,451 +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_PLAYER_EVENT_KILLED_RAID_NPC_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_KILLED_RAID_NPC_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventKilledRaidNpcRepository {
-public:
-	struct PlayerEventKilledRaidNpc {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string npc_name;
-		uint32_t    combat_time_seconds;
-		uint64_t    total_damage_per_second_taken;
-		uint64_t    total_heal_per_second_taken;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"combat_time_seconds",
-			"total_damage_per_second_taken",
-			"total_heal_per_second_taken",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_killed_raid_npc");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventKilledRaidNpc NewEntity()
-	{
-		PlayerEventKilledRaidNpc e{};
-
-		e.id                            = 0;
-		e.npc_id                        = 0;
-		e.npc_name                      = "";
-		e.combat_time_seconds           = 0;
-		e.total_damage_per_second_taken = 0;
-		e.total_heal_per_second_taken   = 0;
-		e.created_at                    = 0;
-
-		return e;
-	}
-
-	static PlayerEventKilledRaidNpc GetPlayerEventKilledRaidNpc(
-		const std::vector<PlayerEventKilledRaidNpc> &player_event_killed_raid_npcs,
-		int player_event_killed_raid_npc_id
-	)
-	{
-		for (auto &player_event_killed_raid_npc : player_event_killed_raid_npcs) {
-			if (player_event_killed_raid_npc.id == player_event_killed_raid_npc_id) {
-				return player_event_killed_raid_npc;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventKilledRaidNpc FindOne(
-		Database& db,
-		int player_event_killed_raid_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_killed_raid_npc_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventKilledRaidNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_killed_raid_npc_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_killed_raid_npc_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventKilledRaidNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.combat_time_seconds));
-		v.push_back(columns[4] + " = " + std::to_string(e.total_damage_per_second_taken));
-		v.push_back(columns[5] + " = " + std::to_string(e.total_heal_per_second_taken));
-		v.push_back(columns[6] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventKilledRaidNpc InsertOne(
-		Database& db,
-		PlayerEventKilledRaidNpc e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventKilledRaidNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventKilledRaidNpc> All(Database& db)
-	{
-		std::vector<PlayerEventKilledRaidNpc> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventKilledRaidNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventKilledRaidNpc> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventKilledRaidNpc> 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) {
-			PlayerEventKilledRaidNpc e{};
-
-			e.id                            = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                        = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name                      = row[2] ? row[2] : "";
-			e.combat_time_seconds           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.total_damage_per_second_taken = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.total_heal_per_second_taken   = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.created_at                    = strtoll(row[6] ? row[6] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventKilledRaidNpc &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.combat_time_seconds));
-		v.push_back(std::to_string(e.total_damage_per_second_taken));
-		v.push_back(std::to_string(e.total_heal_per_second_taken));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventKilledRaidNpc> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.combat_time_seconds));
-			v.push_back(std::to_string(e.total_damage_per_second_taken));
-			v.push_back(std::to_string(e.total_heal_per_second_taken));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_KILLED_RAID_NPC_REPOSITORY_H
@@ -24,7 +24,6 @@ public:
 		int8_t      event_enabled;
 		int32_t     retention_days;
 		int32_t     discord_webhook_id;
-		uint8_t     etl_enabled;
 	};

 	static std::string PrimaryKey()
@@ -40,7 +39,6 @@ public:
 			"event_enabled",
 			"retention_days",
 			"discord_webhook_id",
-			"etl_enabled",
 		};
 	}

@@ -52,7 +50,6 @@ public:
 			"event_enabled",
 			"retention_days",
 			"discord_webhook_id",
-			"etl_enabled",
 		};
 	}

@@ -98,7 +95,6 @@ public:
 		e.event_enabled      = 0;
 		e.retention_days     = 0;
 		e.discord_webhook_id = 0;
-		e.etl_enabled        = 0;

 		return e;
 	}
@@ -140,7 +136,6 @@ public:
 			e.event_enabled      = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
 			e.retention_days     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
 			e.discord_webhook_id = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.etl_enabled        = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;

 			return e;
 		}
@@ -179,7 +174,6 @@ public:
 		v.push_back(columns[2] + " = " + std::to_string(e.event_enabled));
 		v.push_back(columns[3] + " = " + std::to_string(e.retention_days));
 		v.push_back(columns[4] + " = " + std::to_string(e.discord_webhook_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.etl_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -206,7 +200,6 @@ public:
 		v.push_back(std::to_string(e.event_enabled));
 		v.push_back(std::to_string(e.retention_days));
 		v.push_back(std::to_string(e.discord_webhook_id));
-		v.push_back(std::to_string(e.etl_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -241,7 +234,6 @@ public:
 			v.push_back(std::to_string(e.event_enabled));
 			v.push_back(std::to_string(e.retention_days));
 			v.push_back(std::to_string(e.discord_webhook_id));
-			v.push_back(std::to_string(e.etl_enabled));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -280,7 +272,6 @@ public:
 			e.event_enabled      = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
 			e.retention_days     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
 			e.discord_webhook_id = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.etl_enabled        = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -310,7 +301,6 @@ public:
 			e.event_enabled      = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
 			e.retention_days     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
 			e.discord_webhook_id = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.etl_enabled        = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -390,7 +380,6 @@ public:
 		v.push_back(std::to_string(e.event_enabled));
 		v.push_back(std::to_string(e.retention_days));
 		v.push_back(std::to_string(e.discord_webhook_id));
-		v.push_back(std::to_string(e.etl_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -418,7 +407,6 @@ public:
 			v.push_back(std::to_string(e.event_enabled));
 			v.push_back(std::to_string(e.retention_days));
 			v.push_back(std::to_string(e.discord_webhook_id));
-			v.push_back(std::to_string(e.etl_enabled));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -31,7 +31,6 @@ public:
 		int32_t     event_type_id;
 		std::string event_type_name;
 		std::string event_data;
-		int64_t     etl_table_id;
 		time_t      created_at;

 		// cereal
@@ -51,7 +50,6 @@ public:
 				CEREAL_NVP(event_type_id),
 				CEREAL_NVP(event_type_name),
 				CEREAL_NVP(event_data),
-				CEREAL_NVP(etl_table_id),
 				CEREAL_NVP(created_at)
 			);
 		}
@@ -77,7 +75,6 @@ public:
 			"event_type_id",
 			"event_type_name",
 			"event_data",
-			"etl_table_id",
 			"created_at",
 		};
 	}
@@ -97,7 +94,6 @@ public:
 			"event_type_id",
 			"event_type_name",
 			"event_data",
-			"etl_table_id",
 			"UNIX_TIMESTAMP(created_at)",
 		};
 	}
@@ -151,7 +147,6 @@ public:
 		e.event_type_id   = 0;
 		e.event_type_name = "";
 		e.event_data      = "";
-		e.etl_table_id    = 0;
 		e.created_at      = 0;

 		return e;
@@ -201,8 +196,7 @@ public:
 			e.event_type_id   = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
 			e.event_type_name = row[10] ? row[10] : "";
 			e.event_data      = row[11] ? row[11] : "";
-			e.etl_table_id    = row[12] ? strtoll(row[12], nullptr, 10) : 0;
-			e.created_at      = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);

 			return e;
 		}
@@ -247,8 +241,7 @@ public:
 		v.push_back(columns[9] + " = " + std::to_string(e.event_type_id));
 		v.push_back(columns[10] + " = '" + Strings::Escape(e.event_type_name) + "'");
 		v.push_back(columns[11] + " = '" + Strings::Escape(e.event_data) + "'");
-		v.push_back(columns[12] + " = " + std::to_string(e.etl_table_id));
-		v.push_back(columns[13] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
+		v.push_back(columns[12] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -282,7 +275,6 @@ public:
 		v.push_back(std::to_string(e.event_type_id));
 		v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
 		v.push_back("'" + Strings::Escape(e.event_data) + "'");
-		v.push_back(std::to_string(e.etl_table_id));
 		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");

 		auto results = db.QueryDatabase(
@@ -325,7 +317,6 @@ public:
 			v.push_back(std::to_string(e.event_type_id));
 			v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
 			v.push_back("'" + Strings::Escape(e.event_data) + "'");
-			v.push_back(std::to_string(e.etl_table_id));
 			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -372,8 +363,7 @@ public:
 			e.event_type_id   = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
 			e.event_type_name = row[10] ? row[10] : "";
 			e.event_data      = row[11] ? row[11] : "";
-			e.etl_table_id    = row[12] ? strtoll(row[12], nullptr, 10) : 0;
-			e.created_at      = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);

 			all_entries.push_back(e);
 		}
@@ -410,8 +400,7 @@ public:
 			e.event_type_id   = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
 			e.event_type_name = row[10] ? row[10] : "";
 			e.event_data      = row[11] ? row[11] : "";
-			e.etl_table_id    = row[12] ? strtoll(row[12], nullptr, 10) : 0;
-			e.created_at      = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);

 			all_entries.push_back(e);
 		}
@@ -498,7 +487,6 @@ public:
 		v.push_back(std::to_string(e.event_type_id));
 		v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
 		v.push_back("'" + Strings::Escape(e.event_data) + "'");
-		v.push_back(std::to_string(e.etl_table_id));
 		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");

 		auto results = db.QueryDatabase(
@@ -534,7 +522,6 @@ public:
 			v.push_back(std::to_string(e.event_type_id));
 			v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
 			v.push_back("'" + Strings::Escape(e.event_data) + "'");
-			v.push_back(std::to_string(e.etl_table_id));
 			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -1,523 +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_PLAYER_EVENT_LOOT_ITEMS_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_LOOT_ITEMS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventLootItemsRepository {
-public:
-	struct PlayerEventLootItems {
-		uint64_t    id;
-		uint32_t    item_id;
-		std::string item_name;
-		int32_t     charges;
-		uint32_t    augment_1_id;
-		uint32_t    augment_2_id;
-		uint32_t    augment_3_id;
-		uint32_t    augment_4_id;
-		uint32_t    augment_5_id;
-		uint32_t    augment_6_id;
-		uint32_t    npc_id;
-		std::string corpse_name;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"item_id",
-			"item_name",
-			"charges",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-			"npc_id",
-			"corpse_name",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"item_id",
-			"item_name",
-			"charges",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-			"npc_id",
-			"corpse_name",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_loot_items");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventLootItems NewEntity()
-	{
-		PlayerEventLootItems e{};
-
-		e.id           = 0;
-		e.item_id      = 0;
-		e.item_name    = "";
-		e.charges      = 0;
-		e.augment_1_id = 0;
-		e.augment_2_id = 0;
-		e.augment_3_id = 0;
-		e.augment_4_id = 0;
-		e.augment_5_id = 0;
-		e.augment_6_id = 0;
-		e.npc_id       = 0;
-		e.corpse_name  = "";
-		e.created_at   = 0;
-
-		return e;
-	}
-
-	static PlayerEventLootItems GetPlayerEventLootItems(
-		const std::vector<PlayerEventLootItems> &player_event_loot_itemss,
-		int player_event_loot_items_id
-	)
-	{
-		for (auto &player_event_loot_items : player_event_loot_itemss) {
-			if (player_event_loot_items.id == player_event_loot_items_id) {
-				return player_event_loot_items;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventLootItems FindOne(
-		Database& db,
-		int player_event_loot_items_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_loot_items_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventLootItems e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.item_id      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_name    = row[2] ? row[2] : "";
-			e.charges      = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.augment_1_id = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augment_2_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augment_3_id = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_4_id = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_5_id = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_6_id = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_id       = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.corpse_name  = row[11] ? row[11] : "";
-			e.created_at   = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_loot_items_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_loot_items_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventLootItems &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.item_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.charges));
-		v.push_back(columns[4] + " = " + std::to_string(e.augment_1_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.augment_2_id));
-		v.push_back(columns[6] + " = " + std::to_string(e.augment_3_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.augment_4_id));
-		v.push_back(columns[8] + " = " + std::to_string(e.augment_5_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.augment_6_id));
-		v.push_back(columns[10] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[11] + " = '" + Strings::Escape(e.corpse_name) + "'");
-		v.push_back(columns[12] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventLootItems InsertOne(
-		Database& db,
-		PlayerEventLootItems e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.corpse_name) + "'");
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventLootItems> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.corpse_name) + "'");
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventLootItems> All(Database& db)
-	{
-		std::vector<PlayerEventLootItems> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventLootItems e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.item_id      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_name    = row[2] ? row[2] : "";
-			e.charges      = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.augment_1_id = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augment_2_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augment_3_id = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_4_id = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_5_id = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_6_id = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_id       = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.corpse_name  = row[11] ? row[11] : "";
-			e.created_at   = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventLootItems> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventLootItems> 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) {
-			PlayerEventLootItems e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.item_id      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_name    = row[2] ? row[2] : "";
-			e.charges      = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
-			e.augment_1_id = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.augment_2_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.augment_3_id = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_4_id = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_5_id = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_6_id = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_id       = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.corpse_name  = row[11] ? row[11] : "";
-			e.created_at   = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventLootItems &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.corpse_name) + "'");
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventLootItems> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.corpse_name) + "'");
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_LOOT_ITEMS_REPOSITORY_H
@@ -1,511 +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_PLAYER_EVENT_MERCHANT_PURCHASE_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_MERCHANT_PURCHASE_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventMerchantPurchaseRepository {
-public:
-	struct PlayerEventMerchantPurchase {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string merchant_name;
-		uint32_t    merchant_type;
-		uint32_t    item_id;
-		std::string item_name;
-		int32_t     charges;
-		uint32_t    cost;
-		uint32_t    alternate_currency_id;
-		uint64_t    player_money_balance;
-		uint64_t    player_currency_balance;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"merchant_name",
-			"merchant_type",
-			"item_id",
-			"item_name",
-			"charges",
-			"cost",
-			"alternate_currency_id",
-			"player_money_balance",
-			"player_currency_balance",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"merchant_name",
-			"merchant_type",
-			"item_id",
-			"item_name",
-			"charges",
-			"cost",
-			"alternate_currency_id",
-			"player_money_balance",
-			"player_currency_balance",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_merchant_purchase");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventMerchantPurchase NewEntity()
-	{
-		PlayerEventMerchantPurchase e{};
-
-		e.id                      = 0;
-		e.npc_id                  = 0;
-		e.merchant_name           = "";
-		e.merchant_type           = 0;
-		e.item_id                 = 0;
-		e.item_name               = "";
-		e.charges                 = 0;
-		e.cost                    = 0;
-		e.alternate_currency_id   = 0;
-		e.player_money_balance    = 0;
-		e.player_currency_balance = 0;
-		e.created_at              = 0;
-
-		return e;
-	}
-
-	static PlayerEventMerchantPurchase GetPlayerEventMerchantPurchase(
-		const std::vector<PlayerEventMerchantPurchase> &player_event_merchant_purchases,
-		int player_event_merchant_purchase_id
-	)
-	{
-		for (auto &player_event_merchant_purchase : player_event_merchant_purchases) {
-			if (player_event_merchant_purchase.id == player_event_merchant_purchase_id) {
-				return player_event_merchant_purchase;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventMerchantPurchase FindOne(
-		Database& db,
-		int player_event_merchant_purchase_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_merchant_purchase_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventMerchantPurchase e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_merchant_purchase_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_merchant_purchase_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventMerchantPurchase &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.merchant_type));
-		v.push_back(columns[4] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[5] + " = '" + Strings::Escape(e.item_name) + "'");
-		v.push_back(columns[6] + " = " + std::to_string(e.charges));
-		v.push_back(columns[7] + " = " + std::to_string(e.cost));
-		v.push_back(columns[8] + " = " + std::to_string(e.alternate_currency_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.player_money_balance));
-		v.push_back(columns[10] + " = " + std::to_string(e.player_currency_balance));
-		v.push_back(columns[11] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventMerchantPurchase InsertOne(
-		Database& db,
-		PlayerEventMerchantPurchase e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(std::to_string(e.merchant_type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.alternate_currency_id));
-		v.push_back(std::to_string(e.player_money_balance));
-		v.push_back(std::to_string(e.player_currency_balance));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventMerchantPurchase> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-			v.push_back(std::to_string(e.merchant_type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.alternate_currency_id));
-			v.push_back(std::to_string(e.player_money_balance));
-			v.push_back(std::to_string(e.player_currency_balance));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventMerchantPurchase> All(Database& db)
-	{
-		std::vector<PlayerEventMerchantPurchase> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventMerchantPurchase e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventMerchantPurchase> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventMerchantPurchase> 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) {
-			PlayerEventMerchantPurchase e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventMerchantPurchase &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(std::to_string(e.merchant_type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.alternate_currency_id));
-		v.push_back(std::to_string(e.player_money_balance));
-		v.push_back(std::to_string(e.player_currency_balance));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventMerchantPurchase> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-			v.push_back(std::to_string(e.merchant_type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.alternate_currency_id));
-			v.push_back(std::to_string(e.player_money_balance));
-			v.push_back(std::to_string(e.player_currency_balance));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_MERCHANT_PURCHASE_REPOSITORY_H
@@ -1,511 +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_PLAYER_EVENT_MERCHANT_SELL_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_MERCHANT_SELL_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventMerchantSellRepository {
-public:
-	struct PlayerEventMerchantSell {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string merchant_name;
-		uint32_t    merchant_type;
-		uint32_t    item_id;
-		std::string item_name;
-		int32_t     charges;
-		uint32_t    cost;
-		uint32_t    alternate_currency_id;
-		uint64_t    player_money_balance;
-		uint64_t    player_currency_balance;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"merchant_name",
-			"merchant_type",
-			"item_id",
-			"item_name",
-			"charges",
-			"cost",
-			"alternate_currency_id",
-			"player_money_balance",
-			"player_currency_balance",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"merchant_name",
-			"merchant_type",
-			"item_id",
-			"item_name",
-			"charges",
-			"cost",
-			"alternate_currency_id",
-			"player_money_balance",
-			"player_currency_balance",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_merchant_sell");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventMerchantSell NewEntity()
-	{
-		PlayerEventMerchantSell e{};
-
-		e.id                      = 0;
-		e.npc_id                  = 0;
-		e.merchant_name           = "";
-		e.merchant_type           = 0;
-		e.item_id                 = 0;
-		e.item_name               = "";
-		e.charges                 = 0;
-		e.cost                    = 0;
-		e.alternate_currency_id   = 0;
-		e.player_money_balance    = 0;
-		e.player_currency_balance = 0;
-		e.created_at              = 0;
-
-		return e;
-	}
-
-	static PlayerEventMerchantSell GetPlayerEventMerchantSell(
-		const std::vector<PlayerEventMerchantSell> &player_event_merchant_sells,
-		int player_event_merchant_sell_id
-	)
-	{
-		for (auto &player_event_merchant_sell : player_event_merchant_sells) {
-			if (player_event_merchant_sell.id == player_event_merchant_sell_id) {
-				return player_event_merchant_sell;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventMerchantSell FindOne(
-		Database& db,
-		int player_event_merchant_sell_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_merchant_sell_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventMerchantSell e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_merchant_sell_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_merchant_sell_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventMerchantSell &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.merchant_type));
-		v.push_back(columns[4] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[5] + " = '" + Strings::Escape(e.item_name) + "'");
-		v.push_back(columns[6] + " = " + std::to_string(e.charges));
-		v.push_back(columns[7] + " = " + std::to_string(e.cost));
-		v.push_back(columns[8] + " = " + std::to_string(e.alternate_currency_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.player_money_balance));
-		v.push_back(columns[10] + " = " + std::to_string(e.player_currency_balance));
-		v.push_back(columns[11] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventMerchantSell InsertOne(
-		Database& db,
-		PlayerEventMerchantSell e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(std::to_string(e.merchant_type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.alternate_currency_id));
-		v.push_back(std::to_string(e.player_money_balance));
-		v.push_back(std::to_string(e.player_currency_balance));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventMerchantSell> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-			v.push_back(std::to_string(e.merchant_type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.alternate_currency_id));
-			v.push_back(std::to_string(e.player_money_balance));
-			v.push_back(std::to_string(e.player_currency_balance));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventMerchantSell> All(Database& db)
-	{
-		std::vector<PlayerEventMerchantSell> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventMerchantSell e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventMerchantSell> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventMerchantSell> 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) {
-			PlayerEventMerchantSell e{};
-
-			e.id                      = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id                  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.merchant_name           = row[2] ? row[2] : "";
-			e.merchant_type           = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.item_id                 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.item_name               = row[5] ? row[5] : "";
-			e.charges                 = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
-			e.cost                    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.alternate_currency_id   = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.player_money_balance    = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.player_currency_balance = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at              = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventMerchantSell &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-		v.push_back(std::to_string(e.merchant_type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back("'" + Strings::Escape(e.item_name) + "'");
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.cost));
-		v.push_back(std::to_string(e.alternate_currency_id));
-		v.push_back(std::to_string(e.player_money_balance));
-		v.push_back(std::to_string(e.player_currency_balance));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventMerchantSell> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.merchant_name) + "'");
-			v.push_back(std::to_string(e.merchant_type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back("'" + Strings::Escape(e.item_name) + "'");
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.cost));
-			v.push_back(std::to_string(e.alternate_currency_id));
-			v.push_back(std::to_string(e.player_money_balance));
-			v.push_back(std::to_string(e.player_currency_balance));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_MERCHANT_SELL_REPOSITORY_H
@@ -1,523 +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_PLAYER_EVENT_NPC_HANDIN_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_NPC_HANDIN_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventNpcHandinEntriesRepository {
-public:
-	struct PlayerEventNpcHandinEntries {
-		uint64_t id;
-		uint64_t player_event_npc_handin_id;
-		uint32_t type;
-		uint32_t item_id;
-		int32_t  charges;
-		uint32_t evolve_level;
-		uint64_t evolve_amount;
-		uint32_t augment_1_id;
-		uint32_t augment_2_id;
-		uint32_t augment_3_id;
-		uint32_t augment_4_id;
-		uint32_t augment_5_id;
-		uint32_t augment_6_id;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"player_event_npc_handin_id",
-			"type",
-			"item_id",
-			"charges",
-			"evolve_level",
-			"evolve_amount",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"player_event_npc_handin_id",
-			"type",
-			"item_id",
-			"charges",
-			"evolve_level",
-			"evolve_amount",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-		};
-	}
-
-	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("player_event_npc_handin_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventNpcHandinEntries NewEntity()
-	{
-		PlayerEventNpcHandinEntries e{};
-
-		e.id                         = 0;
-		e.player_event_npc_handin_id = 0;
-		e.type                       = 0;
-		e.item_id                    = 0;
-		e.charges                    = 0;
-		e.evolve_level               = 0;
-		e.evolve_amount              = 0;
-		e.augment_1_id               = 0;
-		e.augment_2_id               = 0;
-		e.augment_3_id               = 0;
-		e.augment_4_id               = 0;
-		e.augment_5_id               = 0;
-		e.augment_6_id               = 0;
-
-		return e;
-	}
-
-	static PlayerEventNpcHandinEntries GetPlayerEventNpcHandinEntries(
-		const std::vector<PlayerEventNpcHandinEntries> &player_event_npc_handin_entriess,
-		int player_event_npc_handin_entries_id
-	)
-	{
-		for (auto &player_event_npc_handin_entries : player_event_npc_handin_entriess) {
-			if (player_event_npc_handin_entries.id == player_event_npc_handin_entries_id) {
-				return player_event_npc_handin_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventNpcHandinEntries FindOne(
-		Database& db,
-		int player_event_npc_handin_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_npc_handin_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventNpcHandinEntries e{};
-
-			e.id                         = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_npc_handin_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.type                       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id                    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.charges                    = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.evolve_level               = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.evolve_amount              = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.augment_1_id               = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_2_id               = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_3_id               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_4_id               = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_5_id               = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.augment_6_id               = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_npc_handin_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_npc_handin_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventNpcHandinEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.player_event_npc_handin_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.type));
-		v.push_back(columns[3] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.charges));
-		v.push_back(columns[5] + " = " + std::to_string(e.evolve_level));
-		v.push_back(columns[6] + " = " + std::to_string(e.evolve_amount));
-		v.push_back(columns[7] + " = " + std::to_string(e.augment_1_id));
-		v.push_back(columns[8] + " = " + std::to_string(e.augment_2_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.augment_3_id));
-		v.push_back(columns[10] + " = " + std::to_string(e.augment_4_id));
-		v.push_back(columns[11] + " = " + std::to_string(e.augment_5_id));
-		v.push_back(columns[12] + " = " + std::to_string(e.augment_6_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventNpcHandinEntries InsertOne(
-		Database& db,
-		PlayerEventNpcHandinEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.player_event_npc_handin_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.evolve_level));
-		v.push_back(std::to_string(e.evolve_amount));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-
-		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<PlayerEventNpcHandinEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.player_event_npc_handin_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.evolve_level));
-			v.push_back(std::to_string(e.evolve_amount));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-
-			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<PlayerEventNpcHandinEntries> All(Database& db)
-	{
-		std::vector<PlayerEventNpcHandinEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventNpcHandinEntries e{};
-
-			e.id                         = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_npc_handin_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.type                       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id                    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.charges                    = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.evolve_level               = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.evolve_amount              = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.augment_1_id               = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_2_id               = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_3_id               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_4_id               = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_5_id               = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.augment_6_id               = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventNpcHandinEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventNpcHandinEntries> 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) {
-			PlayerEventNpcHandinEntries e{};
-
-			e.id                         = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_npc_handin_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.type                       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id                    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.charges                    = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;
-			e.evolve_level               = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.evolve_amount              = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.augment_1_id               = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_2_id               = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_3_id               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_4_id               = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_5_id               = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.augment_6_id               = row[12] ? static_cast<uint32_t>(strtoul(row[12], 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 PlayerEventNpcHandinEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.player_event_npc_handin_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.evolve_level));
-		v.push_back(std::to_string(e.evolve_amount));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventNpcHandinEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.player_event_npc_handin_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.evolve_level));
-			v.push_back(std::to_string(e.evolve_amount));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_NPC_HANDIN_ENTRIES_REPOSITORY_H
@@ -1,523 +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_PLAYER_EVENT_NPC_HANDIN_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_NPC_HANDIN_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventNpcHandinRepository {
-public:
-	struct PlayerEventNpcHandin {
-		uint64_t    id;
-		uint32_t    npc_id;
-		std::string npc_name;
-		uint64_t    handin_copper;
-		uint64_t    handin_silver;
-		uint64_t    handin_gold;
-		uint64_t    handin_platinum;
-		uint64_t    return_copper;
-		uint64_t    return_silver;
-		uint64_t    return_gold;
-		uint64_t    return_platinum;
-		uint8_t     is_quest_handin;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"handin_copper",
-			"handin_silver",
-			"handin_gold",
-			"handin_platinum",
-			"return_copper",
-			"return_silver",
-			"return_gold",
-			"return_platinum",
-			"is_quest_handin",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"npc_id",
-			"npc_name",
-			"handin_copper",
-			"handin_silver",
-			"handin_gold",
-			"handin_platinum",
-			"return_copper",
-			"return_silver",
-			"return_gold",
-			"return_platinum",
-			"is_quest_handin",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_npc_handin");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventNpcHandin NewEntity()
-	{
-		PlayerEventNpcHandin e{};
-
-		e.id              = 0;
-		e.npc_id          = 0;
-		e.npc_name        = "";
-		e.handin_copper   = 0;
-		e.handin_silver   = 0;
-		e.handin_gold     = 0;
-		e.handin_platinum = 0;
-		e.return_copper   = 0;
-		e.return_silver   = 0;
-		e.return_gold     = 0;
-		e.return_platinum = 0;
-		e.is_quest_handin = 0;
-		e.created_at      = 0;
-
-		return e;
-	}
-
-	static PlayerEventNpcHandin GetPlayerEventNpcHandin(
-		const std::vector<PlayerEventNpcHandin> &player_event_npc_handins,
-		int player_event_npc_handin_id
-	)
-	{
-		for (auto &player_event_npc_handin : player_event_npc_handins) {
-			if (player_event_npc_handin.id == player_event_npc_handin_id) {
-				return player_event_npc_handin;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventNpcHandin FindOne(
-		Database& db,
-		int player_event_npc_handin_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_npc_handin_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventNpcHandin e{};
-
-			e.id              = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id          = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name        = row[2] ? row[2] : "";
-			e.handin_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.handin_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.handin_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.handin_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.return_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.return_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.return_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.return_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.is_quest_handin = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_npc_handin_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_npc_handin_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventNpcHandin &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.npc_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.handin_copper));
-		v.push_back(columns[4] + " = " + std::to_string(e.handin_silver));
-		v.push_back(columns[5] + " = " + std::to_string(e.handin_gold));
-		v.push_back(columns[6] + " = " + std::to_string(e.handin_platinum));
-		v.push_back(columns[7] + " = " + std::to_string(e.return_copper));
-		v.push_back(columns[8] + " = " + std::to_string(e.return_silver));
-		v.push_back(columns[9] + " = " + std::to_string(e.return_gold));
-		v.push_back(columns[10] + " = " + std::to_string(e.return_platinum));
-		v.push_back(columns[11] + " = " + std::to_string(e.is_quest_handin));
-		v.push_back(columns[12] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventNpcHandin InsertOne(
-		Database& db,
-		PlayerEventNpcHandin e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.handin_copper));
-		v.push_back(std::to_string(e.handin_silver));
-		v.push_back(std::to_string(e.handin_gold));
-		v.push_back(std::to_string(e.handin_platinum));
-		v.push_back(std::to_string(e.return_copper));
-		v.push_back(std::to_string(e.return_silver));
-		v.push_back(std::to_string(e.return_gold));
-		v.push_back(std::to_string(e.return_platinum));
-		v.push_back(std::to_string(e.is_quest_handin));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventNpcHandin> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.handin_copper));
-			v.push_back(std::to_string(e.handin_silver));
-			v.push_back(std::to_string(e.handin_gold));
-			v.push_back(std::to_string(e.handin_platinum));
-			v.push_back(std::to_string(e.return_copper));
-			v.push_back(std::to_string(e.return_silver));
-			v.push_back(std::to_string(e.return_gold));
-			v.push_back(std::to_string(e.return_platinum));
-			v.push_back(std::to_string(e.is_quest_handin));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventNpcHandin> All(Database& db)
-	{
-		std::vector<PlayerEventNpcHandin> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventNpcHandin e{};
-
-			e.id              = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id          = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name        = row[2] ? row[2] : "";
-			e.handin_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.handin_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.handin_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.handin_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.return_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.return_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.return_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.return_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.is_quest_handin = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventNpcHandin> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventNpcHandin> 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) {
-			PlayerEventNpcHandin e{};
-
-			e.id              = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.npc_id          = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.npc_name        = row[2] ? row[2] : "";
-			e.handin_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.handin_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.handin_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.handin_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.return_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.return_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.return_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.return_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.is_quest_handin = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.created_at      = strtoll(row[12] ? row[12] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventNpcHandin &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.npc_id));
-		v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-		v.push_back(std::to_string(e.handin_copper));
-		v.push_back(std::to_string(e.handin_silver));
-		v.push_back(std::to_string(e.handin_gold));
-		v.push_back(std::to_string(e.handin_platinum));
-		v.push_back(std::to_string(e.return_copper));
-		v.push_back(std::to_string(e.return_silver));
-		v.push_back(std::to_string(e.return_gold));
-		v.push_back(std::to_string(e.return_platinum));
-		v.push_back(std::to_string(e.is_quest_handin));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventNpcHandin> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.npc_id));
-			v.push_back("'" + Strings::Escape(e.npc_name) + "'");
-			v.push_back(std::to_string(e.handin_copper));
-			v.push_back(std::to_string(e.handin_silver));
-			v.push_back(std::to_string(e.handin_gold));
-			v.push_back(std::to_string(e.handin_platinum));
-			v.push_back(std::to_string(e.return_copper));
-			v.push_back(std::to_string(e.return_silver));
-			v.push_back(std::to_string(e.return_gold));
-			v.push_back(std::to_string(e.return_platinum));
-			v.push_back(std::to_string(e.is_quest_handin));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_NPC_HANDIN_REPOSITORY_H
@@ -1,463 +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_PLAYER_EVENT_SPEECH_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_SPEECH_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventSpeechRepository {
-public:
-	struct PlayerEventSpeech {
-		uint64_t    id;
-		std::string to_char_id;
-		std::string from_char_id;
-		uint32_t    guild_id;
-		uint32_t    type;
-		uint32_t    min_status;
-		std::string message;
-		time_t      created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"to_char_id",
-			"from_char_id",
-			"guild_id",
-			"type",
-			"min_status",
-			"message",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"to_char_id",
-			"from_char_id",
-			"guild_id",
-			"type",
-			"min_status",
-			"message",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_speech");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventSpeech NewEntity()
-	{
-		PlayerEventSpeech e{};
-
-		e.id           = 0;
-		e.to_char_id   = "";
-		e.from_char_id = "";
-		e.guild_id     = 0;
-		e.type         = 0;
-		e.min_status   = 0;
-		e.message      = "";
-		e.created_at   = 0;
-
-		return e;
-	}
-
-	static PlayerEventSpeech GetPlayerEventSpeech(
-		const std::vector<PlayerEventSpeech> &player_event_speechs,
-		int player_event_speech_id
-	)
-	{
-		for (auto &player_event_speech : player_event_speechs) {
-			if (player_event_speech.id == player_event_speech_id) {
-				return player_event_speech;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventSpeech FindOne(
-		Database& db,
-		int player_event_speech_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_speech_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventSpeech e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.to_char_id   = row[1] ? row[1] : "";
-			e.from_char_id = row[2] ? row[2] : "";
-			e.guild_id     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.min_status   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.message      = row[6] ? row[6] : "";
-			e.created_at   = strtoll(row[7] ? row[7] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_speech_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_speech_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventSpeech &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.to_char_id) + "'");
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.from_char_id) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.guild_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.type));
-		v.push_back(columns[5] + " = " + std::to_string(e.min_status));
-		v.push_back(columns[6] + " = '" + Strings::Escape(e.message) + "'");
-		v.push_back(columns[7] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventSpeech InsertOne(
-		Database& db,
-		PlayerEventSpeech e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.to_char_id) + "'");
-		v.push_back("'" + Strings::Escape(e.from_char_id) + "'");
-		v.push_back(std::to_string(e.guild_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.min_status));
-		v.push_back("'" + Strings::Escape(e.message) + "'");
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventSpeech> &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.to_char_id) + "'");
-			v.push_back("'" + Strings::Escape(e.from_char_id) + "'");
-			v.push_back(std::to_string(e.guild_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.min_status));
-			v.push_back("'" + Strings::Escape(e.message) + "'");
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventSpeech> All(Database& db)
-	{
-		std::vector<PlayerEventSpeech> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventSpeech e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.to_char_id   = row[1] ? row[1] : "";
-			e.from_char_id = row[2] ? row[2] : "";
-			e.guild_id     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.min_status   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.message      = row[6] ? row[6] : "";
-			e.created_at   = strtoll(row[7] ? row[7] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventSpeech> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventSpeech> 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) {
-			PlayerEventSpeech e{};
-
-			e.id           = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.to_char_id   = row[1] ? row[1] : "";
-			e.from_char_id = row[2] ? row[2] : "";
-			e.guild_id     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.type         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.min_status   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.message      = row[6] ? row[6] : "";
-			e.created_at   = strtoll(row[7] ? row[7] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventSpeech &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.to_char_id) + "'");
-		v.push_back("'" + Strings::Escape(e.from_char_id) + "'");
-		v.push_back(std::to_string(e.guild_id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.min_status));
-		v.push_back("'" + Strings::Escape(e.message) + "'");
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventSpeech> &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.to_char_id) + "'");
-			v.push_back("'" + Strings::Escape(e.from_char_id) + "'");
-			v.push_back(std::to_string(e.guild_id));
-			v.push_back(std::to_string(e.type));
-			v.push_back(std::to_string(e.min_status));
-			v.push_back("'" + Strings::Escape(e.message) + "'");
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_SPEECH_REPOSITORY_H
@@ -1,535 +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_PLAYER_EVENT_TRADE_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_TRADE_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventTradeEntriesRepository {
-public:
-	struct PlayerEventTradeEntries {
-		uint64_t id;
-		uint64_t player_event_trade_id;
-		uint32_t char_id;
-		int16_t  slot;
-		uint32_t item_id;
-		int16_t  charges;
-		uint32_t augment_1_id;
-		uint32_t augment_2_id;
-		uint32_t augment_3_id;
-		uint32_t augment_4_id;
-		uint32_t augment_5_id;
-		uint32_t augment_6_id;
-		int8_t   in_bag;
-		time_t   created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"player_event_trade_id",
-			"char_id",
-			"slot",
-			"item_id",
-			"charges",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-			"in_bag",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"player_event_trade_id",
-			"char_id",
-			"slot",
-			"item_id",
-			"charges",
-			"augment_1_id",
-			"augment_2_id",
-			"augment_3_id",
-			"augment_4_id",
-			"augment_5_id",
-			"augment_6_id",
-			"in_bag",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_trade_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventTradeEntries NewEntity()
-	{
-		PlayerEventTradeEntries e{};
-
-		e.id                    = 0;
-		e.player_event_trade_id = 0;
-		e.char_id               = 0;
-		e.slot                  = 0;
-		e.item_id               = 0;
-		e.charges               = 0;
-		e.augment_1_id          = 0;
-		e.augment_2_id          = 0;
-		e.augment_3_id          = 0;
-		e.augment_4_id          = 0;
-		e.augment_5_id          = 0;
-		e.augment_6_id          = 0;
-		e.in_bag                = 0;
-		e.created_at            = 0;
-
-		return e;
-	}
-
-	static PlayerEventTradeEntries GetPlayerEventTradeEntries(
-		const std::vector<PlayerEventTradeEntries> &player_event_trade_entriess,
-		int player_event_trade_entries_id
-	)
-	{
-		for (auto &player_event_trade_entries : player_event_trade_entriess) {
-			if (player_event_trade_entries.id == player_event_trade_entries_id) {
-				return player_event_trade_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventTradeEntries FindOne(
-		Database& db,
-		int player_event_trade_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_trade_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventTradeEntries e{};
-
-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_trade_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.char_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.slot                  = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;
-			e.item_id               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.charges               = row[5] ? static_cast<int16_t>(atoi(row[5])) : 0;
-			e.augment_1_id          = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_2_id          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_3_id          = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_4_id          = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_5_id          = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_6_id          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.in_bag                = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
-			e.created_at            = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_trade_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_trade_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventTradeEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.player_event_trade_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.char_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.slot));
-		v.push_back(columns[4] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.charges));
-		v.push_back(columns[6] + " = " + std::to_string(e.augment_1_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.augment_2_id));
-		v.push_back(columns[8] + " = " + std::to_string(e.augment_3_id));
-		v.push_back(columns[9] + " = " + std::to_string(e.augment_4_id));
-		v.push_back(columns[10] + " = " + std::to_string(e.augment_5_id));
-		v.push_back(columns[11] + " = " + std::to_string(e.augment_6_id));
-		v.push_back(columns[12] + " = " + std::to_string(e.in_bag));
-		v.push_back(columns[13] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventTradeEntries InsertOne(
-		Database& db,
-		PlayerEventTradeEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.player_event_trade_id));
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-		v.push_back(std::to_string(e.in_bag));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventTradeEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.player_event_trade_id));
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.slot));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-			v.push_back(std::to_string(e.in_bag));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventTradeEntries> All(Database& db)
-	{
-		std::vector<PlayerEventTradeEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventTradeEntries e{};
-
-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_trade_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.char_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.slot                  = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;
-			e.item_id               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.charges               = row[5] ? static_cast<int16_t>(atoi(row[5])) : 0;
-			e.augment_1_id          = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_2_id          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_3_id          = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_4_id          = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_5_id          = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_6_id          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.in_bag                = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
-			e.created_at            = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventTradeEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventTradeEntries> 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) {
-			PlayerEventTradeEntries e{};
-
-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.player_event_trade_id = row[1] ? strtoull(row[1], nullptr, 10) : 0;
-			e.char_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.slot                  = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;
-			e.item_id               = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.charges               = row[5] ? static_cast<int16_t>(atoi(row[5])) : 0;
-			e.augment_1_id          = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.augment_2_id          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.augment_3_id          = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.augment_4_id          = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.augment_5_id          = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.augment_6_id          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.in_bag                = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
-			e.created_at            = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventTradeEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.player_event_trade_id));
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.charges));
-		v.push_back(std::to_string(e.augment_1_id));
-		v.push_back(std::to_string(e.augment_2_id));
-		v.push_back(std::to_string(e.augment_3_id));
-		v.push_back(std::to_string(e.augment_4_id));
-		v.push_back(std::to_string(e.augment_5_id));
-		v.push_back(std::to_string(e.augment_6_id));
-		v.push_back(std::to_string(e.in_bag));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventTradeEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.player_event_trade_id));
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.slot));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.charges));
-			v.push_back(std::to_string(e.augment_1_id));
-			v.push_back(std::to_string(e.augment_2_id));
-			v.push_back(std::to_string(e.augment_3_id));
-			v.push_back(std::to_string(e.augment_4_id));
-			v.push_back(std::to_string(e.augment_5_id));
-			v.push_back(std::to_string(e.augment_6_id));
-			v.push_back(std::to_string(e.in_bag));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_TRADE_ENTRIES_REPOSITORY_H
@@ -1,511 +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_PLAYER_EVENT_TRADE_REPOSITORY_H
-#define EQEMU_BASE_PLAYER_EVENT_TRADE_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BasePlayerEventTradeRepository {
-public:
-	struct PlayerEventTrade {
-		uint32_t id;
-		uint32_t char1_id;
-		uint32_t char2_id;
-		uint64_t char1_copper;
-		uint64_t char1_silver;
-		uint64_t char1_gold;
-		uint64_t char1_platinum;
-		uint64_t char2_copper;
-		uint64_t char2_silver;
-		uint64_t char2_gold;
-		uint64_t char2_platinum;
-		time_t   created_at;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"char1_id",
-			"char2_id",
-			"char1_copper",
-			"char1_silver",
-			"char1_gold",
-			"char1_platinum",
-			"char2_copper",
-			"char2_silver",
-			"char2_gold",
-			"char2_platinum",
-			"created_at",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"char1_id",
-			"char2_id",
-			"char1_copper",
-			"char1_silver",
-			"char1_gold",
-			"char1_platinum",
-			"char2_copper",
-			"char2_silver",
-			"char2_gold",
-			"char2_platinum",
-			"UNIX_TIMESTAMP(created_at)",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("player_event_trade");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static PlayerEventTrade NewEntity()
-	{
-		PlayerEventTrade e{};
-
-		e.id             = 0;
-		e.char1_id       = 0;
-		e.char2_id       = 0;
-		e.char1_copper   = 0;
-		e.char1_silver   = 0;
-		e.char1_gold     = 0;
-		e.char1_platinum = 0;
-		e.char2_copper   = 0;
-		e.char2_silver   = 0;
-		e.char2_gold     = 0;
-		e.char2_platinum = 0;
-		e.created_at     = 0;
-
-		return e;
-	}
-
-	static PlayerEventTrade GetPlayerEventTrade(
-		const std::vector<PlayerEventTrade> &player_event_trades,
-		int player_event_trade_id
-	)
-	{
-		for (auto &player_event_trade : player_event_trades) {
-			if (player_event_trade.id == player_event_trade_id) {
-				return player_event_trade;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static PlayerEventTrade FindOne(
-		Database& db,
-		int player_event_trade_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				player_event_trade_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			PlayerEventTrade e{};
-
-			e.id             = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char1_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.char2_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.char1_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.char1_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.char1_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.char1_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.char2_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.char2_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.char2_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.char2_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at     = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int player_event_trade_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				player_event_trade_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const PlayerEventTrade &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.char1_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.char2_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.char1_copper));
-		v.push_back(columns[4] + " = " + std::to_string(e.char1_silver));
-		v.push_back(columns[5] + " = " + std::to_string(e.char1_gold));
-		v.push_back(columns[6] + " = " + std::to_string(e.char1_platinum));
-		v.push_back(columns[7] + " = " + std::to_string(e.char2_copper));
-		v.push_back(columns[8] + " = " + std::to_string(e.char2_silver));
-		v.push_back(columns[9] + " = " + std::to_string(e.char2_gold));
-		v.push_back(columns[10] + " = " + std::to_string(e.char2_platinum));
-		v.push_back(columns[11] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static PlayerEventTrade InsertOne(
-		Database& db,
-		PlayerEventTrade e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.char1_id));
-		v.push_back(std::to_string(e.char2_id));
-		v.push_back(std::to_string(e.char1_copper));
-		v.push_back(std::to_string(e.char1_silver));
-		v.push_back(std::to_string(e.char1_gold));
-		v.push_back(std::to_string(e.char1_platinum));
-		v.push_back(std::to_string(e.char2_copper));
-		v.push_back(std::to_string(e.char2_silver));
-		v.push_back(std::to_string(e.char2_gold));
-		v.push_back(std::to_string(e.char2_platinum));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<PlayerEventTrade> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.char1_id));
-			v.push_back(std::to_string(e.char2_id));
-			v.push_back(std::to_string(e.char1_copper));
-			v.push_back(std::to_string(e.char1_silver));
-			v.push_back(std::to_string(e.char1_gold));
-			v.push_back(std::to_string(e.char1_platinum));
-			v.push_back(std::to_string(e.char2_copper));
-			v.push_back(std::to_string(e.char2_silver));
-			v.push_back(std::to_string(e.char2_gold));
-			v.push_back(std::to_string(e.char2_platinum));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<PlayerEventTrade> All(Database& db)
-	{
-		std::vector<PlayerEventTrade> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			PlayerEventTrade e{};
-
-			e.id             = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char1_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.char2_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.char1_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.char1_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.char1_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.char1_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.char2_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.char2_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.char2_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.char2_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at     = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<PlayerEventTrade> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<PlayerEventTrade> 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) {
-			PlayerEventTrade e{};
-
-			e.id             = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char1_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.char2_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.char1_copper   = row[3] ? strtoull(row[3], nullptr, 10) : 0;
-			e.char1_silver   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
-			e.char1_gold     = row[5] ? strtoull(row[5], nullptr, 10) : 0;
-			e.char1_platinum = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.char2_copper   = row[7] ? strtoull(row[7], nullptr, 10) : 0;
-			e.char2_silver   = row[8] ? strtoull(row[8], nullptr, 10) : 0;
-			e.char2_gold     = row[9] ? strtoull(row[9], nullptr, 10) : 0;
-			e.char2_platinum = row[10] ? strtoull(row[10], nullptr, 10) : 0;
-			e.created_at     = strtoll(row[11] ? row[11] : "-1", nullptr, 10);
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventTrade &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.char1_id));
-		v.push_back(std::to_string(e.char2_id));
-		v.push_back(std::to_string(e.char1_copper));
-		v.push_back(std::to_string(e.char1_silver));
-		v.push_back(std::to_string(e.char1_gold));
-		v.push_back(std::to_string(e.char1_platinum));
-		v.push_back(std::to_string(e.char2_copper));
-		v.push_back(std::to_string(e.char2_silver));
-		v.push_back(std::to_string(e.char2_gold));
-		v.push_back(std::to_string(e.char2_platinum));
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventTrade> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.char1_id));
-			v.push_back(std::to_string(e.char2_id));
-			v.push_back(std::to_string(e.char1_copper));
-			v.push_back(std::to_string(e.char1_silver));
-			v.push_back(std::to_string(e.char1_gold));
-			v.push_back(std::to_string(e.char1_platinum));
-			v.push_back(std::to_string(e.char2_copper));
-			v.push_back(std::to_string(e.char2_silver));
-			v.push_back(std::to_string(e.char2_gold));
-			v.push_back(std::to_string(e.char2_platinum));
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-};
-
-#endif //EQEMU_BASE_PLAYER_EVENT_TRADE_REPOSITORY_H
@@ -28,15 +28,13 @@ public:
 		uint32_t aug_slot_4;
 		uint32_t aug_slot_5;
 		uint32_t aug_slot_6;
-		uint32_t item_sn;
+		int32_t  item_sn;
 		int32_t  item_charges;
-		uint32_t item_cost;
+		uint64_t item_cost;
 		uint8_t  slot_id;
 		uint32_t char_entity_id;
 		uint32_t char_zone_id;
-		int32_t  char_zone_instance_id;
-		uint8_t  active_transaction;
-		time_t   listing_date;
+		int8_t   active_transaction;
 	};

 	static std::string PrimaryKey()
@@ -62,9 +60,7 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
-			"char_zone_instance_id",
 			"active_transaction",
-			"listing_date",
 		};
 	}

@@ -86,9 +82,7 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
-			"char_zone_instance_id",
 			"active_transaction",
-			"UNIX_TIMESTAMP(listing_date)",
 		};
 	}

@@ -129,24 +123,22 @@ public:
 	{
 		Trader e{};

-		e.id                    = 0;
-		e.char_id               = 0;
-		e.item_id               = 0;
-		e.aug_slot_1            = 0;
-		e.aug_slot_2            = 0;
-		e.aug_slot_3            = 0;
-		e.aug_slot_4            = 0;
-		e.aug_slot_5            = 0;
-		e.aug_slot_6            = 0;
-		e.item_sn               = 0;
-		e.item_charges          = 0;
-		e.item_cost             = 0;
-		e.slot_id               = 0;
-		e.char_entity_id        = 0;
-		e.char_zone_id          = 0;
-		e.char_zone_instance_id = 0;
-		e.active_transaction    = 0;
-		e.listing_date          = 0;
+		e.id                 = 0;
+		e.char_id            = 0;
+		e.item_id            = 0;
+		e.aug_slot_1         = 0;
+		e.aug_slot_2         = 0;
+		e.aug_slot_3         = 0;
+		e.aug_slot_4         = 0;
+		e.aug_slot_5         = 0;
+		e.aug_slot_6         = 0;
+		e.item_sn            = 0;
+		e.item_charges       = 0;
+		e.item_cost          = 0;
+		e.slot_id            = 0;
+		e.char_entity_id     = 0;
+		e.char_zone_id       = 0;
+		e.active_transaction = 0;

 		return e;
 	}
@@ -183,24 +175,22 @@ public:
 		if (results.RowCount() == 1) {
 			Trader e{};

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_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.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.listing_date          = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_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.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

 			return e;
 		}
@@ -248,9 +238,7 @@ public:
 		v.push_back(columns[12] + " = " + std::to_string(e.slot_id));
 		v.push_back(columns[13] + " = " + std::to_string(e.char_entity_id));
 		v.push_back(columns[14] + " = " + std::to_string(e.char_zone_id));
-		v.push_back(columns[15] + " = " + std::to_string(e.char_zone_instance_id));
-		v.push_back(columns[16] + " = " + std::to_string(e.active_transaction));
-		v.push_back(columns[17] + " = FROM_UNIXTIME(" + (e.listing_date > 0 ? std::to_string(e.listing_date) : "null") + ")");
+		v.push_back(columns[15] + " = " + std::to_string(e.active_transaction));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -287,9 +275,7 @@ public:
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.char_entity_id));
 		v.push_back(std::to_string(e.char_zone_id));
-		v.push_back(std::to_string(e.char_zone_instance_id));
 		v.push_back(std::to_string(e.active_transaction));
-		v.push_back("FROM_UNIXTIME(" + (e.listing_date > 0 ? std::to_string(e.listing_date) : "null") + ")");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -334,9 +320,7 @@ public:
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.char_entity_id));
 			v.push_back(std::to_string(e.char_zone_id));
-			v.push_back(std::to_string(e.char_zone_instance_id));
 			v.push_back(std::to_string(e.active_transaction));
-			v.push_back("FROM_UNIXTIME(" + (e.listing_date > 0 ? std::to_string(e.listing_date) : "null") + ")");

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

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_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.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.listing_date          = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_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.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

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

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_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.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.listing_date          = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_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.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

 			all_entries.push_back(e);
 		}
@@ -519,9 +499,7 @@ public:
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.char_entity_id));
 		v.push_back(std::to_string(e.char_zone_id));
-		v.push_back(std::to_string(e.char_zone_instance_id));
 		v.push_back(std::to_string(e.active_transaction));
-		v.push_back("FROM_UNIXTIME(" + (e.listing_date > 0 ? std::to_string(e.listing_date) : "null") + ")");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -559,9 +537,7 @@ public:
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.char_entity_id));
 			v.push_back(std::to_string(e.char_zone_id));
-			v.push_back(std::to_string(e.char_zone_instance_id));
 			v.push_back(std::to_string(e.active_transaction));
-			v.push_back("FROM_UNIXTIME(" + (e.listing_date > 0 ? std::to_string(e.listing_date) : "null") + ")");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -111,13 +111,12 @@ public:
 		int32_t     fast_regen_mana;
 		int32_t     fast_regen_endurance;
 		int32_t     npc_max_aggro_dist;
-		uint32_t    client_update_range;
+		uint32_t    max_movement_update_range;
 		int32_t     underworld_teleport_index;
 		int32_t     lava_damage;
 		int32_t     min_lava_damage;
 		uint8_t     idle_when_empty;
 		uint32_t    seconds_before_idle;
-		int32_t     shard_at_player_count;
 	};

 	static std::string PrimaryKey()
@@ -220,13 +219,12 @@ public:
 			"fast_regen_mana",
 			"fast_regen_endurance",
 			"npc_max_aggro_dist",
-			"client_update_range",
+			"max_movement_update_range",
 			"underworld_teleport_index",
 			"lava_damage",
 			"min_lava_damage",
 			"idle_when_empty",
 			"seconds_before_idle",
-			"shard_at_player_count",
 		};
 	}

@@ -325,13 +323,12 @@ public:
 			"fast_regen_mana",
 			"fast_regen_endurance",
 			"npc_max_aggro_dist",
-			"client_update_range",
+			"max_movement_update_range",
 			"underworld_teleport_index",
 			"lava_damage",
 			"min_lava_damage",
 			"idle_when_empty",
 			"seconds_before_idle",
-			"shard_at_player_count",
 		};
 	}

@@ -464,13 +461,12 @@ public:
 		e.fast_regen_mana           = 180;
 		e.fast_regen_endurance      = 180;
 		e.npc_max_aggro_dist        = 600;
-		e.client_update_range       = 600;
+		e.max_movement_update_range = 600;
 		e.underworld_teleport_index = 0;
 		e.lava_damage               = 50;
 		e.min_lava_damage           = 10;
 		e.idle_when_empty           = 1;
 		e.seconds_before_idle       = 60;
-		e.shard_at_player_count     = 0;

 		return e;
 	}
@@ -599,13 +595,12 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
-			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;

 			return e;
 		}
@@ -730,13 +725,12 @@ public:
 		v.push_back(columns[89] + " = " + std::to_string(e.fast_regen_mana));
 		v.push_back(columns[90] + " = " + std::to_string(e.fast_regen_endurance));
 		v.push_back(columns[91] + " = " + std::to_string(e.npc_max_aggro_dist));
-		v.push_back(columns[92] + " = " + std::to_string(e.client_update_range));
+		v.push_back(columns[92] + " = " + std::to_string(e.max_movement_update_range));
 		v.push_back(columns[93] + " = " + std::to_string(e.underworld_teleport_index));
 		v.push_back(columns[94] + " = " + std::to_string(e.lava_damage));
 		v.push_back(columns[95] + " = " + std::to_string(e.min_lava_damage));
 		v.push_back(columns[96] + " = " + std::to_string(e.idle_when_empty));
 		v.push_back(columns[97] + " = " + std::to_string(e.seconds_before_idle));
-		v.push_back(columns[98] + " = " + std::to_string(e.shard_at_player_count));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -850,13 +844,12 @@ public:
 		v.push_back(std::to_string(e.fast_regen_mana));
 		v.push_back(std::to_string(e.fast_regen_endurance));
 		v.push_back(std::to_string(e.npc_max_aggro_dist));
-		v.push_back(std::to_string(e.client_update_range));
+		v.push_back(std::to_string(e.max_movement_update_range));
 		v.push_back(std::to_string(e.underworld_teleport_index));
 		v.push_back(std::to_string(e.lava_damage));
 		v.push_back(std::to_string(e.min_lava_damage));
 		v.push_back(std::to_string(e.idle_when_empty));
 		v.push_back(std::to_string(e.seconds_before_idle));
-		v.push_back(std::to_string(e.shard_at_player_count));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -978,13 +971,12 @@ public:
 			v.push_back(std::to_string(e.fast_regen_mana));
 			v.push_back(std::to_string(e.fast_regen_endurance));
 			v.push_back(std::to_string(e.npc_max_aggro_dist));
-			v.push_back(std::to_string(e.client_update_range));
+			v.push_back(std::to_string(e.max_movement_update_range));
 			v.push_back(std::to_string(e.underworld_teleport_index));
 			v.push_back(std::to_string(e.lava_damage));
 			v.push_back(std::to_string(e.min_lava_damage));
 			v.push_back(std::to_string(e.idle_when_empty));
 			v.push_back(std::to_string(e.seconds_before_idle));
-			v.push_back(std::to_string(e.shard_at_player_count));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1110,13 +1102,12 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
-			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;

 			all_entries.push_back(e);
 		}
@@ -1233,13 +1224,12 @@ public:
 			e.fast_regen_mana           = row[89] ? static_cast<int32_t>(atoi(row[89])) : 180;
 			e.fast_regen_endurance      = row[90] ? static_cast<int32_t>(atoi(row[90])) : 180;
 			e.npc_max_aggro_dist        = row[91] ? static_cast<int32_t>(atoi(row[91])) : 600;
-			e.client_update_range       = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
+			e.max_movement_update_range = row[92] ? static_cast<uint32_t>(strtoul(row[92], nullptr, 10)) : 600;
 			e.underworld_teleport_index = row[93] ? static_cast<int32_t>(atoi(row[93])) : 0;
 			e.lava_damage               = row[94] ? static_cast<int32_t>(atoi(row[94])) : 50;
 			e.min_lava_damage           = row[95] ? static_cast<int32_t>(atoi(row[95])) : 10;
 			e.idle_when_empty           = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 1;
 			e.seconds_before_idle       = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 60;
-			e.shard_at_player_count     = row[98] ? static_cast<int32_t>(atoi(row[98])) : 0;

 			all_entries.push_back(e);
 		}
@@ -1406,13 +1396,12 @@ public:
 		v.push_back(std::to_string(e.fast_regen_mana));
 		v.push_back(std::to_string(e.fast_regen_endurance));
 		v.push_back(std::to_string(e.npc_max_aggro_dist));
-		v.push_back(std::to_string(e.client_update_range));
+		v.push_back(std::to_string(e.max_movement_update_range));
 		v.push_back(std::to_string(e.underworld_teleport_index));
 		v.push_back(std::to_string(e.lava_damage));
 		v.push_back(std::to_string(e.min_lava_damage));
 		v.push_back(std::to_string(e.idle_when_empty));
 		v.push_back(std::to_string(e.seconds_before_idle));
-		v.push_back(std::to_string(e.shard_at_player_count));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1527,13 +1516,12 @@ public:
 			v.push_back(std::to_string(e.fast_regen_mana));
 			v.push_back(std::to_string(e.fast_regen_endurance));
 			v.push_back(std::to_string(e.npc_max_aggro_dist));
-			v.push_back(std::to_string(e.client_update_range));
+			v.push_back(std::to_string(e.max_movement_update_range));
 			v.push_back(std::to_string(e.underworld_teleport_index));
 			v.push_back(std::to_string(e.lava_damage));
 			v.push_back(std::to_string(e.min_lava_damage));
 			v.push_back(std::to_string(e.idle_when_empty));
 			v.push_back(std::to_string(e.seconds_before_idle));
-			v.push_back(std::to_string(e.shard_at_player_count));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1,50 +0,0 @@
-#ifndef EQEMU_BOT_BLOCKED_BUFFS_REPOSITORY_H
-#define EQEMU_BOT_BLOCKED_BUFFS_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_bot_blocked_buffs_repository.h"
-
-class BotBlockedBuffsRepository: public BaseBotBlockedBuffsRepository {
-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
-     *
-     * BotBlockedBuffsRepository::GetByZoneAndVersion(int zone_id, int zone_version)
-     * BotBlockedBuffsRepository::GetWhereNeverExpires()
-     * BotBlockedBuffsRepository::GetWhereXAndY()
-     * BotBlockedBuffsRepository::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_BOT_BLOCKED_BUFFS_REPOSITORY_H
@@ -44,6 +44,46 @@ public:
     */

 	// Custom extended repository methods here
+	static bool SaveAllHelmAppearances(Database& db, const uint32 owner_id, const bool show_flag)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE `{}` SET `show_helm` = {} WHERE `owner_id` = {}",
+				TableName(),
+				show_flag ? 1 : 0,
+				owner_id
+			)
+		);
+
+		return results.Success();
+	}
+
+	static bool ToggleAllHelmAppearances(Database& db, const uint32 owner_id)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE `{}` SET `show_helm` = (`show_helm` XOR '1') WHERE `owner_id` = {}",
+				TableName(),
+				owner_id
+			)
+		);
+
+		return results.Success();
+	}
+
+	static bool SaveAllFollowDistances(Database& db, const uint32 owner_id, const uint32 follow_distance)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE `{}` SET `follow_distance` = {} WHERE `owner_id` = {}",
+				TableName(),
+				follow_distance,
+				owner_id
+			)
+		);
+
+		return results.Success();
+	}
 };

 #endif //EQEMU_BOT_DATA_REPOSITORY_H
@@ -1,50 +0,0 @@
-#ifndef EQEMU_BOT_SETTINGS_REPOSITORY_H
-#define EQEMU_BOT_SETTINGS_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_bot_settings_repository.h"
-
-class BotSettingsRepository: public BaseBotSettingsRepository {
-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
-     *
-     * BotSettingsRepository::GetByZoneAndVersion(int zone_id, int zone_version)
-     * BotSettingsRepository::GetWhereNeverExpires()
-     * BotSettingsRepository::GetWhereXAndY()
-     * BotSettingsRepository::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_BOT_SETTINGS_REPOSITORY_H
@@ -80,93 +80,6 @@ public:

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

 #endif //EQEMU_CHARACTER_DATA_REPOSITORY_H
@@ -1,66 +0,0 @@
-#ifndef EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
-#define EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_character_evolving_items_repository.h"
-
-#include <boost/tuple/tuple_comparison.hpp>
-
-class CharacterEvolvingItemsRepository: public BaseCharacterEvolvingItemsRepository {
-public:
-	// Custom extended repository methods here
-
-	static CharacterEvolvingItems SetCurrentAmountAndProgression(Database& db, const uint64 id, const uint64 amount, const double progression)
-	{
-		auto e = FindOne(db, id);
-		if (e.id == 0) {
-			return NewEntity();
-		}
-
-		e.current_amount = amount;
-		e.progression    = progression;
-		e.deleted_at     = 0;
-		UpdateOne(db, e);
-		return e;
-	}
-
-	static CharacterEvolvingItems SetEquipped(Database& db, const uint64 id, const bool equipped)
-	{
-		auto e = FindOne(db, id);
-		if (e.id == 0) {
-			return NewEntity();
-		}
-
-		e.equipped   = equipped;
-		e.deleted_at = 0;
-		UpdateOne(db, e);
-		return e;
-	}
-
-	static CharacterEvolvingItems SoftDelete(Database& db, const uint64 id)
-	{
-		auto e = FindOne(db, id);
-		if (e.id == 0) {
-			return NewEntity();
-		}
-
-		e.deleted_at = time(nullptr);
-		UpdateOne(db, e);
-		return e;
-	}
-
-	static bool UpdateCharID(Database &db, const uint64 id, const uint32 to_char_id)
-	{
-		auto e = FindOne(db, id);
-		if (e.id == 0) {
-			return false;
-		}
-
-		e.character_id = to_char_id;
-		e.deleted_at   = 0;
-		return UpdateOne(db, e);
-	}
-};
-
-#endif //EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H
@@ -1,13 +0,0 @@
-#ifndef EQEMU_CHARACTER_PET_NAME_REPOSITORY_H
-#define EQEMU_CHARACTER_PET_NAME_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_character_pet_name_repository.h"
-
-class CharacterPetNameRepository: public BaseCharacterPetNameRepository {
-public:
-	// Custom extended repository methods here
-};
-
-#endif //EQEMU_CHARACTER_PET_NAME_REPOSITORY_H
@@ -1,50 +0,0 @@
-#ifndef EQEMU_FIND_LOCATION_REPOSITORY_H
-#define EQEMU_FIND_LOCATION_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_find_location_repository.h"
-
-class FindLocationRepository: public BaseFindLocationRepository {
-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
-     *
-     * FindLocationRepository::GetByZoneAndVersion(int zone_id, int zone_version)
-     * FindLocationRepository::GetWhereNeverExpires()
-     * FindLocationRepository::GetWhereXAndY()
-     * FindLocationRepository::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_FIND_LOCATION_REPOSITORY_H
@@ -1,14 +0,0 @@
-#ifndef EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
-#define EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_items_evolving_details_repository.h"
-
-class ItemsEvolvingDetailsRepository: public BaseItemsEvolvingDetailsRepository {
-public:
-	// Custom extended repository methods here
-
-};
-
-#endif //EQEMU_ITEMS_EVOLVING_DETAILS_REPOSITORY_H
@@ -7,14 +7,6 @@

 class ItemsRepository: public BaseItemsRepository {
 public:
-	struct Bazaar_Results {
-		uint32      item_id;
-		std::string name;
-		bool        stackable;
-		uint32      icon;
-		uint32      stats;
-	};
-
 	static std::vector<int32> GetItemIDsBySearchCriteria(
 		Database& db,
 		std::string search_string,
@@ -45,51 +37,6 @@ public:
 		return item_id_list;
 	}

-	static std::unordered_map<uint32, Bazaar_Results> GetItemsForBazaarSearch(
-		Database& db,
-		const std::vector<std::string> &search_ids,
-		const std::string &name,
-		const std::string &field_criteria_items,
-		const std::string &where_criteria_items,
-		const uint32       query_limit = 0
-	)
-	{
-		auto query = fmt::format(
-			"SELECT id, name, stackable, icon, {} "
-			"FROM items "
-			"WHERE `name` LIKE '%%{}%%' AND {} AND id IN({}) "
-			"ORDER BY id ASC",
-			field_criteria_items,
-			Strings::Escape(name),
-			where_criteria_items,
-			Strings::Implode(",", search_ids)
-		);
-
-		if (query_limit >= 1) {
-			query += fmt::format(" LIMIT {}", query_limit);
-		}
-
-		std::unordered_map<uint32, Bazaar_Results> item_list;
-
-		auto results = db.QueryDatabase(query);
-		if (!results.Success() || !results.RowCount()) {
-			return item_list;
-		}
-
-		item_list.reserve(results.RowCount());
-		for (auto row : results) {
-			Bazaar_Results br{};
-			br.item_id   = row[0]       ? static_cast<int32_t>(atoi(row[0])) : 0;
-			br.name      = row[1]       ? row[1]                             : "";
-			br.stackable = atoi(row[2]) ? true                               : false;
-			br.icon      = row[3]       ? static_cast<int32_t>(atoi(row[3])) : 0;
-			br.stats     = row[4]       ? static_cast<int32_t>(atoi(row[4])) : 0;
-
-			item_list.emplace(br.item_id, br);
-		}
-
-		return item_list;
-	}

 };

@@ -4,94 +4,47 @@
 #include "../database.h"
 #include "../strings.h"
 #include "base/base_login_accounts_repository.h"
-#include "../../loginserver/encryption.h"
-#include "../../loginserver/login_types.h"

-class LoginAccountsRepository : public BaseLoginAccountsRepository {
+class LoginAccountsRepository: public BaseLoginAccountsRepository {
 public:
-	static int64 GetFreeID(Database &db, const std::string &loginserver)
-	{
-		auto query = fmt::format(
-			"SELECT IFNULL(MAX(id), 0) + 1 FROM login_accounts WHERE source_loginserver = '{}'",
-			Strings::Escape(loginserver)
-		);

-		auto results = db.QueryDatabase(query);
-		if (!results.Success() || results.RowCount() != 1) {
-			return 0;
-		}
+    /**
+     * 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
+     *
+     * LoginAccountsRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * LoginAccountsRepository::GetWhereNeverExpires()
+     * LoginAccountsRepository::GetWhereXAndY()
+     * LoginAccountsRepository::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
+     */

-		auto row = results.begin();
+	// Custom extended repository methods here

-		return Strings::ToUnsignedInt(row[0]);
-	}
-
-	static LoginAccountsRepository::LoginAccounts CreateAccountFromContext(
-		Database &db,
-		LoginAccountContext c
-	)
-	{
-		auto a = LoginAccountsRepository::NewEntity();
-
-		if (!c.password_is_encrypted) {
-			auto e = EncryptPasswordFromContext(c);
-			a.account_password = e.password;
-		}
-
-		a.id                 = c.login_account_id > 0 ? c.login_account_id : GetFreeID(db, c.source_loginserver);
-		a.account_name       = c.username;
-		a.account_email      = !c.email.empty() ? c.email : "local_creation";
-		a.source_loginserver = c.source_loginserver;
-		a.last_ip_address    = "127.0.0.1";
-		a.last_login_date    = std::time(nullptr);
-		a.created_at         = std::time(nullptr);
-		LoginAccountsRepository::InsertOne(db, a);
-
-		return GetAccountFromContext(db, c).id > 0 ? a : NewEntity();
-	}
-
-	static LoginAccountsRepository::LoginAccounts GetAccountFromContext(
-		Database &db,
-		LoginAccountContext c
-	)
-	{
-		std::string where = fmt::format(
-			"account_name = '{}' AND source_loginserver = '{}'",
-			Strings::Escape(c.username),
-			Strings::Escape(c.source_loginserver)
-		);
-
-		if (!c.email.empty()) {
-			where += fmt::format(" AND account_email = '{}'", Strings::Escape(c.email));
-		}
-		if (c.login_account_id > 0) {
-			where += fmt::format(" AND id = {}", c.login_account_id);
-		}
-
-		where += " LIMIT 1";
-
-		auto results = LoginAccountsRepository::GetWhere(db, where);
-
-		auto e = LoginAccountsRepository::NewEntity();
-		if (results.size() == 1) {
-			e = results.front();
-		}
-
-		return e;
-	}
-
-	static LoginAccounts UpdateAccountPassword(Database &db, LoginAccounts a, std::string password)
-	{
-		LoginAccountContext c;
-		c.username = a.account_name;
-		c.password = password;
-		auto e = EncryptPasswordFromContext(c);
-		a.account_password = e.password;
-
-		int success = LoginAccountsRepository::UpdateOne(db, a);
-
-		return success ? a : NewEntity();
-	}
 };

 #endif //EQEMU_LOGIN_ACCOUNTS_REPOSITORY_H
@@ -5,24 +5,46 @@
 #include "../strings.h"
 #include "base/base_login_server_admins_repository.h"

-class LoginServerAdminsRepository : public BaseLoginServerAdminsRepository {
+class LoginServerAdminsRepository: public BaseLoginServerAdminsRepository {
 public:
-	static LoginServerAdmins GetByName(Database &db, std::string account_name)
-	{
-		auto admins = GetWhere(
-			db,
-			fmt::format(
-				"account_name = '{}' LIMIT 1",
-				Strings::Escape(account_name)
-			)
-		);

-		if (admins.size() == 1) {
-			return admins.front();
-		}
+    /**
+     * 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
+     *
+     * LoginServerAdminsRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * LoginServerAdminsRepository::GetWhereNeverExpires()
+     * LoginServerAdminsRepository::GetWhereXAndY()
+     * LoginServerAdminsRepository::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

-		return NewEntity();
-	}
 };

 #endif //EQEMU_LOGIN_SERVER_ADMINS_REPOSITORY_H
@@ -7,27 +7,44 @@

 class LoginWorldServersRepository: public BaseLoginWorldServersRepository {
 public:
-	static LoginWorldServers GetFromWorldContext(Database &db, LoginWorldContext c) {
-		std::string where = fmt::format(
-			"short_name = '{}' AND long_name = '{}'",
-			Strings::Escape(c.short_name),
-			Strings::Escape(c.long_name)
-		);

-		if (c.admin_id > 0) {
-			where += fmt::format(" AND login_server_admin_id = {}", c.admin_id);
-		}
+    /**
+     * 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
+     *
+     * LoginWorldServersRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * LoginWorldServersRepository::GetWhereNeverExpires()
+     * LoginWorldServersRepository::GetWhereXAndY()
+     * LoginWorldServersRepository::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
+     */

-		where += " LIMIT 1";
+	// Custom extended repository methods here

-		auto results = GetWhere(db, where);
-		auto e = NewEntity();
-		if (results.size() == 1) {
-			e = results.front();
-		}
-
-		return e;
-	}
 };

 #endif //EQEMU_LOGIN_WORLD_SERVERS_REPOSITORY_H
@@ -1,13 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
-#define EQEMU_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_player_event_aa_purchase_repository.h"
-
-class PlayerEventAaPurchaseRepository: public BasePlayerEventAaPurchaseRepository {
-public:
-	// Custom extended repository methods here
-};
-
-#endif //EQEMU_PLAYER_EVENT_AA_PURCHASE_REPOSITORY_H
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kinglykrab	df746dd07d	Add slot ID conversions	2024-11-21 23:29:10 -05:00
Kinglykrab	cd158aabca	Cleanup	2024-11-21 23:29:10 -05:00
Kinglykrab	95687b57e9	Cleanup	2024-11-21 23:29:10 -05:00
Kinglykrab	77de74a089	Update shareddb.cpp	2024-11-21 23:29:10 -05:00
Kinglykrab	1da7901029	Update worlddb.cpp	2024-11-21 23:29:10 -05:00
Kinglykrab	738a31df51	[Feature] Implement "Big Bags"	2024-11-21 23:29:02 -05:00