Saving and loading of guids for items, still needs a lot of work, esp with corpses. No auditing yet

GUID interface.
2026-05-24 18:22:29 +00:00 · 2023-03-06 23:59:07 -08:00 · 2023-03-06 13:51:00 -08:00
676 changed files with 69581 additions and 27990 deletions
@@ -1,647 +1,3 @@
-## [22.15.0] - 06/19/2023
-
-### Code
-
-* Default skill type to Hand to Hand in #npcedit meleetype ([#3422](https://github.com/EQEmu/Server/pull/3422)) @Kinglykrab 2023-06-19
-
-### Commands
-
-* Add missing subcommands to #npcedit ([#3423](https://github.com/EQEmu/Server/pull/3423)) @Kinglykrab 2023-06-19
-
-### Database
-
-* Implement native database migrations in server ([#2857](https://github.com/EQEmu/Server/pull/2857)) @Akkadius 2023-06-19
-
-### Fixes
-
-* Fix possible crash with #npcedit weapon ([#3421](https://github.com/EQEmu/Server/pull/3421)) @Kinglykrab 2023-06-19
-
-## [22.14.1] - 06/18/2023
-
-### Backups
-
-* Move world database:dump to use MySQL credentials file ([#3410](https://github.com/EQEmu/Server/pull/3410)) @Akkadius 2023-06-17
-
-### Binaries
-
-* Add support for static linking (portable) binaries ([#3417](https://github.com/EQEmu/Server/pull/3417)) @Akkadius 2023-06-18
-
-### CI
-
-* Build static linux binaries ([#3419](https://github.com/EQEmu/Server/pull/3419)) @Akkadius 2023-06-18
-
-### CLI
-
-* Add `bots:enable` and `bots:disable` commands ([#3415](https://github.com/EQEmu/Server/pull/3415)) @Akkadius 2023-06-17
-* Add `mercs:enable` and `mercs:disable` commands ([#3416](https://github.com/EQEmu/Server/pull/3416)) @Akkadius 2023-06-18
-* Console menu validation fixes ([#3413](https://github.com/EQEmu/Server/pull/3413)) @Akkadius 2023-06-17
-
-### Database
-
-* Add query multi statement execution support ([#3414](https://github.com/EQEmu/Server/pull/3414)) @Akkadius 2023-06-17
-
-### Feature
-
-* Add Water Line of Sight Checks ([#3408](https://github.com/EQEmu/Server/pull/3408)) @nytmyr 2023-06-17
-
-### Logging
-
-* Logging improvements, console silencing, terminal coloring ([#3412](https://github.com/EQEmu/Server/pull/3412)) @Akkadius 2023-06-17
-
-### Quest API
-
-* Add convert_money_to_string() to Perl/Lua ([#3418](https://github.com/EQEmu/Server/pull/3418)) @Kinglykrab 2023-06-18
-
-### Strings
-
-* Add more test cases for string utils ([#3411](https://github.com/EQEmu/Server/pull/3411)) @Akkadius 2023-06-17
-
-### Targeting
-
-* Fix bug when using /tar on invalid target ([#3407](https://github.com/EQEmu/Server/pull/3407)) @noudess 2023-06-17
-
-### Telnet
-
-* Add cross zone/world wide cast and move functionality to Telnet ([#3409](https://github.com/EQEmu/Server/pull/3409)) @Kinglykrab 2023-06-17
-
-## [22.13.1] - 06/13/2023
-
-### Targeting
-
-* Revert #3383 ([#3405](https://github.com/EQEmu/Server/pull/3405)) @noudess 2023-06-13
-
-## [22.13.0] - 06/12/2023
-
-### Code
-
-* Add GMFind_Struct to packet structures ([#3402](https://github.com/EQEmu/Server/pull/3402)) @Kinglykrab 2023-06-12
-* Remove CHECK_LOS_STEP from zone/common.h ([#3398](https://github.com/EQEmu/Server/pull/3398)) @Kinglykrab 2023-06-12
-* Remove CheckCoordLosNoZLeaps() from zone/entity.cpp and zone/entity.h ([#3384](https://github.com/EQEmu/Server/pull/3384)) @Kinglykrab 2023-06-12
-* Remove CountTempPets() from zone/entity.cpp and zone/entity.h ([#3390](https://github.com/EQEmu/Server/pull/3390)) @Kinglykrab 2023-06-12
-* Remove Evade() from zone/entity.cpp and zone/entity.h ([#3394](https://github.com/EQEmu/Server/pull/3394)) @Kinglykrab 2023-06-12
-* Remove GateAllClients() from zone/entity.cpp and zone/entity.h ([#3391](https://github.com/EQEmu/Server/pull/3391)) @Kinglykrab 2023-06-12
-* Remove GetClient(ip, port) from zone/entity.h ([#3386](https://github.com/EQEmu/Server/pull/3386)) @Kinglykrab 2023-06-12
-* Remove GetClientCount() from zone/entity.cpp and zone/entity.h ([#3392](https://github.com/EQEmu/Server/pull/3392)) @Kinglykrab 2023-06-12
-* Remove GetGroupByBot(), GetRaidByMob(), and GetRaidByLeaderName() from zone/entity.cpp and zone/entity.h ([#3387](https://github.com/EQEmu/Server/pull/3387)) @Kinglykrab 2023-06-12
-* Remove InteractiveChat() and TakenAction() from zone/npc.h ([#3382](https://github.com/EQEmu/Server/pull/3382)) @Kinglykrab 2023-06-12
-* Remove LimitCheckBoth() from zone/entity.cpp and zone/entity.h ([#3393](https://github.com/EQEmu/Server/pull/3393)) @Kinglykrab 2023-06-12
-* Remove NPC::AddCash() from npc.cpp/npc.h ([#3380](https://github.com/EQEmu/Server/pull/3380)) @Kinglykrab 2023-06-09
-* Remove RemoveMob() and RemoveRaid() from zone/entity.cpp and zone/entity.h ([#3389](https://github.com/EQEmu/Server/pull/3389)) @Kinglykrab 2023-06-12
-* Remove SPECIALIZE_MANA_REDUCE from zone/common.h ([#3400](https://github.com/EQEmu/Server/pull/3400)) @Kinglykrab 2023-06-12
-* Remove SendAATimer() from zone/entity.h ([#3388](https://github.com/EQEmu/Server/pull/3388)) @Kinglykrab 2023-06-12
-* Remove WriteEntityIDs() from zone/entity.cpp and zone/entity.h ([#3395](https://github.com/EQEmu/Server/pull/3395)) @Kinglykrab 2023-06-12
-* Remove _BECOMENPCPET() and _NPCPET() from zone/common.h ([#3399](https://github.com/EQEmu/Server/pull/3399)) @Kinglykrab 2023-06-12
-* Remove pDBAsyncWorkID from zone/entity.h ([#3385](https://github.com/EQEmu/Server/pull/3385)) @Kinglykrab 2023-06-12
-* Remove struct DynamicZoneSafeReturn from zone/entity.h ([#3396](https://github.com/EQEmu/Server/pull/3396)) @Kinglykrab 2023-06-12
-* Remove struct TradeEntity from zone/common.h ([#3397](https://github.com/EQEmu/Server/pull/3397)) @Kinglykrab 2023-06-12
-
-### Commands
-
-* Assign #opcode to a #reload alias ([#3401](https://github.com/EQEmu/Server/pull/3401)) @Kinglykrab 2023-06-12
-
-### Illusions
-
-* RandomizeFeatures and SetGender were killing db texture ([#3376](https://github.com/EQEmu/Server/pull/3376)) @noudess 2023-06-06
-
-### Logging
-
-* Fixed statements that logged incorrect data ([#3381](https://github.com/EQEmu/Server/pull/3381)) @noudess 2023-06-07
-
-### Quest API
-
-* Add GetEXPForLevel() to Perl/Lua ([#3403](https://github.com/EQEmu/Server/pull/3403)) @Kinglykrab 2023-06-12
-* Add SendChannelMessage() to Perl/Lua ([#3378](https://github.com/EQEmu/Server/pull/3378)) @Kinglykrab 2023-06-04
-* Add several spell methods to Perl/Lua ([#3379](https://github.com/EQEmu/Server/pull/3379)) @Kinglykrab 2023-06-12
-
-### Targeting
-
-* /tar <bad target> should not untarget existing target ([#3383](https://github.com/EQEmu/Server/pull/3383)) @noudess 2023-06-12
-
-## [22.12.0] - 05/29/2023
-
-### Code
-
-* Cleanup #setskill and #setskillall Commands ([#3367](https://github.com/EQEmu/Server/pull/3367)) @Kinglykrab 2023-05-25
-* Delete message.h ([#3348](https://github.com/EQEmu/Server/pull/3348)) @Kinglykrab 2023-05-17
-* Fix #spawn command NPCs having 0 health ([#3371](https://github.com/EQEmu/Server/pull/3371)) @Kinglykrab 2023-05-21
-* Remove CalcPetHp from spdat.h ([#3364](https://github.com/EQEmu/Server/pull/3364)) @Kinglykrab 2023-05-25
-* Remove CountNPC() and QueueManaged() from entity.cpp/entity.h ([#3346](https://github.com/EQEmu/Server/pull/3346)) @Kinglykrab 2023-05-17
-* Remove DumpMerchantList() from zone.cpp/zone.h ([#3343](https://github.com/EQEmu/Server/pull/3343)) @Kinglykrab 2023-05-17
-* Remove GetDamageReceived() and GetHealReceived() from combat_record.cpp/combat_record.h ([#3358](https://github.com/EQEmu/Server/pull/3358)) @Kinglykrab 2023-05-17
-* Remove GetEscapingEntOnHateList() from hate_list.cpp/hate_list.h ([#3353](https://github.com/EQEmu/Server/pull/3353)) @Kinglykrab 2023-05-17
-* Remove GetMaxRank() from aa_ability.cpp/aa_ability.h ([#3347](https://github.com/EQEmu/Server/pull/3347)) @Kinglykrab 2023-05-25
-* Remove IsEntityInFrenzyMode() from hate_list.cpp/hate_list.h ([#3352](https://github.com/EQEmu/Server/pull/3352)) @Kinglykrab 2023-05-17
-* Remove IsRaid() from raids.h ([#3361](https://github.com/EQEmu/Server/pull/3361)) @Kinglykrab 2023-05-25
-* Remove LoadSpawn2() and PopulateZoneSpawnListClose() from spawn2.cpp/zonedb.h ([#3344](https://github.com/EQEmu/Server/pull/3344)) @Kinglykrab 2023-05-25
-* Remove SetGraveyard() from zone.cpp/zone.h ([#3354](https://github.com/EQEmu/Server/pull/3354)) @Kinglykrab 2023-05-17
-* Remove SetTradeCash() from trading.cpp/common.h ([#3356](https://github.com/EQEmu/Server/pull/3356)) @Kinglykrab 2023-05-17
-* Remove TraderUpdate() from trading.cpp/client.h ([#3357](https://github.com/EQEmu/Server/pull/3357)) @Kinglykrab 2023-05-17
-* Remove TypeToSkill() from tradeskills.cpp/object.h ([#3355](https://github.com/EQEmu/Server/pull/3355)) @Kinglykrab 2023-05-17
-* Remove Z_AGGRO from spdat.h ([#3365](https://github.com/EQEmu/Server/pull/3365)) @Kinglykrab 2023-05-25
-* Remove numMembers from raids.h ([#3362](https://github.com/EQEmu/Server/pull/3362)) @Kinglykrab 2023-05-25
-* Set GetAugmentType() to int again ([#3335](https://github.com/EQEmu/Server/pull/3335)) @Kinglykrab 2023-05-08
-
-### Commands
-
-* Add #findcurrency Command ([#3368](https://github.com/EQEmu/Server/pull/3368)) @Kinglykrab 2023-05-25
-* Add entity variable command ([#3345](https://github.com/EQEmu/Server/pull/3345)) @Kinglykrab 2023-05-25
-* Cleanup #setanim ([#3350](https://github.com/EQEmu/Server/pull/3350)) @Kinglykrab 2023-05-25
-
-### Feature
-
-* Intoxication setter/getter for source, getter for Perl/Lua ([#3330](https://github.com/EQEmu/Server/pull/3330)) @JasXSL 2023-05-03
-
-### Fixes
-
-* #augmentitem bypasses augment restrictions ([#3332](https://github.com/EQEmu/Server/pull/3332)) @Kinglykrab 2023-05-07
-* Fix Heroic INT/WIS Bonuses ([#3341](https://github.com/EQEmu/Server/pull/3341)) @RekkasGit 2023-05-15
-* Fix duplicate messages in #npcedit ([#3372](https://github.com/EQEmu/Server/pull/3372)) @Kinglykrab 2023-05-21
-* Fix issue with Group Pointers/Member roles ([#3374](https://github.com/EQEmu/Server/pull/3374)) @Aeadoin 2023-05-25
-* Fix mob item bonus calc ([#3334](https://github.com/EQEmu/Server/pull/3334)) @Akkadius 2023-05-07
-* Fix typos in #zheader ([#3370](https://github.com/EQEmu/Server/pull/3370)) @Kinglykrab 2023-05-21
-* Mob scaling issue with min dmg set to zero while max dmg is not ([#3351](https://github.com/EQEmu/Server/pull/3351)) @RekkasGit 2023-05-20
-* NPC Armor Upgrade to a slot not handled correctly ([#3366](https://github.com/EQEmu/Server/pull/3366)) @noudess 2023-05-20
-* ReloadQuests() on Zone::Init() to avoid cached global quests/plugins ([#3333](https://github.com/EQEmu/Server/pull/3333)) @Kinglykrab 2023-05-07
-* Revert " ReloadQuests() on Zone::Init() to avoid cached global quests/plugins " ([#3333](https://github.com/EQEmu/Server/pull/3333)) @Akkadius 2023-05-08
-
-### Memory Leak
-
-* Fix large memory leak introduced in CalcItemBonuses ([#3331](https://github.com/EQEmu/Server/pull/3331)) @Akkadius 2023-05-07
-
-### Messages
-
-* Remove duplicate heal message for healing yourself ([#3329](https://github.com/EQEmu/Server/pull/3329)) @noudess 2023-05-03
-
-### Performance
-
-* Character bind is now bulk saved ([#3338](https://github.com/EQEmu/Server/pull/3338)) @Akkadius 2023-05-09
-* Character buffs now save in bulk ([#3336](https://github.com/EQEmu/Server/pull/3336)) @Akkadius 2023-05-09
-* Character pet bulk saving ([#3337](https://github.com/EQEmu/Server/pull/3337)) @Akkadius 2023-05-09
-* Character tribute is now bulk saved ([#3340](https://github.com/EQEmu/Server/pull/3340)) @Kinglykrab 2023-05-25
-* Mail key is now cached during player load ([#3339](https://github.com/EQEmu/Server/pull/3339)) @Akkadius 2023-05-09
-
-### Pets
-
-* Fix saving inconsistencies with pets ([#3375](https://github.com/EQEmu/Server/pull/3375)) @Akkadius 2023-05-25
-
-### Quest API
-
-* Add GetHateListClosest(), GetHateListClosestBot(), GetHateListClosestClient(), and GetHateListClosestNPC() methods/overloads to Perl/Lua ([#3359](https://github.com/EQEmu/Server/pull/3359)) @RekkasGit 2023-05-16
-* Add GetPet() to Perl ([#3309](https://github.com/EQEmu/Server/pull/3309)) @Kinglykrab 2023-05-08
-* Add Memorize and Scribe Spell Events to Perl/Lua ([#3363](https://github.com/EQEmu/Server/pull/3363)) @Kinglykrab 2023-05-25
-* Add zone data methods to Perl/Lua ([#3342](https://github.com/EQEmu/Server/pull/3342)) @Kinglykrab 2023-05-24
-* Cleanup The Darkened Sea Quest Methods Names ([#3369](https://github.com/EQEmu/Server/pull/3369)) @Kinglykrab 2023-05-21
-
-### Rules
-
-* Add World:MaximumQuestErrors Rule ([#3349](https://github.com/EQEmu/Server/pull/3349)) @Kinglykrab 2023-05-21
-* ResurrectionEffectBlock to prevent/allow/move buffs. ([#3288](https://github.com/EQEmu/Server/pull/3288)) @nytmyr 2023-05-08
-
-## [22.11.0] - 04/29/2023
-
-### Code
-
-* Add check for owner in quest::pausetimer() ([#3304](https://github.com/EQEmu/Server/pull/3304)) @Kinglykrab 2023-04-23
-* Add check for owner in quest::resumetimer() ([#3305](https://github.com/EQEmu/Server/pull/3305)) @Kinglykrab 2023-04-23
-* Add initiator/owner checks to various methods in questmgr.cpp ([#3306](https://github.com/EQEmu/Server/pull/3306)) @Kinglykrab 2023-04-23
-* Fix possible nullptr in quest::addloot() ([#3303](https://github.com/EQEmu/Server/pull/3303)) @Kinglykrab 2023-04-23
-* Remove GetClassHPFactor() from zone/client_mods.cpp and zone/client.h ([#3313](https://github.com/EQEmu/Server/pull/3313)) @Kinglykrab 2023-04-30
-* Remove GetClassHPFactor() from zone/merc.h ([#3314](https://github.com/EQEmu/Server/pull/3314)) @Kinglykrab 2023-04-30
-* Remove pDontCastBefore_casting_spell from zone/npc.h ([#3311](https://github.com/EQEmu/Server/pull/3311)) @Kinglykrab 2023-04-30
-* Remove unused code in zone/pets.cpp ([#3310](https://github.com/EQEmu/Server/pull/3310)) @Kinglykrab 2023-04-30
-* Remove unused methods in zone/bot.cpp and zone/bot.h ([#3315](https://github.com/EQEmu/Server/pull/3315)) @Kinglykrab 2023-04-30
-* Remove unused methods in zone/client.cpp and zone/client.h ([#3312](https://github.com/EQEmu/Server/pull/3312)) @Kinglykrab 2023-04-30
-* Remove unused variable in common/crash.cpp ([#3308](https://github.com/EQEmu/Server/pull/3308)) @Kinglykrab 2023-04-30
-* Use default ctor/dtor in oriented_bounding_box.h ([#3307](https://github.com/EQEmu/Server/pull/3307)) @Kinglykrab 2023-04-30
-* quest::createBot() unnecessary check against nullptr ([#3302](https://github.com/EQEmu/Server/pull/3302)) @Kinglykrab 2023-04-23
-* quest::setallskill() had always true condition. ([#3301](https://github.com/EQEmu/Server/pull/3301)) @Kinglykrab 2023-04-30
-
-### Crash
-
-* Fix UCS crash that occurs during log reloading ([#3324](https://github.com/EQEmu/Server/pull/3324)) @Akkadius 2023-04-30
-* Fix possible dereference of nullptr in Client::CalcHPRegen ([#3316](https://github.com/EQEmu/Server/pull/3316)) @Aeadoin 2023-04-23
-* Fix possible nullptr in Client::GetCharMaxLevelFromQGlobal() ([#3317](https://github.com/EQEmu/Server/pull/3317)) @Kinglykrab 2023-04-23
-
-### Discord
-
-* Add Discord webhook callback processing to world ([#3322](https://github.com/EQEmu/Server/pull/3322)) @Akkadius 2023-04-30
-
-### Fixes
-
-* Fix issue with NPCs no longer using some armor. ([#3318](https://github.com/EQEmu/Server/pull/3318)) @noudess 2023-04-24
-* Fix issue with spawning Mercs ([#3327](https://github.com/EQEmu/Server/pull/3327)) @Aeadoin 2023-04-29
-* Possible issues with SummonItem in Client::QuestReward() methods ([#3325](https://github.com/EQEmu/Server/pull/3325)) @Kinglykrab 2023-04-27
-
-### Maps
-
-* Update download with faster releases link ([#3321](https://github.com/EQEmu/Server/pull/3321)) @Akkadius 2023-04-30
-
-### Messages
-
-* Remove duplicate you have lost a level message ([#3323](https://github.com/EQEmu/Server/pull/3323)) @noudess 2023-04-25
-
-### Quest API
-
-* Add GetDefaultRaceSize() overloads to Perl/Lua ([#3320](https://github.com/EQEmu/Server/pull/3320)) @Kinglykrab 2023-04-30
-* Add HasSpellEffect() to Perl/Lua ([#3319](https://github.com/EQEmu/Server/pull/3319)) @Kinglykrab 2023-04-30
-
-## [22.10.0] - 04/22/2023
-
-### Backups
-
-* Fix database dump error reporting ([#3175](https://github.com/EQEmu/Server/pull/3175)) @Akkadius 2023-04-04
-
-### Bots
-
-* Cleanup GetBotTables() ([#3270](https://github.com/EQEmu/Server/pull/3270)) @Aeadoin 2023-04-06
-
-### Cleanuo
-
-* Only define row if we have results in Database::GetCharacterID() ([#3199](https://github.com/EQEmu/Server/pull/3199)) @Kinglykrab 2023-04-05
-
-### Code
-
-* Add missing breaks and returns in bonuses.cpp ([#3231](https://github.com/EQEmu/Server/pull/3231)) @Kinglykrab 2023-04-05
-* Breaks in wrong spot in cases in spell_effects.cpp ([#3297](https://github.com/EQEmu/Server/pull/3297)) @Kinglykrab 2023-04-22
-* Cleanup always true/false statements in shareddb.cpp ([#3189](https://github.com/EQEmu/Server/pull/3189)) @Kinglykrab 2023-04-05
-* Cleanup cheap-to-copy reference to use value instead in eq_stream_ident.cpp/eq_stream_ident.h ([#3209](https://github.com/EQEmu/Server/pull/3209)) @Kinglykrab 2023-04-05
-* Cleanup discord.cpp and discord_manager.cpp ([#3205](https://github.com/EQEmu/Server/pull/3205)) @Kinglykrab 2023-04-05
-* Cleanup duplicate conditions in negate bonuses in bonuses.cpp ([#3226](https://github.com/EQEmu/Server/pull/3226)) @Kinglykrab 2023-04-05
-* Cleanup item_instance.cpp always true statements and reassigning of same values ([#3187](https://github.com/EQEmu/Server/pull/3187)) @Kinglykrab 2023-04-05
-* Cleanup macros in features.h ([#3185](https://github.com/EQEmu/Server/pull/3185)) @Kinglykrab 2023-04-05
-* Cleanup string -> char* -> string conversions in bot_command.cpp ([#3252](https://github.com/EQEmu/Server/pull/3252)) @Kinglykrab 2023-04-05
-* Cleanup unnecessary condition in Client::SendAlternateCurrencyValue() ([#3266](https://github.com/EQEmu/Server/pull/3266)) @Kinglykrab 2023-04-05
-* Cleanup zone/zoning.cpp ([#3289](https://github.com/EQEmu/Server/pull/3289)) @Kinglykrab 2023-04-14
-* Combine similar cases in Client::InitInnates() ([#3260](https://github.com/EQEmu/Server/pull/3260)) @Kinglykrab 2023-04-05
-* Convert equipable_slot_list to std::vector from std::list in bot_command.cpp ([#3253](https://github.com/EQEmu/Server/pull/3253)) @Kinglykrab 2023-04-05
-* Delete embxs.cpp/embxs.h ([#3284](https://github.com/EQEmu/Server/pull/3284)) @Kinglykrab 2023-04-14
-* Delete unused strings in bot_command.cpp ([#3251](https://github.com/EQEmu/Server/pull/3251)) @Kinglykrab 2023-04-05
-* Fix GetLastName() length check in Client::SendWindow() ([#3263](https://github.com/EQEmu/Server/pull/3263)) @Kinglykrab 2023-04-05
-* Fix always false conditions in Client::IncStats() ([#3256](https://github.com/EQEmu/Server/pull/3256)) @Kinglykrab 2023-04-05
-* Fix check for !this in Client::SendHPUpdateMarquee() ([#3257](https://github.com/EQEmu/Server/pull/3257)) @Kinglykrab 2023-04-05
-* Fix filter condition in attack.cpp ([#3218](https://github.com/EQEmu/Server/pull/3218)) @Kinglykrab 2023-04-05
-* Fix ornamentation augment icons in inspect requests ([#3264](https://github.com/EQEmu/Server/pull/3264)) @Kinglykrab 2023-04-05
-* Fix possible nullptr inst in GetSharedBank() ([#3190](https://github.com/EQEmu/Server/pull/3190)) @Kinglykrab 2023-04-08
-* Fix possible overflows in Client::AddPlatinum() and Client::TakePlatinum() ([#3255](https://github.com/EQEmu/Server/pull/3255)) @Kinglykrab 2023-04-05
-* Fix shared_tasks.cpp/shared_tasks.cpp variable named same as class member ([#3192](https://github.com/EQEmu/Server/pull/3192)) @Kinglykrab 2023-04-05
-* Fix skill_used being used as boolean in Mob::CommonDamage() ([#3220](https://github.com/EQEmu/Server/pull/3220)) @Kinglykrab 2023-04-05
-* Identical conditions right beside each other in aa.cpp ([#3213](https://github.com/EQEmu/Server/pull/3213)) @Kinglykrab 2023-04-05
-* Move unreachable code in ApplySpellsBonuses() ([#3229](https://github.com/EQEmu/Server/pull/3229)) @Kinglykrab 2023-04-05
-* Move variable definition to more relevant scope in DatabaseDumpService::Dump() ([#3200](https://github.com/EQEmu/Server/pull/3200)) @Kinglykrab 2023-04-05
-* Multiple cases with same outcome in GetDiscordPayloadFromEvent() ([#3184](https://github.com/EQEmu/Server/pull/3184)) @Kinglykrab 2023-04-05
-* Remove ExportVarComplex() from embparser.cpp/embparser.h ([#3282](https://github.com/EQEmu/Server/pull/3282)) @Kinglykrab 2023-04-14
-* Remove GetQGlobal() from qglobals.cpp/qglobals.h ([#3285](https://github.com/EQEmu/Server/pull/3285)) @Kinglykrab 2023-04-14
-* Remove IsFullHP from mob.cpp/mob.h ([#3277](https://github.com/EQEmu/Server/pull/3277)) @Kinglykrab 2023-04-14
-* Remove IsMeleeDmg() from skills.cpp/skills.h ([#3279](https://github.com/EQEmu/Server/pull/3279)) @Kinglykrab 2023-04-14
-* Remove _GetMovementSpeed() from mob.h ([#3276](https://github.com/EQEmu/Server/pull/3276)) @Kinglykrab 2023-04-14
-* Remove always true condition in Strings::Commify() ([#3193](https://github.com/EQEmu/Server/pull/3193)) @Kinglykrab 2023-04-05
-* Remove always true conditions and unreachable code in Client::SendMercPersonalInfo() ([#3258](https://github.com/EQEmu/Server/pull/3258)) @Kinglykrab 2023-04-05
-* Remove always true statement in say_link.cpp ([#3188](https://github.com/EQEmu/Server/pull/3188)) @Kinglykrab 2023-04-05
-* Remove always true statements in task_client_state.cpp ([#3292](https://github.com/EQEmu/Server/pull/3292)) @Kinglykrab 2023-04-14
-* Remove always true/false conditions from bot.cpp ([#3237](https://github.com/EQEmu/Server/pull/3237)) @Kinglykrab 2023-04-05
-* Remove bool return from GetSharedPlatinum() ([#3191](https://github.com/EQEmu/Server/pull/3191)) @Kinglykrab 2023-04-05
-* Remove extra assignment of current_endurance in Client ctor ([#3261](https://github.com/EQEmu/Server/pull/3261)) @Kinglykrab 2023-04-05
-* Remove extraneous check for NegateAttacks in SE_NegateAttacks ([#3228](https://github.com/EQEmu/Server/pull/3228)) @Kinglykrab 2023-04-05
-* Remove extraneous parentheses around math in Mob::ApplySpellsBonuses() ([#3227](https://github.com/EQEmu/Server/pull/3227)) @Kinglykrab 2023-04-05
-* Remove getd(), geti(), InUse(), lasterr(), my_get_sv(), and VarExists() in embperl.cpp/embperl.h ([#3283](https://github.com/EQEmu/Server/pull/3283)) @Kinglykrab 2023-04-15
-* Remove item_timers from questmgr.cpp/questmgr.h ([#3286](https://github.com/EQEmu/Server/pull/3286)) @Kinglykrab 2023-04-14
-* Remove pendinggroup from mob.h ([#3278](https://github.com/EQEmu/Server/pull/3278)) @Kinglykrab 2023-04-14
-* Remove position_same_update_count from client.cpp/client.h ([#3280](https://github.com/EQEmu/Server/pull/3280)) @Kinglykrab 2023-04-14
-* Remove unnecessary break in while loop in Mob::AddToHateList() ([#3219](https://github.com/EQEmu/Server/pull/3219)) @Kinglykrab 2023-04-05
-* Remove unnecessary check for IsStackable() in DeleteItem() ([#3186](https://github.com/EQEmu/Server/pull/3186)) @Kinglykrab 2023-04-05
-* Remove unnecessary condition and cleanup variable name in tasks.cpp ([#3293](https://github.com/EQEmu/Server/pull/3293)) @Kinglykrab 2023-04-14
-* Remove unnecessary conditions in Client::Consume() ([#3265](https://github.com/EQEmu/Server/pull/3265)) @Kinglykrab 2023-04-05
-* Remove unnecessary conditions in Client::FilteredMessageCheck() ([#3262](https://github.com/EQEmu/Server/pull/3262)) @Kinglykrab 2023-04-05
-* Remove unnecessary conditions in Client::SendFactionMessage() ([#3267](https://github.com/EQEmu/Server/pull/3267)) @Kinglykrab 2023-04-05
-* Remove unnecessary setting of reuse variable in Bot::DoClassAttacks() ([#3233](https://github.com/EQEmu/Server/pull/3233)) @Kinglykrab 2023-04-05
-* Remove unused SetConfigFile in common/eqemu_config.h ([#3208](https://github.com/EQEmu/Server/pull/3208)) @Kinglykrab 2023-04-05
-* Remove unused code in eq_packet.cpp/eq_packet.h ([#3183](https://github.com/EQEmu/Server/pull/3183)) @Kinglykrab 2023-04-05
-* Remove unused ctor and use default dtor in xtargetautohaters.h ([#3290](https://github.com/EQEmu/Server/pull/3290)) @Kinglykrab 2023-04-14
-* Remove unused macros in common/types.h ([#3194](https://github.com/EQEmu/Server/pull/3194)) @Kinglykrab 2023-04-05
-* Remove unused variable in Database::CopyCharacter() ([#3197](https://github.com/EQEmu/Server/pull/3197)) @Kinglykrab 2023-04-05
-* Remove unused variables and use reference in task_manager.cpp ([#3291](https://github.com/EQEmu/Server/pull/3291)) @Kinglykrab 2023-04-14
-* SE_AttackSpeed3 effect_value is always less than 0 ([#3222](https://github.com/EQEmu/Server/pull/3222)) @Kinglykrab 2023-04-05
-* SE_StrikeThrough and SE_StrikeThrough2 are the same in bonuses.cpp ([#3223](https://github.com/EQEmu/Server/pull/3223)) @Kinglykrab 2023-04-05
-* Set bonuses to use spell ID instead of boolean ([#3230](https://github.com/EQEmu/Server/pull/3230)) @Kinglykrab 2023-04-05
-* Use .clear() and .empty() instead of comparing to empty string or setting to empty string in CheckDatabaseConvertPPBlob() ([#3201](https://github.com/EQEmu/Server/pull/3201)) @Kinglykrab 2023-04-05
-* Use .clear() instead of setting string to empty in eqemu_command_handler.cpp ([#3195](https://github.com/EQEmu/Server/pull/3195)) @Kinglykrab 2023-04-05
-* Use .empty() in Client::ScribeSpells() and Client::LearnDisciplines() ([#3259](https://github.com/EQEmu/Server/pull/3259)) @Kinglykrab 2023-04-05
-* Use constant reference and check for empty string properly in dbcore.cpp ([#3203](https://github.com/EQEmu/Server/pull/3203)) @Kinglykrab 2023-04-05
-* Use default ctor instead of an empty ctor. ([#3206](https://github.com/EQEmu/Server/pull/3206)) @Kinglykrab 2023-04-05
-* Use default dtor instead of empty dtor for EQTime in eqtime.cpp/eqtime.h ([#3210](https://github.com/EQEmu/Server/pull/3210)) @Kinglykrab 2023-04-05
-* Use variable for c->GetTarget() instead of calling multiple times in bot_command.cpp ([#3254](https://github.com/EQEmu/Server/pull/3254)) @Kinglykrab 2023-04-05
-* Use variable for character instead of a loop ([#3268](https://github.com/EQEmu/Server/pull/3268)) @Kinglykrab 2023-04-05
-* Utilize .empty() instead of checking for an empty string in Database::ReserveName() ([#3198](https://github.com/EQEmu/Server/pull/3198)) @Kinglykrab 2023-04-05
-* Utilize IsTaunting(), SetPetPower(), SetPetType(), and SetTaunting() ([#3275](https://github.com/EQEmu/Server/pull/3275)) @Kinglykrab 2023-04-15
-* Validate for nullptrs in bot.cpp ([#3232](https://github.com/EQEmu/Server/pull/3232)) @Kinglykrab 2023-04-05
-* other is always defined in these cases in attack.cpp ([#3217](https://github.com/EQEmu/Server/pull/3217)) @Kinglykrab 2023-04-05
-* results variable is assigned but never used in SaveCharacterCreate() ([#3180](https://github.com/EQEmu/Server/pull/3180)) @Kinglykrab 2023-04-05
-
-### Crash
-
-* Add additional raid integrity checks on Bot Spawn. ([#3295](https://github.com/EQEmu/Server/pull/3295)) @Aeadoin 2023-04-16
-* Fix crash with uninitialized item instance, and Bot timeout ([#3296](https://github.com/EQEmu/Server/pull/3296)) @Aeadoin 2023-04-15
-* Resolve crash due to uninitialized pointer. ([#3271](https://github.com/EQEmu/Server/pull/3271)) @Aeadoin 2023-04-08
-
-### Feature
-
-* Make ornamentations work with any augment type ([#3281](https://github.com/EQEmu/Server/pull/3281)) @Kinglykrab 2023-04-16
-
-### Fixes
-
-* Camping was causing player to leave raid, causing unexpected behavior ([#3299](https://github.com/EQEmu/Server/pull/3299)) @Aeadoin 2023-04-22
-* Resolve loading of inventory ([#3272](https://github.com/EQEmu/Server/pull/3272)) @Aeadoin 2023-04-08
-
-### Quest API
-
-* Add ApplySpellRaid() and SetSpellDurationRaid() to Bots in Perl/Lua ([#3274](https://github.com/EQEmu/Server/pull/3274)) @Kinglykrab 2023-04-09
-* Add GetBuffSpellIDs() to Perl/Lua ([#3273](https://github.com/EQEmu/Server/pull/3273)) @Kinglykrab 2023-04-09
-* Fix LDoN Methods in Perl/Lua ([#3287](https://github.com/EQEmu/Server/pull/3287)) @Kinglykrab 2023-04-10
-
-### Rules
-
-* Optional summoning when already in melee range ([#3204](https://github.com/EQEmu/Server/pull/3204)) @trentdm 2023-04-08
-
-### Telnet
-
-* Telnet encoding fix ([#3269](https://github.com/EQEmu/Server/pull/3269)) @Akkadius 2023-04-05
-
-## [22.9.1] - 04/03/2023 
-
-### Code
-
-* Add client pointer validation to Zone::GetClosestZonePoint() ([#3173](https://github.com/EQEmu/Server/pull/3173)) @Kinglykrab 2023-04-01
-* Change level to bot_level in Bot::DoClassAttacks() to not overlap member variable ([#3239](https://github.com/EQEmu/Server/pull/3239)) @Kinglykrab 2023-04-03
-* Cleanup unnecessary string -> char* -> string conversions in eqemu_config.cpp ([#3207](https://github.com/EQEmu/Server/pull/3207)) @Kinglykrab 2023-04-03
-* Cleanup uses of insert/push_back when a temp object is used. ([#3170](https://github.com/EQEmu/Server/pull/3170)) @Aeadoin 2023-04-03
-* Cleanup variable names in Bot::AddSpellToBotList() ([#3248](https://github.com/EQEmu/Server/pull/3248)) @Kinglykrab 2023-04-03
-* Explicitly cast to float for more precision in Bot::GenerateBastHitPoints() ([#3238](https://github.com/EQEmu/Server/pull/3238)) @Kinglykrab 2023-04-03
-* Fix SEResist array settings duplicate code ([#3225](https://github.com/EQEmu/Server/pull/3225)) @Kinglykrab 2023-04-03
-* Fix loop and code duplication for SE_ProcOnKillShot ([#3224](https://github.com/EQEmu/Server/pull/3224)) @Kinglykrab 2023-04-03
-* Fix possible dereferencing of invalid iterator in constants ([#3181](https://github.com/EQEmu/Server/pull/3181)) @Kinglykrab 2023-04-03
-* Fix typo where itembonuses should have been used instead of spellbonuses ([#3221](https://github.com/EQEmu/Server/pull/3221)) @Kinglykrab 2023-04-03
-* Further bot.cpp nullptr checks ([#3240](https://github.com/EQEmu/Server/pull/3240)) @Kinglykrab 2023-04-03
-* Move cases in Bot::AICastSpell() ([#3247](https://github.com/EQEmu/Server/pull/3247)) @Kinglykrab 2023-04-03
-* Multiple cases same outcome and set skip variable to same value ([#3216](https://github.com/EQEmu/Server/pull/3216)) @Kinglykrab 2023-04-03
-* Multiple cases with same outcome in GetGMSayColorFromCategory() ([#3182](https://github.com/EQEmu/Server/pull/3182)) @Kinglykrab 2023-04-03
-* Remove extraneous loottable_id setting in WakeTheDead in aa.cpp ([#3215](https://github.com/EQEmu/Server/pull/3215)) @Kinglykrab 2023-04-03
-* Remove possible dereferenced nullptrs in bot.cpp ([#3241](https://github.com/EQEmu/Server/pull/3241)) @Kinglykrab 2023-04-03
-* Remove unnecessary >= 0 checks for procs in botspellsai.cpp ([#3242](https://github.com/EQEmu/Server/pull/3242)) @Kinglykrab 2023-04-03
-* Remove unnecessary botCaster check in Bot::GetDebuffBotSpell() ([#3246](https://github.com/EQEmu/Server/pull/3246)) @Kinglykrab 2023-04-03
-* Remove unnecessary group validation in Bot::Death() ([#3235](https://github.com/EQEmu/Server/pull/3235)) @Kinglykrab 2023-04-03
-* Remove unnecessary hpr checks in Bot::BotCastHeal() ([#3245](https://github.com/EQEmu/Server/pull/3245)) @Kinglykrab 2023-04-03
-* Remove unnecessary setting of spell_type_index in Bot::GetChanceToCastBySpellType() ([#3243](https://github.com/EQEmu/Server/pull/3243)) @Kinglykrab 2023-04-03
-* Remove unnecessary skill_to_use check in Bot::DoClassAttacks() ([#3236](https://github.com/EQEmu/Server/pull/3236)) @Kinglykrab 2023-04-03
-* Remove unnecessary spell_list validation check in botspellsai.cpp ([#3244](https://github.com/EQEmu/Server/pull/3244)) @Kinglykrab 2023-04-03
-* Remove unnecessary validation check in Zone::ClearBlockedSpells() ([#3172](https://github.com/EQEmu/Server/pull/3172)) @Kinglykrab 2023-04-01
-* Remove unused Includes under zone files ([#3162](https://github.com/EQEmu/Server/pull/3162)) @Aeadoin 2023-04-02
-* Remove unused query variable in Database::DeleteInstance() ([#3202](https://github.com/EQEmu/Server/pull/3202)) @Kinglykrab 2023-04-03
-* Unconditional return in for loop in GetRaidByCharID() ([#3179](https://github.com/EQEmu/Server/pull/3179)) @Kinglykrab 2023-04-03
-* Use a constant reference for content_flags in SetContentFlags() ([#3196](https://github.com/EQEmu/Server/pull/3196)) @Kinglykrab 2023-04-03
-* Wake The Dead argument was named the same as a member variable in Mob ([#3214](https://github.com/EQEmu/Server/pull/3214)) @Kinglykrab 2023-04-03
-* gid is assigned 2 values simultaneously in bot.cpp ([#3234](https://github.com/EQEmu/Server/pull/3234)) @Kinglykrab 2023-04-03
-* summon_count > MAX_SWARM_PETS  is always false in aa.cpp ([#3212](https://github.com/EQEmu/Server/pull/3212)) @Kinglykrab 2023-04-03
-
-### Fixes
-
-* Correct Forward Declaration compilation warning ([#3176](https://github.com/EQEmu/Server/pull/3176)) @Aeadoin 2023-04-02
-* Fix issue with Bot Raid invites not working. ([#3249](https://github.com/EQEmu/Server/pull/3249)) @Aeadoin 2023-04-03
-
-### Performance
-
-* Change to use Pass by reference where valid. ([#3163](https://github.com/EQEmu/Server/pull/3163)) @Aeadoin 2023-04-02
-
-## [22.9.0] - 04/01/2023 
-
-### Bots
-
-* Remove Bot Groups Functionality ([#3165](https://github.com/EQEmu/Server/pull/3165)) @Aeadoin 2023-04-01
-
-### Code
-
-* Cleanup excessive type casting: string -> char * -> string ([#3169](https://github.com/EQEmu/Server/pull/3169)) @Aeadoin 2023-04-01
-
-### Crash
-
-* Add Checks for valid pointers or fix existing. ([#3164](https://github.com/EQEmu/Server/pull/3164)) @Aeadoin 2023-04-01
-* Fix out of bound arrays, other potential crashes ([#3166](https://github.com/EQEmu/Server/pull/3166)) @Aeadoin 2023-04-01
-
-### Fixes
-
-* Correct SE_SlayUndead & SE_HeadShotLevel limit Value when applied. ([#3171](https://github.com/EQEmu/Server/pull/3171)) @Aeadoin 2023-04-01
-* Prevent VerifyGroup from setting OOZ membername to Null character. ([#3168](https://github.com/EQEmu/Server/pull/3168)) @Aeadoin 2023-04-01
-
-### Quest API
-
-* Add missing Luabind definitions to lua_general.cpp ([#3167](https://github.com/EQEmu/Server/pull/3167)) @Kinglykrab 2023-04-01
-
-## [22.8.2] - 03/30/2023 
-
-### Code
-
-* "equipped" not "equiped", "dual" not "duel". ([#3149](https://github.com/EQEmu/Server/pull/3149)) @Kinglykrab 2023-03-27
-
-### Crash
-
-* Add Checks for out of bounds & dereferencing nullptrs ([#3151](https://github.com/EQEmu/Server/pull/3151)) @Aeadoin 2023-03-28
-
-### Fixes
-
-* Check Rule "Bots Enabled" to prevent bot database calls on connect ([#3154](https://github.com/EQEmu/Server/pull/3154)) @Aeadoin 2023-03-29
-* Correct logic checks for Bot rule AllowOwnerOptionAltCombat ([#3158](https://github.com/EQEmu/Server/pull/3158)) @Aeadoin 2023-03-30
-* Fix an issue with EVENT_DISCONNECT not firing on regular /camp ([#3153](https://github.com/EQEmu/Server/pull/3153)) @Kinglykrab 2023-03-28
-* Fix bot_raid_members.sql for MYSQL. ([#3155](https://github.com/EQEmu/Server/pull/3155)) @Aeadoin 2023-03-28
-* Fix for OOZ Group updates when removing/inviting Bots ([#3159](https://github.com/EQEmu/Server/pull/3159)) @Aeadoin 2023-03-30
-* Fix issues with Lua tables not starting at index 1 ([#3160](https://github.com/EQEmu/Server/pull/3160)) @Kinglykrab 2023-03-30
-* Fix strcpy-param-overlap ([#3157](https://github.com/EQEmu/Server/pull/3157)) @Aeadoin 2023-03-29
-
-### Rules
-
-* Remove Guild Bank Zone ID Rule ([#3156](https://github.com/EQEmu/Server/pull/3156)) @Kinglykrab 2023-03-29
-
-## [22.8.1] - 03/27/2023 
-
-### Fixes
-
-* Fix for NPCs having spells interrupted. ([#3150](https://github.com/EQEmu/Server/pull/3150)) @Aeadoin 2023-03-27
-
-## [22.8.0] - 03/25/2023 
-
-### Code
-
-* Cleanup Strings::ToInt uses. ([#3142](https://github.com/EQEmu/Server/pull/3142)) @Aeadoin 2023-03-26
-* Remove extern bool Critical ([#3146](https://github.com/EQEmu/Server/pull/3146)) @Kinglykrab 2023-03-25
-
-### Crash
-
-* Fix for crash in Raid::QueuePacket ([#3145](https://github.com/EQEmu/Server/pull/3145)) @Aeadoin 2023-03-25
-
-### Feature
-
-* Add support for -1 extradmgskill to allow all skills to be scaled. ([#3136](https://github.com/EQEmu/Server/pull/3136)) @Kinglykrab 2023-03-26
-
-### Fixes
-
-* Fix for Items looted from corpses. ([#3147](https://github.com/EQEmu/Server/pull/3147)) @Aeadoin 2023-03-26
-* Fix for SQL Query in npc_scale_global_base ([#3144](https://github.com/EQEmu/Server/pull/3144)) @Aeadoin 2023-03-26
-
-## [22.7.0] - 03/24/2023 
-
-### Bots
-
-* Place BOT_COMMAND_CHAR inside messages ([#3027](https://github.com/EQEmu/Server/pull/3027)) @trentdm 2023-03-05
-* Prevent interrupt spam when OOM ([#3011](https://github.com/EQEmu/Server/pull/3011)) @nytmyr 2023-03-07
-
-### Code
-
-* Cleaning up Raid.cpp ([#3125](https://github.com/EQEmu/Server/pull/3125)) @Aeadoin 2023-03-20
-* Cleanup unused methods and variables in world/main.cpp and world/main.h ([#3105](https://github.com/EQEmu/Server/pull/3105)) @Kinglykrab 2023-03-17
-* Cleanup uses of Strings::ToInt to match correct type. ([#3054](https://github.com/EQEmu/Server/pull/3054)) @Aeadoin 2023-03-22
-* Delete deprecated/perlxs folder ([#3110](https://github.com/EQEmu/Server/pull/3110)) @Kinglykrab 2023-03-17
-* Delete queues.h ([#3089](https://github.com/EQEmu/Server/pull/3089)) @Kinglykrab 2023-03-17
-* Delete world/console.old.cpp ([#3099](https://github.com/EQEmu/Server/pull/3099)) @Kinglykrab 2023-03-17
-* Delete zone_numbers.h ([#3129](https://github.com/EQEmu/Server/pull/3129)) @Kinglykrab 2023-03-20
-* Remove AllConnected(), CanUpdate(), and SendInfo() from login_server_list.cpp and login_server_list.h ([#3104](https://github.com/EQEmu/Server/pull/3104)) @Kinglykrab 2023-03-17
-* Remove CLIENT_TIMEOUT from world/client.h and zone/client.h ([#3071](https://github.com/EQEmu/Server/pull/3071)) @Kinglykrab 2023-03-17
-* Remove ChangeHP() from mob.h ([#3128](https://github.com/EQEmu/Server/pull/3128)) @Kinglykrab 2023-03-19
-* Remove CheckAuth(), SetOnline(), and pMD5Pass from cliententry.h ([#3095](https://github.com/EQEmu/Server/pull/3095)) @Kinglykrab 2023-03-17
-* Remove CommandRequirement() from zonedb.h ([#3094](https://github.com/EQEmu/Server/pull/3094)) @Kinglykrab 2023-03-17
-* Remove CountZones() from launcher_link.h ([#3100](https://github.com/EQEmu/Server/pull/3100)) @Kinglykrab 2023-03-17
-* Remove DBInitVars() and HandleMysqlError() from queryserv/database.h ([#3114](https://github.com/EQEmu/Server/pull/3114)) @Kinglykrab 2023-03-17
-* Remove DBInitVars(), HandleMysqlError(), and IsChatChannelInDB() in ucs/database.h ([#3113](https://github.com/EQEmu/Server/pull/3113)) @Kinglykrab 2023-03-17
-* Remove DisableStats(), EnableStats(), DisableLoginserver(), and EnableLoginserver() from world_config.h ([#3107](https://github.com/EQEmu/Server/pull/3107)) @Kinglykrab 2023-03-17
-* Remove DoBuffWearOffEffect() from mob.h ([#3062](https://github.com/EQEmu/Server/pull/3062)) @Kinglykrab 2023-03-17
-* Remove FindByName(charname) from clientlist.h ([#3096](https://github.com/EQEmu/Server/pull/3096)) @Kinglykrab 2023-03-17
-* Remove FindCLEByLSID(), GetCLE(), GetCLEIPCount(), and RemoveCLEByLSID() from clientlist.h ([#3098](https://github.com/EQEmu/Server/pull/3098)) @Kinglykrab 2023-03-17
-* Remove FindPatch() from struct_category.cpp and struct_category.h ([#3130](https://github.com/EQEmu/Server/pull/3130)) @Kinglykrab 2023-03-20
-* Remove FlushLootStats() from npc.h ([#3079](https://github.com/EQEmu/Server/pull/3079)) @Kinglykrab 2023-03-17
-* Remove GetAILevel() from npc.h ([#3080](https://github.com/EQEmu/Server/pull/3080)) @Kinglykrab 2023-03-17
-* Remove GetDestination() from doors.h ([#3078](https://github.com/EQEmu/Server/pull/3078)) @Kinglykrab 2023-03-17
-* Remove GetServerByAddress() from server_manager.h ([#3119](https://github.com/EQEmu/Server/pull/3119)) @Kinglykrab 2023-03-17
-* Remove GetStartCount() and InitStartTimer() from zone_launch.cpp and zone_launch.h ([#3121](https://github.com/EQEmu/Server/pull/3121)) @Kinglykrab 2023-03-17
-* Remove GetTransformation() and GetInvertedTransformation() from oriented_bounding_box.h ([#3084](https://github.com/EQEmu/Server/pull/3084)) @Kinglykrab 2023-03-17
-* Remove IsAffectedByBuff() ([#3068](https://github.com/EQEmu/Server/pull/3068)) @Kinglykrab 2023-03-17
-* Remove IsConnected() from loginserver/database.h ([#3117](https://github.com/EQEmu/Server/pull/3117)) @Kinglykrab 2023-03-17
-* Remove IsOrigin(glm::vec2) from position.h ([#3088](https://github.com/EQEmu/Server/pull/3088)) @Kinglykrab 2023-03-17
-* Remove MakeGuildMembers() from wguild_mgr.h ([#3106](https://github.com/EQEmu/Server/pull/3106)) @Kinglykrab 2023-03-17
-* Remove PlayerLogin_Struct from login_types.h ([#3118](https://github.com/EQEmu/Server/pull/3118)) @Kinglykrab 2023-03-17
-* Remove RemoveSpawnGroup() from spawngroup.h ([#3090](https://github.com/EQEmu/Server/pull/3090)) @Kinglykrab 2023-03-17
-* Remove SendGuildPacket() from clientlist.cpp, clientlist.h, and wguild_mgr.cpp ([#3097](https://github.com/EQEmu/Server/pull/3097)) @Kinglykrab 2023-03-17
-* Remove SetConnection() from loginserver/world_server.h ([#3120](https://github.com/EQEmu/Server/pull/3120)) @Kinglykrab 2023-03-17
-* Remove SetDBID() from object.h ([#3082](https://github.com/EQEmu/Server/pull/3082)) @Kinglykrab 2023-03-17
-* Remove SetSentTime2 in petitions.h ([#3086](https://github.com/EQEmu/Server/pull/3086)) @Kinglykrab 2023-03-17
-* Remove StoreCharacter() from worlddb.h ([#3108](https://github.com/EQEmu/Server/pull/3108)) @Kinglykrab 2023-03-17
-* Remove UpdateLoginserverWorldAdminAccountPasswordById() from account_management.cpp ([#3115](https://github.com/EQEmu/Server/pull/3115)) @Kinglykrab 2023-03-17
-* Remove _baseBotStance from bot.h ([#3076](https://github.com/EQEmu/Server/pull/3076)) @Kinglykrab 2023-03-17
-* Remove _botRole from bot.h ([#3075](https://github.com/EQEmu/Server/pull/3075)) @Kinglykrab 2023-03-17
-* Remove _previousTarget from bot.h ([#3074](https://github.com/EQEmu/Server/pull/3074)) @Kinglykrab 2023-03-17
-* Remove authenticated from launcher_link.cpp and launcher_link.h ([#3101](https://github.com/EQEmu/Server/pull/3101)) @Kinglykrab 2023-03-17
-* Remove can_corpse_be_rezzed from corpse.h ([#3077](https://github.com/EQEmu/Server/pull/3077)) @Kinglykrab 2023-03-17
-* Remove casting_spell_type from mob.h ([#3064](https://github.com/EQEmu/Server/pull/3064)) @Kinglykrab 2023-03-17
-* Remove class EQStream from client.h ([#3070](https://github.com/EQEmu/Server/pull/3070)) @Kinglykrab 2023-03-17
-* Remove current_buff_count ([#3067](https://github.com/EQEmu/Server/pull/3067)) @Kinglykrab 2023-03-17
-* Remove firstlogin and realfirstlogin from world/client.h ([#3072](https://github.com/EQEmu/Server/pull/3072)) @Kinglykrab 2023-03-17
-* Remove fixedZ from mob.h ([#3065](https://github.com/EQEmu/Server/pull/3065)) @Kinglykrab 2023-03-17
-* Remove inWater from mob.h ([#3069](https://github.com/EQEmu/Server/pull/3069)) @Kinglykrab 2023-03-17
-* Remove is_authenticatd, LSShutDownUpdate(), and SetInstanceID() from zoneserver.h ([#3109](https://github.com/EQEmu/Server/pull/3109)) @Kinglykrab 2023-03-17
-* Remove last_insert_id from petitions.h ([#3087](https://github.com/EQEmu/Server/pull/3087)) @Kinglykrab 2023-03-17
-* Remove last_max_hp from mob.h ([#3063](https://github.com/EQEmu/Server/pull/3063)) @Kinglykrab 2023-03-17
-* Remove m_inuse, m_z, and m_heading from object.h ([#3083](https://github.com/EQEmu/Server/pull/3083)) @Kinglykrab 2023-03-17
-* Remove npc_ai.cpp/npc_ai.cpp ([#3081](https://github.com/EQEmu/Server/pull/3081)) @Kinglykrab 2023-03-17
-* Remove ownHiddenTrigger from trap.cpp and trap.h ([#3092](https://github.com/EQEmu/Server/pull/3092)) @Kinglykrab 2023-03-17
-* Remove perlparser.h ([#3085](https://github.com/EQEmu/Server/pull/3085)) @Kinglykrab 2023-03-17
-* Remove unused AbilityTimer variable in client.h ([#3035](https://github.com/EQEmu/Server/pull/3035)) @Kinglykrab 2023-03-05
-* Remove unused BotAA struct in bot_structs.h ([#3038](https://github.com/EQEmu/Server/pull/3038)) @Kinglykrab 2023-03-05
-* Remove unused HandleUpdateTasksOnKill in client.h ([#3032](https://github.com/EQEmu/Server/pull/3032)) @Kinglykrab 2023-03-05
-* Remove unused SaveBackup in client.h ([#3030](https://github.com/EQEmu/Server/pull/3030)) @Kinglykrab 2023-03-05
-* Remove unused ^evacuate and ^succor subcommands from bot_command.h ([#3039](https://github.com/EQEmu/Server/pull/3039)) @Kinglykrab 2023-03-05
-* Remove unused bot structs in bot_structs.h ([#3037](https://github.com/EQEmu/Server/pull/3037)) @Kinglykrab 2023-03-05
-* Remove unused client queued work variable in client.cpp/client.h ([#3034](https://github.com/EQEmu/Server/pull/3034)) @Kinglykrab 2023-03-05
-* Remove unused command variables in client.cpp ([#3031](https://github.com/EQEmu/Server/pull/3031)) @Kinglykrab 2023-03-05
-* Remove unused lua_hate_entry.cpp ([#3057](https://github.com/EQEmu/Server/pull/3057)) @Kinglykrab 2023-03-12
-* Remove unused methods in eql_config.cpp, eql_config.h, launcher_list.cpp, and launcher_list.h ([#3103](https://github.com/EQEmu/Server/pull/3103)) @Kinglykrab 2023-03-17
-* Remove unused methods in loginserver/client.h ([#3116](https://github.com/EQEmu/Server/pull/3116)) @Kinglykrab 2023-03-17
-* Remove unused player update variables in client.cpp/client.h ([#3033](https://github.com/EQEmu/Server/pull/3033)) @Kinglykrab 2023-03-05
-* Utilize GetPlayerState() in mob methods ([#3066](https://github.com/EQEmu/Server/pull/3066)) @Kinglykrab 2023-03-17
-* Utilize GetScheduler() in zone/worldserver.cpp ([#3093](https://github.com/EQEmu/Server/pull/3093)) @Kinglykrab 2023-03-17
-* Utilize SetFilter in client.cpp ([#3036](https://github.com/EQEmu/Server/pull/3036)) @Kinglykrab 2023-03-05
-* Utilize SetHiddenTrigger in trap.cpp ([#3091](https://github.com/EQEmu/Server/pull/3091)) @Kinglykrab 2023-03-17
-* remove _botOrderAttack from bot.h ([#3073](https://github.com/EQEmu/Server/pull/3073)) @Kinglykrab 2023-03-17
-
-### Commands
-
-* Cleanup #haste Command ([#3042](https://github.com/EQEmu/Server/pull/3042)) @Kinglykrab 2023-03-06
-* Cleanup #hideme Command ([#3043](https://github.com/EQEmu/Server/pull/3043)) @Kinglykrab 2023-03-06
-* Cleanup #interrupt Command ([#3044](https://github.com/EQEmu/Server/pull/3044)) @Kinglykrab 2023-03-06
-* Cleanup #level Command ([#3045](https://github.com/EQEmu/Server/pull/3045)) @Kinglykrab 2023-03-06
-* Cleanup #picklock Command ([#3046](https://github.com/EQEmu/Server/pull/3046)) @Kinglykrab 2023-03-06
-* Cleanup #resetaa and #resetaa_timer ([#3047](https://github.com/EQEmu/Server/pull/3047)) @Kinglykrab 2023-03-06
-* Cleanup #wc Command ([#3049](https://github.com/EQEmu/Server/pull/3049)) @Kinglykrab 2023-03-06
-* Remove #equipitem Command ([#3040](https://github.com/EQEmu/Server/pull/3040)) @Kinglykrab 2023-03-06
-
-### Console
-
-* Add IS_TTY to force terminal coloring output ([#3021](https://github.com/EQEmu/Server/pull/3021)) @Akkadius 2023-03-04
-
-### Crash
-
-* Fix dangling Group member pointers for Bots. ([#3134](https://github.com/EQEmu/Server/pull/3134)) @Aeadoin 2023-03-21
-* Fixes Crash when Zoning with XTarget when Bots are in group. ([#3126](https://github.com/EQEmu/Server/pull/3126)) @Aeadoin 2023-03-19
-
-### Feature
-
-* Add Basic Bot Raiding Functionality ([#2782](https://github.com/EQEmu/Server/pull/2782)) @neckkola 2023-03-17
-* Add Data Bucket support for scaling of Heroic Stats. ([#3058](https://github.com/EQEmu/Server/pull/3058)) @Aeadoin 2023-03-24
-* Add Item Extra Skill Damage Percent Modifier ([#3127](https://github.com/EQEmu/Server/pull/3127)) @Kinglykrab 2023-03-19
-
-### Fixes
-
-* Add Avoidance and HP Regen Per Second too NPC Scaling. ([#3050](https://github.com/EQEmu/Server/pull/3050)) @Aeadoin 2023-03-09
-* Add Heroic Strikethrough & HP Regen Per Second to GM Entity Info ([#3055](https://github.com/EQEmu/Server/pull/3055)) @Aeadoin 2023-03-12
-* Add Heroic Strikethrough to NPC Scaling ([#3028](https://github.com/EQEmu/Server/pull/3028)) @Kinglykrab 2023-03-06
-* Change SPA 193 Weapon Damage to allow values over 65,535 ([#3138](https://github.com/EQEmu/Server/pull/3138)) @Aeadoin 2023-03-23
-* Checkmarks and X characters in popup messages ([#3041](https://github.com/EQEmu/Server/pull/3041)) @Kinglykrab 2023-03-06
-* Cursor Coin Upon Death ([#3020](https://github.com/EQEmu/Server/pull/3020)) @cybernine186 2023-03-04
-* Ensure synchronization of pet taunt state with UI ([#3025](https://github.com/EQEmu/Server/pull/3025)) @catapultam-habeo 2023-03-04
-* Fix Bard Bot Casting ([#3122](https://github.com/EQEmu/Server/pull/3122)) @Aeadoin 2023-03-17
-* Fix Discovered Items with Alternate Currency and LDoN Adventure Merchants ([#3026](https://github.com/EQEmu/Server/pull/3026)) @Kinglykrab 2023-03-04
-* Fix Heal Scale and Spell Scale in NPC Scaling ([#3051](https://github.com/EQEmu/Server/pull/3051)) @Kinglykrab 2023-03-10
-* Fix Raid Invites causing client desync issues ([#3053](https://github.com/EQEmu/Server/pull/3053)) @Aeadoin 2023-03-11
-* Fix Raid methods that could cause crashes with Bots in raid ([#3111](https://github.com/EQEmu/Server/pull/3111)) @Aeadoin 2023-03-17
-* Fix edge cases where camped bots would be left in a raid ([#3139](https://github.com/EQEmu/Server/pull/3139)) @Aeadoin 2023-03-23
-* Fix for Raid Disband if leader not in same zone. ([#3135](https://github.com/EQEmu/Server/pull/3135)) @Aeadoin 2023-03-21
-* Fix for incorrect bindpoint x,y,z,headings ([#3141](https://github.com/EQEmu/Server/pull/3141)) @Aeadoin 2023-03-23
-* Fix for transferring Raid Leader ([#3140](https://github.com/EQEmu/Server/pull/3140)) @Aeadoin 2023-03-23
-* Fix issue with overflow on min/max hit dmg in npc scaling calculations ([#3052](https://github.com/EQEmu/Server/pull/3052)) @Aeadoin 2023-03-10
-* Fix typo for bot_id raid_members column in db_update_manifest.txt ([#3132](https://github.com/EQEmu/Server/pull/3132)) @Kinglykrab 2023-03-20
-* Fixes for corpses not properly saving some item instance data correctly. ([#3123](https://github.com/EQEmu/Server/pull/3123)) @KimLS 2023-03-23
-
-### Illusions
-
-* Fix bug where spells like Ignite Bones left NPC size incorrect. ([#3061](https://github.com/EQEmu/Server/pull/3061)) @noudess 2023-03-16
-
-### Quest API
-
-* Add SendIllusion overloads/parameters to Perl/Lua ([#3059](https://github.com/EQEmu/Server/pull/3059)) @Kinglykrab 2023-03-16
-* Add Spell GetActX methods to Perl/Lua ([#3056](https://github.com/EQEmu/Server/pull/3056)) @Kinglykrab 2023-03-12
-* Add Timer related methods to Mobs in Perl/Lua ([#3133](https://github.com/EQEmu/Server/pull/3133)) @Kinglykrab 2023-03-20
-
-### Rules
-
-* Add Multiplier for Heroic Stats. ([#3014](https://github.com/EQEmu/Server/pull/3014)) @Aeadoin 2023-03-04
-* Add ResurrectionEffectsBlock ([#2990](https://github.com/EQEmu/Server/pull/2990)) @nytmyr 2023-03-04
-* Add Rule to allow ExtraDmgSkill/SPA 220 to effect Spell Skills ([#3124](https://github.com/EQEmu/Server/pull/3124)) @Aeadoin 2023-03-19
-* Add Task System Rule ExpRewardsIgnoreLevelBasedEXPMods ([#3112](https://github.com/EQEmu/Server/pull/3112)) @Aeadoin 2023-03-17
-
-### Scaling
-
-* Add support for pipe-separated zone IDs and versions ([#3015](https://github.com/EQEmu/Server/pull/3015)) @Kinglykrab 2023-03-04
-
-### Strings
-
-* Add exception handling to converters themselves ([#3029](https://github.com/EQEmu/Server/pull/3029)) @Akkadius 2023-03-05
-* Add more number formatters ([#2873](https://github.com/EQEmu/Server/pull/2873)) @Kinglykrab 2023-03-04
-
 ## [22.4.5] - 03/03/2023 

 ### Bots
@@ -16,15 +16,6 @@ SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)

-OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-
-IF (EQEMU_BUILD_STATIC)
-	SET(BUILD_SHARED_LIBS OFF)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
-	MESSAGE(STATUS "Building with static linking")
-	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-ENDIF(EQEMU_BUILD_STATIC)
-
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
@@ -316,10 +307,6 @@ ELSE()
 	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
 ENDIF()

-IF (EQEMU_BUILD_STATIC)
-	SET(ZLIB_LIBRARY_LIBS libz.a)
-ENDIF(EQEMU_BUILD_STATIC)
-
 MESSAGE(STATUS "")
 MESSAGE(STATUS "**************************************************")
 MESSAGE(STATUS "* Library Usage                                  *")
@@ -15,9 +15,6 @@ SET(common_sources
    database.cpp
    database_conversions.cpp
    database_instances.cpp
-    database/database_update_manifest.cpp
-    database/database_update_manifest_bots.cpp
-    database/database_update.cpp
    dbcore.cpp
    deity.cpp
    dynamic_zone_base.cpp
@@ -509,7 +506,6 @@ SET(common_headers
    data_verification.h
    database.h
    database_schema.h
-    database/database_update.h
    dbcore.h
    deity.h
    discord/discord.h
@@ -612,6 +608,7 @@ SET(common_headers
    unix.h
    useperl.h
    version.h
+    zone_numbers.h
    zone_store.h
    event/event_loop.h
    event/task.h
@@ -670,8 +667,7 @@ SET(common_headers
    StackWalker/StackWalker.h
    util/memory_stream.h
    util/directory.h
-    util/uuid.h
-)
+    util/uuid.h)

 SOURCE_GROUP(Event FILES
    event/event_loop.h
@@ -630,20 +630,6 @@ bool IsINTCasterClass(uint8 class_id)
 	}
 }

-bool IsHeroicINTCasterClass(uint8 class_id)
-{
-	switch (class_id) {
-		case NECROMANCER:
-		case WIZARD:
-		case MAGICIAN:
-		case ENCHANTER:
-		case SHADOWKNIGHT:
-			return true;
-		default:
-			return false;
-	}
-}
-
 bool IsWISCasterClass(uint8 class_id)
 {
 	switch (class_id) {
@@ -656,21 +642,6 @@ bool IsWISCasterClass(uint8 class_id)
 	}
 }

-bool IsHeroicWISCasterClass(uint8 class_id)
-{
-	switch (class_id) {
-		case CLERIC:
-		case DRUID:
-		case SHAMAN:
-		case PALADIN:
-		case BEASTLORD:
-		case RANGER:
-			return true;
-		default:
-			return false;
-	}
-}
-
 bool IsPlateClass(uint8 class_id)
 {
 	switch (class_id) {
@@ -140,8 +140,7 @@ bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);
-bool IsHeroicINTCasterClass(uint8 class_id);
-bool IsHeroicWISCasterClass(uint8 class_id);
+
 bool IsPlateClass(uint8 class_id);
 bool IsChainClass(uint8 class_id);
 bool IsLeatherClass(uint8 class_id);
@@ -77,7 +77,7 @@ namespace EQEmuCommand {
 			index++;
 		}

-		if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && cmd[{"-h", "--help"}])) {
+		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
@@ -160,7 +160,7 @@ namespace EQEmuCommand {
 			 */
 			std::string command_section;
 			for (auto   &it: in_function_map) {
-				description.clear();
+				description = "";

 				(it.second)(argc, argv, cmd, description);

@@ -120,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
 * @param content_flags
 */
-void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
+void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -167,7 +167,7 @@ public:
 	std::vector<std::string> GetContentFlagsDisabled();
 	bool IsContentFlagEnabled(const std::string& content_flag);
 	bool IsContentFlagDisabled(const std::string& content_flag);
-	void SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags);
+	void SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
 	void ReloadContentFlags();
 	WorldContentService * SetExpansionContext();

@@ -41,6 +41,9 @@ void SendCrashReport(const std::string &crash_report)
 		r.set_connection_timeout(1, 0);
 		r.set_read_timeout(1, 0);
 		r.set_write_timeout(1, 0);
+		httplib::Headers headers = {
+			{"Content-Type", "application/json"}
+		};

 		// os info
 		auto os         = EQ::GetOS();
@@ -122,7 +125,7 @@ public:
 		StackWalker::OnOutput(szText);
 	}

-	const std::vector<std::string>& GetLines() { return _lines; }
+	const std::vector<std::string>& const GetLines() { return _lines; }
 private:
 	std::vector<std::string> _lines;
 };
@@ -353,7 +353,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {

 	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
-	if (!results.Success() || !results.ErrorMessage().empty()){ return false; }
+	if (!results.Success() || results.ErrorMessage() != ""){ return false; }

 	// Put character into the default guild if rule is being used.
 	int guild_id = RuleI(Character, DefaultGuild);
@@ -363,7 +363,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 		if (character_id > -1) {
 			query = StringFormat("INSERT INTO `guild_members` SET `char_id` = %i, `guild_id` = '%i'", character_id, guild_id);
 			results = QueryDatabase(query);
-			if (!results.Success() || !results.ErrorMessage().empty()){
+			if (!results.Success() || results.ErrorMessage() != ""){
 				LogInfo("Could not put character [{}] into default Guild", name);
 			}
 		}
@@ -387,7 +387,7 @@ bool Database::DeleteCharacter(char *character_name)
 	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
 	auto        results = QueryDatabase(query);
 	for (auto   row     = results.begin(); row != results.end(); ++row) {
-		character_id = Strings::ToUnsignedInt(row[0]);
+		character_id = Strings::ToInt(row[0]);
 	}

 	if (character_id <= 0) {
@@ -449,8 +449,7 @@ bool Database::DeleteCharacter(char *character_name)
 	return true;
 }

-bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp)
-{
+bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp){
 	std::string query = StringFormat(
 		"REPLACE INTO `character_data` ("
 		"id,"
@@ -635,102 +634,101 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"%u,"  // guild_auto_consent
 		"%u"  // RestTimer
 		")",
-		character_id,                      // " id,                        "
-		account_id,                          // " account_id,                "
-		Strings::Escape(pp->name).c_str(),      // " `name`,                    "
+		character_id,					  // " id,                        "
+		account_id,						  // " account_id,                "
+		Strings::Escape(pp->name).c_str(),	  // " `name`,                    "
 		Strings::Escape(pp->last_name).c_str(), // " last_name,              "
-		pp->gender,                          // " gender,                    "
-		pp->race,                          // " race,                      "
-		pp->class_,                          // " class,                     "
-		pp->level,                          // " `level`,                   "
-		pp->deity,                          // " deity,                     "
-		pp->birthday,                      // " birthday,                  "
-		pp->lastlogin,                      // " last_login,                "
-		pp->timePlayedMin,                  // " time_played,               "
-		pp->pvp,                          // " pvp_status,                "
-		pp->level2,                          // " level2,                    "
-		pp->anon,                          // " anon,                      "
-		pp->gm,                              // " gm,                        "
-		pp->intoxication,                  // " intoxication,              "
-		pp->haircolor,                      // " hair_color,                "
-		pp->beardcolor,                      // " beard_color,               "
-		pp->eyecolor1,                      // " eye_color_1,               "
-		pp->eyecolor2,                      // " eye_color_2,               "
-		pp->hairstyle,                      // " hair_style,                "
-		pp->beard,                          // " beard,                     "
-		pp->ability_time_seconds,          // " ability_time_seconds,      "
-		pp->ability_number,                  // " ability_number,            "
-		pp->ability_time_minutes,          // " ability_time_minutes,      "
-		pp->ability_time_hours,              // " ability_time_hours,        "
+		pp->gender,						  // " gender,                    "
+		pp->race,						  // " race,                      "
+		pp->class_,						  // " class,                     "
+		pp->level,						  // " `level`,                   "
+		pp->deity,						  // " deity,                     "
+		pp->birthday,					  // " birthday,                  "
+		pp->lastlogin,					  // " last_login,                "
+		pp->timePlayedMin,				  // " time_played,               "
+		pp->pvp,						  // " pvp_status,                "
+		pp->level2,						  // " level2,                    "
+		pp->anon,						  // " anon,                      "
+		pp->gm,							  // " gm,                        "
+		pp->intoxication,				  // " intoxication,              "
+		pp->haircolor,					  // " hair_color,                "
+		pp->beardcolor,					  // " beard_color,               "
+		pp->eyecolor1,					  // " eye_color_1,               "
+		pp->eyecolor2,					  // " eye_color_2,               "
+		pp->hairstyle,					  // " hair_style,                "
+		pp->beard,						  // " beard,                     "
+		pp->ability_time_seconds,		  // " ability_time_seconds,      "
+		pp->ability_number,				  // " ability_number,            "
+		pp->ability_time_minutes,		  // " ability_time_minutes,      "
+		pp->ability_time_hours,			  // " ability_time_hours,        "
 		Strings::Escape(pp->title).c_str(),  // " title,                     "
 		Strings::Escape(pp->suffix).c_str(), // " suffix,                    "
-		pp->exp,                          // " exp,                       "
-		pp->points,                          // " points,                    "
-		pp->mana,                          // " mana,                      "
-		pp->cur_hp,                          // " cur_hp,                    "
-		pp->STR,                          // " str,                       "
-		pp->STA,                          // " sta,                       "
-		pp->CHA,                          // " cha,                       "
-		pp->DEX,                          // " dex,                       "
-		pp->INT,                          // " `int`,                     "
-		pp->AGI,                          // " agi,                       "
-		pp->WIS,                          // " wis,                       "
-		pp->face,                          // " face,                      "
-		pp->y,                              // " y,                         "
-		pp->x,                              // " x,                         "
-		pp->z,                              // " z,                         "
-		pp->heading,                      // " heading,                   "
-		pp->pvp2,                          // " pvp2,                      "
-		pp->pvptype,                      // " pvp_type,                  "
-		pp->autosplit,                      // " autosplit_enabled,         "
-		pp->zone_change_count,              // " zone_change_count,         "
-		pp->drakkin_heritage,              // " drakkin_heritage,          "
-		pp->drakkin_tattoo,                  // " drakkin_tattoo,            "
-		pp->drakkin_details,              // " drakkin_details,           "
-		pp->toxicity,                      // " toxicity,                  "
-		pp->hunger_level,                  // " hunger_level,              "
-		pp->thirst_level,                  // " thirst_level,              "
-		pp->ability_up,                      // " ability_up,                "
-		pp->zone_id,                      // " zone_id,                   "
-		pp->zoneInstance,                  // " zone_instance,             "
-		pp->leadAAActive,                  // " leadership_exp_on,         "
-		pp->ldon_points_guk,              // " ldon_points_guk,           "
-		pp->ldon_points_mir,              // " ldon_points_mir,           "
-		pp->ldon_points_mmc,              // " ldon_points_mmc,           "
-		pp->ldon_points_ruj,              // " ldon_points_ruj,           "
-		pp->ldon_points_tak,              // " ldon_points_tak,           "
-		pp->ldon_points_available,          // " ldon_points_available,     "
-		pp->tribute_time_remaining,          // " tribute_time_remaining,    "
-		pp->showhelm,                      // " show_helm,                 "
-		pp->career_tribute_points,          // " career_tribute_points,     "
-		pp->tribute_points,                  // " tribute_points,            "
-		pp->tribute_active,                  // " tribute_active,            "
-		pp->endurance,                      // " endurance,                 "
-		pp->group_leadership_exp,          // " group_leadership_exp,      "
-		pp->raid_leadership_exp,          // " raid_leadership_exp,       "
-		pp->group_leadership_points,      // " group_leadership_points,   "
-		pp->raid_leadership_points,          // " raid_leadership_points,    "
-		pp->air_remaining,                  // " air_remaining,             "
-		pp->PVPKills,                      // " pvp_kills,                 "
-		pp->PVPDeaths,                      // " pvp_deaths,                "
-		pp->PVPCurrentPoints,              // " pvp_current_points,        "
-		pp->PVPCareerPoints,              // " pvp_career_points,         "
-		pp->PVPBestKillStreak,              // " pvp_best_kill_streak,      "
-		pp->PVPWorstDeathStreak,          // " pvp_worst_death_streak,    "
-		pp->PVPCurrentKillStreak,          // " pvp_current_kill_streak,   "
-		pp->aapoints_spent,                  // " aa_points_spent,           "
-		pp->expAA,                          // " aa_exp,                    "
-		pp->aapoints,                      // " aa_points,                 "
-		pp->groupAutoconsent,              // " group_auto_consent,        "
-		pp->raidAutoconsent,              // " raid_auto_consent,         "
-		pp->guildAutoconsent,              // " guild_auto_consent,        "
-		pp->RestTimer                      // " RestTimer)                 "
+		pp->exp,						  // " exp,                       "
+		pp->points,						  // " points,                    "
+		pp->mana,						  // " mana,                      "
+		pp->cur_hp,						  // " cur_hp,                    "
+		pp->STR,						  // " str,                       "
+		pp->STA,						  // " sta,                       "
+		pp->CHA,						  // " cha,                       "
+		pp->DEX,						  // " dex,                       "
+		pp->INT,						  // " `int`,                     "
+		pp->AGI,						  // " agi,                       "
+		pp->WIS,						  // " wis,                       "
+		pp->face,						  // " face,                      "
+		pp->y,							  // " y,                         "
+		pp->x,							  // " x,                         "
+		pp->z,							  // " z,                         "
+		pp->heading,					  // " heading,                   "
+		pp->pvp2,						  // " pvp2,                      "
+		pp->pvptype,					  // " pvp_type,                  "
+		pp->autosplit,					  // " autosplit_enabled,         "
+		pp->zone_change_count,			  // " zone_change_count,         "
+		pp->drakkin_heritage,			  // " drakkin_heritage,          "
+		pp->drakkin_tattoo,				  // " drakkin_tattoo,            "
+		pp->drakkin_details,			  // " drakkin_details,           "
+		pp->toxicity,					  // " toxicity,                  "
+		pp->hunger_level,				  // " hunger_level,              "
+		pp->thirst_level,				  // " thirst_level,              "
+		pp->ability_up,					  // " ability_up,                "
+		pp->zone_id,					  // " zone_id,                   "
+		pp->zoneInstance,				  // " zone_instance,             "
+		pp->leadAAActive,				  // " leadership_exp_on,         "
+		pp->ldon_points_guk,			  // " ldon_points_guk,           "
+		pp->ldon_points_mir,			  // " ldon_points_mir,           "
+		pp->ldon_points_mmc,			  // " ldon_points_mmc,           "
+		pp->ldon_points_ruj,			  // " ldon_points_ruj,           "
+		pp->ldon_points_tak,			  // " ldon_points_tak,           "
+		pp->ldon_points_available,		  // " ldon_points_available,     "
+		pp->tribute_time_remaining,		  // " tribute_time_remaining,    "
+		pp->showhelm,					  // " show_helm,                 "
+		pp->career_tribute_points,		  // " career_tribute_points,     "
+		pp->tribute_points,				  // " tribute_points,            "
+		pp->tribute_active,				  // " tribute_active,            "
+		pp->endurance,					  // " endurance,                 "
+		pp->group_leadership_exp,		  // " group_leadership_exp,      "
+		pp->raid_leadership_exp,		  // " raid_leadership_exp,       "
+		pp->group_leadership_points,	  // " group_leadership_points,   "
+		pp->raid_leadership_points,		  // " raid_leadership_points,    "
+		pp->air_remaining,				  // " air_remaining,             "
+		pp->PVPKills,					  // " pvp_kills,                 "
+		pp->PVPDeaths,					  // " pvp_deaths,                "
+		pp->PVPCurrentPoints,			  // " pvp_current_points,        "
+		pp->PVPCareerPoints,			  // " pvp_career_points,         "
+		pp->PVPBestKillStreak,			  // " pvp_best_kill_streak,      "
+		pp->PVPWorstDeathStreak,		  // " pvp_worst_death_streak,    "
+		pp->PVPCurrentKillStreak,		  // " pvp_current_kill_streak,   "
+		pp->aapoints_spent,				  // " aa_points_spent,           "
+		pp->expAA,						  // " aa_exp,                    "
+		pp->aapoints,					  // " aa_points,                 "
+		pp->groupAutoconsent,			  // " group_auto_consent,        "
+		pp->raidAutoconsent,			  // " raid_auto_consent,         "
+		pp->guildAutoconsent,			  // " guild_auto_consent,        "
+		pp->RestTimer					  // " RestTimer)                 "
 	);
-	QueryDatabase(query);
+	auto results = QueryDatabase(query);

 	/* Save Bind Points */
-	query = StringFormat(
-		"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -741,73 +739,57 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		character_id, pp->binds[2].zone_id, 0, pp->binds[2].x, pp->binds[2].y, pp->binds[2].z, pp->binds[2].heading, 2,
 		character_id, pp->binds[3].zone_id, 0, pp->binds[3].x, pp->binds[3].y, pp->binds[3].z, pp->binds[3].heading, 3,
 		character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 4
-	);
-	QueryDatabase(query);
+	); results = QueryDatabase(query);

-	/* HoTT Ability */
-	if (RuleB(Character, GrantHoTTOnCreate)) {
-		query = StringFormat(
-			"INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)",
-			character_id,
-			14,
-			1
-		);
-		QueryDatabase(query);
-	}
+        /* HoTT Ability */
+        if(RuleB(Character, GrantHoTTOnCreate))
+        {
+                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)", character_id, 14, 1);
+                results = QueryDatabase(query);
+        }

 	/* Save Skills */
-	int      firstquery = 0;
-	for (int i          = 0; i < MAX_PP_SKILL; i++) {
-		if (pp->skills[i] > 0) {
-			if (firstquery != 1) {
+	int firstquery = 0;
+	for (int i = 0; i < MAX_PP_SKILL; i++){
+		if (pp->skills[i] > 0){
+			if (firstquery != 1){
 				firstquery = 1;
-				query      = StringFormat(
-					"REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)",
-					character_id,
-					i,
-					pp->skills[i]
-				);
-			} else {
+				query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, i, pp->skills[i]);
+			}
+			else{
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->skills[i]);
 			}
 		}
 	}
-	QueryDatabase(query);
+	results = QueryDatabase(query);

 	/* Save Language */
 	firstquery = 0;
-	for (int i = 0; i < MAX_PP_LANGUAGE; i++) {
-		if (pp->languages[i] > 0) {
-			if (firstquery != 1) {
+	for (int i = 0; i < MAX_PP_LANGUAGE; i++){
+		if (pp->languages[i] > 0){
+			if (firstquery != 1){
 				firstquery = 1;
-				query      = StringFormat(
-					"REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)",
-					character_id,
-					i,
-					pp->languages[i]
-				);
-			} else {
+				query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, i, pp->languages[i]);
+			}
+			else{
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->languages[i]);
 			}
 		}
 	}
-	QueryDatabase(query);
+	results = QueryDatabase(query);

 	return true;
 }

 uint32 Database::GetCharacterID(const char *name) {
-	const auto query = fmt::format(
-		"SELECT `id` FROM `character_data` WHERE `name` = '{}'",
-		Strings::Escape(name)
-	);
+	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
-	}
-
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	if (results.RowCount() == 1)
+	{
+		return Strings::ToInt(row[0]);
+	}
+	return 0;
 }

 /*
@@ -830,10 +812,10 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {

 	auto row = results.begin();

-	uint32 accountId = Strings::ToUnsignedInt(row[0]);
+	uint32 accountId = Strings::ToInt(row[0]);

 	if (oCharID)
-		*oCharID = Strings::ToUnsignedInt(row[1]);
+		*oCharID = Strings::ToInt(row[1]);

 	return accountId;
 }
@@ -850,7 +832,7 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) {
 		return 0;

 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 uint32 Database::GetAccountIDByName(std::string account_name, std::string loginserver, int16* status, uint32* lsid) {
@@ -898,7 +880,7 @@ void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID

 	strcpy(name, row[0]);
 	if (row[1] && oLSAccountID) {
-		*oLSAccountID = Strings::ToUnsignedInt(row[1]);
+		*oLSAccountID = Strings::ToInt(row[1]);
 	}

 }
@@ -986,7 +968,7 @@ bool Database::LoadVariables() {

 	std::string key, value;
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		varcache.last_update = Strings::ToUnsignedInt(row[2]); // ahh should we be comparing if this is newer?
+		varcache.last_update = Strings::ToInt(row[2]); // ahh should we be comparing if this is newer?
 		key = row[0];
 		value = row[1];
 		std::transform(std::begin(key), std::end(key), std::begin(key), ::tolower); // keys are lower case, DB doesn't have to be
@@ -1017,7 +999,7 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 	return false;
 }

-bool Database::SetVariable(const std::string& varname, const std::string &varvalue)
+bool Database::SetVariable(const std::string varname, const std::string &varvalue)
 {
 	std::string escaped_name = Strings::Escape(varname);
 	std::string escaped_value = Strings::Escape(varvalue);
@@ -1070,7 +1052,7 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 	auto row = results.begin();

 	if(graveyard_zoneid != nullptr)
-		*graveyard_zoneid = Strings::ToUnsignedInt(row[0]);
+		*graveyard_zoneid = Strings::ToInt(row[0]);
 	if(graveyard_x != nullptr)
 		*graveyard_x = Strings::ToFloat(row[1]);
 	if(graveyard_y != nullptr)
@@ -1186,7 +1168,7 @@ uint32 Database::GetAccountIDFromLSID(
 	}

 	for (auto row = results.begin(); row != results.end(); ++row) {
-		account_id = Strings::ToUnsignedInt(row[0]);
+		account_id = Strings::ToInt(row[0]);

 		if (in_account_name) {
 			strcpy(in_account_name, row[1]);
@@ -1262,7 +1244,7 @@ uint8 Database::GetServerType() {
 		return 0;

 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 bool Database::MoveCharacterToZone(uint32 character_id, uint32 zone_id)
@@ -1314,7 +1296,7 @@ uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 		return 0;

 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level)
@@ -1330,12 +1312,12 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
 	if (results.Success() && results.RowsAffected() != 0)
 	{
 		auto row = results.begin();
-		skill_level = Strings::ToUnsignedInt(row[0]);
-		skill_formula = Strings::ToUnsignedInt(row[1]);
-		skill_cap = Strings::ToUnsignedInt(row[2]);
-		if (Strings::ToUnsignedInt(row[3]) > skill_cap)
-			skill_cap2 = (Strings::ToUnsignedInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
-		skill_cap3 = Strings::ToUnsignedInt(row[4]);
+		skill_level = Strings::ToInt(row[0]);
+		skill_formula = Strings::ToInt(row[1]);
+		skill_cap = Strings::ToInt(row[2]);
+		if (Strings::ToInt(row[3]) > skill_cap)
+			skill_cap2 = (Strings::ToInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
+		skill_cap3 = Strings::ToInt(row[4]);
 	}

 	int race_skill = GetRaceSkill(skillid,in_race);
@@ -1506,7 +1488,7 @@ uint32 Database::GetGroupID(const char* name){

 	auto row = results.begin();

-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 std::string Database::GetGroupLeaderForLogin(std::string character_name) {
@@ -1656,7 +1638,7 @@ uint8 Database::GetAgreementFlag(uint32 acctid) {

 	auto row = results.begin();

-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 void Database::SetAgreementFlag(uint32 acctid) {
@@ -1742,7 +1724,7 @@ uint32 Database::GetRaidID(const char* name)
 	}

 	if (row[0]) // would it ever be possible to have a null here?
-		return Strings::ToUnsignedInt(row[0]);
+		return Strings::ToInt(row[0]);

 	return 0;
 }
@@ -1998,16 +1980,16 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)

 	auto row = results.begin();

-	as->success.guk = Strings::ToUnsignedInt(row[0]);
-	as->success.mir = Strings::ToUnsignedInt(row[1]);
-	as->success.mmc = Strings::ToUnsignedInt(row[2]);
-	as->success.ruj = Strings::ToUnsignedInt(row[3]);
-	as->success.tak = Strings::ToUnsignedInt(row[4]);
-	as->failure.guk = Strings::ToUnsignedInt(row[5]);
-	as->failure.mir = Strings::ToUnsignedInt(row[6]);
-	as->failure.mmc = Strings::ToUnsignedInt(row[7]);
-	as->failure.ruj = Strings::ToUnsignedInt(row[8]);
-	as->failure.tak = Strings::ToUnsignedInt(row[9]);
+	as->success.guk = Strings::ToInt(row[0]);
+	as->success.mir = Strings::ToInt(row[1]);
+	as->success.mmc = Strings::ToInt(row[2]);
+	as->success.ruj = Strings::ToInt(row[3]);
+	as->success.tak = Strings::ToInt(row[4]);
+	as->failure.guk = Strings::ToInt(row[5]);
+	as->failure.mir = Strings::ToInt(row[6]);
+	as->failure.mmc = Strings::ToInt(row[7]);
+	as->failure.ruj = Strings::ToInt(row[8]);
+	as->failure.tak = Strings::ToInt(row[9]);
 	as->failure.total = as->failure.guk + as->failure.mir + as->failure.mmc + as->failure.ruj + as->failure.tak;
 	as->success.total = as->success.guk + as->success.mir + as->success.mmc + as->success.ruj + as->success.tak;

@@ -2026,7 +2008,7 @@ uint32 Database::GetGuildIDByCharID(uint32 character_id)
 		return 0;

 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 uint32 Database::GetGroupIDByCharID(uint32 character_id)
@@ -2048,7 +2030,7 @@ uint32 Database::GetGroupIDByCharID(uint32 character_id)
 		return 0;

 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }

 uint32 Database::GetRaidIDByCharID(uint32 character_id) {
@@ -2061,12 +2043,10 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 		character_id
 	);
 	auto results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		return Strings::ToInt(row[0]);
 	}
-
-	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return 0;
 }

 int Database::CountInvSnapshots() {
@@ -2109,17 +2089,17 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 		eqTime.day = 1;
 		eqTime.month = 1;
 		eqTime.year = 3100;
-		realtime = time(nullptr);
+		realtime = time(0);
 	}
 	else{
 		auto row = results.begin();

-		eqTime.minute = Strings::ToUnsignedInt(row[0]);
-		eqTime.hour = Strings::ToUnsignedInt(row[1]);
-		eqTime.day = Strings::ToUnsignedInt(row[2]);
-		eqTime.month = Strings::ToUnsignedInt(row[3]);
-		eqTime.year = Strings::ToUnsignedInt(row[4]);
-		realtime = Strings::ToBigInt(row[5]);
+		eqTime.minute = Strings::ToInt(row[0]);
+		eqTime.hour = Strings::ToInt(row[1]);
+		eqTime.day = Strings::ToInt(row[2]);
+		eqTime.month = Strings::ToInt(row[3]);
+		eqTime.year = Strings::ToInt(row[4]);
+		realtime = Strings::ToInt(row[5]);
 	}

 	return eqTime;
@@ -2292,6 +2272,7 @@ bool Database::CopyCharacter(
 			new_rows.emplace_back(new_values);
 		}

+		std::string              insert_values;
 		std::vector<std::string> insert_rows;

 		for (auto &r: new_rows) {
@@ -2347,7 +2328,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 		);

 		if (!DoesTableExist(table_name)) {
-			LogMySQLQuery("Table [{}] does not exist. Downloading and installing...", table_name);
+			LogMySQLQuery("Table [{}] does not exist. Downloading from Github and installing...", table_name);

 			// http get request
 			httplib::Client cli(
@@ -2355,7 +2336,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 					"{}://{}",
 					request_uri.get_scheme(),
 					request_uri.get_host()
-				)
+				).c_str()
 			);

 			cli.set_connection_timeout(0, 60000000); // 60 sec
@@ -2364,7 +2345,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur

 			int sourced_queries = 0;

-			if (auto res = cli.Get(request_uri.get_path())) {
+			if (auto res = cli.Get(request_uri.get_path().c_str())) {
 				if (res->status == 200) {
 					for (auto &s: Strings::Split(res->body, ';')) {
 						if (!Strings::Trim(s).empty()) {
@@ -2408,55 +2389,3 @@ uint8 Database::GetMinStatus(uint32 zone_id, uint32 instance_version)

 	return !zones.empty() ? zones[0].min_status : 0;
 }
-
-void Database::SourceSqlFromUrl(std::string url)
-{
-	try {
-		uri request_uri(url);
-
-		LogHTTPDetail(
-			"parsing url [{}] path [{}] host [{}] query_string [{}] protocol [{}] port [{}]",
-			url,
-			request_uri.get_path(),
-			request_uri.get_host(),
-			request_uri.get_query(),
-			request_uri.get_scheme(),
-			request_uri.get_port()
-		);
-
-		LogInfo("Downloading and installing from [{}]", url);
-
-		// http get request
-		httplib::Client cli(
-			fmt::format(
-				"{}://{}",
-				request_uri.get_scheme(),
-				request_uri.get_host()
-			)
-		);
-
-		cli.set_connection_timeout(0, 60000000); // 60 sec
-		cli.set_read_timeout(60, 0); // 60 seconds
-		cli.set_write_timeout(60, 0); // 60 seconds
-
-		if (auto res = cli.Get(request_uri.get_path())) {
-			if (res->status == 200) {
-				auto results = QueryDatabaseMulti(res->body);
-				if (!results.ErrorMessage().empty()) {
-					LogError("Error sourcing SQL [{}]", results.ErrorMessage());
-					return;
-				}
-			}
-			if (res->status == 404) {
-				LogError("Error retrieving URL [{}]", url);
-			}
-		}
-		else {
-			LogError("Error retrieving URL [{}]", url);
-		}
-
-	}
-	catch (std::invalid_argument iae) {
-		LogError("URI parser error [{}]", iae.what());
-	}
-}
@@ -235,7 +235,7 @@ public:
 	/* Database Variables */

 	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string& varname, const std::string &varvalue);
+	bool	SetVariable(const std::string varname, const std::string &varvalue);
 	bool	LoadVariables();

 	/* General Queries */
@@ -263,7 +263,7 @@ public:
 	void	ClearInvSnapshots(bool from_now = false);

 	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
-	void SourceSqlFromUrl(std::string url);
+

 private:

@@ -28,7 +28,6 @@
 #include "../database_schema.h"
 #include "../file.h"
 #include "../process/process.h"
-#include "../termcolor/rang.hpp"

 #include <ctime>

@@ -37,7 +36,6 @@
 #else

 #include <sys/time.h>
-#include <thread>

 #endif

@@ -93,8 +91,6 @@ std::string DatabaseDumpService::GetMySQLVersion()
 	return Strings::Trim(version_output);
 }

-const std::string CREDENTIALS_FILE = "login.my.cnf";
-
 /**
 * @return
 */
@@ -103,15 +99,21 @@ std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 	auto config = EQEmuConfig::get();
 	if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
 		return fmt::format(
-			"mysqldump --defaults-extra-file={} {}",
-			CREDENTIALS_FILE,
+			"mysqldump -u {} -p{} -h {} --port={} {}",
+			config->ContentDbUsername,
+			config->ContentDbPassword,
+			config->ContentDbHost,
+			config->ContentDbPort,
 			config->ContentDbName
 		);
 	};

 	return fmt::format(
-		"mysqldump --defaults-extra-file={} {}",
-		CREDENTIALS_FILE,
+		"mysqldump -u {} -p{} -h {} --port={} {}",
+		config->DatabaseUsername,
+		config->DatabasePassword,
+		config->DatabaseHost,
+		config->DatabasePort,
 		config->DatabaseDB
 	);
 }
@@ -143,7 +145,7 @@ std::string DatabaseDumpService::GetQueryServTables()

 std::string DatabaseDumpService::GetSystemTablesList()
 {
-	auto system_tables  = DatabaseSchema::GetServerTables();
+	auto system_tables = DatabaseSchema::GetServerTables();
 	auto version_tables = DatabaseSchema::GetVersionTables();

 	system_tables.insert(
@@ -197,7 +199,7 @@ std::string DatabaseDumpService::GetDumpFileNameWithPath()
 	return GetSetDumpPath() + GetDumpFileName();
 }

-void DatabaseDumpService::DatabaseDump()
+void DatabaseDumpService::Dump()
 {
 	if (!IsMySQLInstalled()) {
 		LogError("MySQL is not installed; Please check your PATH for a valid MySQL installation");
@@ -291,6 +293,14 @@ void DatabaseDumpService::DatabaseDump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}

+	std::string execute_command = fmt::format(
+		"{} {} {} {}",
+		GetBaseMySQLDumpCommand(),
+		options,
+		tables_to_dump,
+		pipe_file
+	);
+
 	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
 		File::Makedir(GetSetDumpPath());
 	}
@@ -298,60 +308,30 @@ void DatabaseDumpService::DatabaseDump()
 	if (IsDumpDropTableSyntaxOnly()) {
 		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');

-		for (auto &table: tables) {
+		for (auto &table : tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;
 		}

 		if (tables_to_dump.empty()) {
 			std::cerr << "No tables were specified" << std::endl;
 		}
-
-		return;
 	}
 	else {
-		const auto execute_command = fmt::format(
-			"{} {} {} {}",
-			GetBaseMySQLDumpCommand(),
-			options,
-			tables_to_dump,
-			pipe_file
-		);
-
-		BuildCredentialsFile();
 		std::string execution_result = Process::execute(execute_command);
 		if (!execution_result.empty() && IsDumpOutputToConsole()) {
 			std::cout << execution_result;
 		}
 	}

-	LogSys.LoadLogSettingsDefaults();
-
-	if (!pipe_file.empty()) {
-		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-		auto        r    = File::GetContents(file);
-		if (!r.error.empty()) {
-			LogError("{}", r.error);
-		}
-
-		for (auto &line: Strings::Split(r.contents, "\n")) {
-			if (Strings::Contains(line, "mysqldump:")) {
-				LogError("{}", line);
-				LogError("Database dump failed. Correct the error before continuing or trying again");
-				LogError("This is to prevent data loss on behalf of the server operator");
-				RemoveSqlBackup();
-				std::exit(1);
-			}
-		}
-	}
-
 	if (!tables_to_dump.empty()) {
 		LogInfo("Dumping Tables [{}]", Strings::Trim(tables_to_dump));
 	}

 	LogInfo("Database dump created at [{}.sql]", GetDumpFileNameWithPath());
+
 	if (IsDumpWithCompression() && !IsDumpOutputToConsole()) {
 		if (HasCompressionBinary()) {
-			LogInfo("Compression requested. Compressing dump [{}.sql]", GetDumpFileNameWithPath());
+			LogInfo("Compression requested... Compressing dump [{}.sql]", GetDumpFileNameWithPath());

 			if (IsTarAvailable()) {
 				Process::execute(
@@ -363,7 +343,6 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.tar.gz]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else if (Is7ZipAvailable()) {
 				Process::execute(
@@ -374,7 +353,6 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.zip]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else {
 				LogInfo("Compression requested, but no available compression binary was found");
@@ -385,8 +363,6 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}

-	RemoveCredentialsFile();
-
 //	LogDebug("[{}] dump-to-console", IsDumpOutputToConsole());
 //	LogDebug("[{}] dump-path", GetSetDumpPath());
 //	LogDebug("[{}] compression", (IsDumpWithCompression() ? "true" : "false"));
@@ -559,48 +535,3 @@ void DatabaseDumpService::SetDumpMercTables(bool dump_merc_tables)
 {
 	DatabaseDumpService::dump_merc_tables = dump_merc_tables;
 }
-
-void DatabaseDumpService::RemoveSqlBackup()
-{
-	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-	if (File::Exists(file)) {
-		std::filesystem::remove(file);
-	}
-
-	RemoveCredentialsFile();
-}
-
-void DatabaseDumpService::BuildCredentialsFile()
-{
-	auto          config = EQEmuConfig::get();
-	std::ofstream out(CREDENTIALS_FILE);
-	if (out.is_open()) {
-		if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->ContentDbUsername << std::endl;
-			out << "password=" << config->ContentDbPassword << std::endl;
-			out << "host=" << config->ContentDbHost << std::endl;
-			out << "port=" << config->ContentDbPort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		else {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->DatabaseUsername << std::endl;
-			out << "password=" << config->DatabasePassword << std::endl;
-			out << "host=" << config->DatabaseHost << std::endl;
-			out << "port=" << config->DatabasePort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		out.close();
-	}
-	else {
-		LogError("Failed to open credentials file for writing");
-	}
-}
-
-void DatabaseDumpService::RemoveCredentialsFile()
-{
-	if (File::Exists(CREDENTIALS_FILE)) {
-		std::filesystem::remove(CREDENTIALS_FILE);
-	}
-}
@@ -24,7 +24,7 @@

 class DatabaseDumpService {
 public:
-	void DatabaseDump();
+	void Dump();
 	bool IsDumpAllTables() const;
 	void SetDumpAllTables(bool dump_all_tables);
 	bool IsDumpWithNoData() const;
@@ -92,9 +92,6 @@ private:
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
 	std::string GetQueryServTables();
-	void RemoveSqlBackup();
-	void BuildCredentialsFile();
-	void RemoveCredentialsFile();
 };


@@ -1,296 +0,0 @@
-#include <filesystem>
-#include "database_update.h"
-#include "../eqemu_logsys.h"
-#include "../database.h"
-#include "../strings.h"
-#include "../rulesys.h"
-#include "../http/httplib.h"
-
-#include "database_update_manifest.cpp"
-#include "database_update_manifest_bots.cpp"
-#include "database_dump_service.h"
-
-constexpr int BREAK_LENGTH = 70;
-
-DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
-{
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
-	if (!results.Success() || !results.RowCount()) {
-		LogError("Failed to read from [db_version] table!");
-		return DatabaseVersion{};
-	}
-
-	auto r = results.begin();
-
-	return DatabaseVersion{
-		.server_database_version = Strings::ToInt(r[0]),
-		.bots_database_version = Strings::ToInt(r[1]),
-	};
-}
-
-DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
-{
-	return DatabaseVersion{
-		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
-		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
-	};
-}
-
-// the amount of versions we look-back to ensure we have all migrations
-// we may not want to force these, but just warn about the look-backs
-constexpr int LOOK_BACK_AMOUNT = 10;
-
-// this check will take action
-void DatabaseUpdate::CheckDbUpdates()
-{
-	InjectBotsVersionColumn();
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-	if (CheckVersions(v, b)) {
-		return;
-	}
-
-	if (UpdateManifest(manifest_entries, v.server_database_version, b.server_database_version)) {
-		LogInfo(
-			"Updates ran successfully, setting database version to [{}] from [{}]",
-			b.server_database_version,
-			v.server_database_version
-		);
-		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
-	}
-
-	if (b.bots_database_version > 0) {
-		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
-			LogInfo(
-				"Updates ran successfully, setting database version to [{}] from [{}]",
-				b.bots_database_version,
-				v.bots_database_version
-			);
-			m_database->QueryDatabase(
-				fmt::format(
-					"UPDATE `db_version` SET `bots_version` = {}",
-					b.bots_database_version
-				)
-			);
-		}
-	}
-}
-
-std::string DatabaseUpdate::GetQueryResult(std::string query)
-{
-	auto results = m_database->QueryDatabase(query);
-
-	std::vector<std::string> result_lines = {};
-
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		std::vector<std::string> cols;
-
-		int field_count = results.ColumnCount();
-		cols.reserve(field_count);
-		for (int i = 0; i < field_count; ++i) {
-			if (row[i] != nullptr) {
-				cols.emplace_back(row[i]);
-			}
-		}
-
-		result_lines.emplace_back(Strings::Join(cols, " "));
-	}
-
-	return Strings::Join(result_lines, "\n");
-}
-
-bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_result)
-{
-	std::string r = Strings::Trim(query_result);
-	if (e.condition == "contains") {
-		return Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "match") {
-		return r == e.match;
-	}
-	else if (e.condition == "missing") {
-		return !Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "empty") {
-		return r.empty();
-	}
-	else if (e.condition == "not_empty") {
-		return !r.empty();
-	}
-
-	return false;
-}
-
-// return true if we ran updates
-bool DatabaseUpdate::UpdateManifest(
-	std::vector<ManifestEntry> entries,
-	int version_low,
-	int version_high
-)
-{
-	std::vector<int> missing_migrations = {};
-	if (version_low != version_high) {
-
-		LogSys.DisableMySQLErrorLogs();
-		for (int version = version_low + 1; version <= version_high; ++version) {
-			for (auto &e: entries) {
-				if (e.version == version) {
-					bool        has_migration = true;
-					std::string r             = GetQueryResult(e.check);
-					if (ShouldRunMigration(e, r)) {
-						has_migration = false;
-						missing_migrations.emplace_back(e.version);
-					}
-
-					std::string prefix = fmt::format(
-						"[{}]",
-						has_migration ? "ok" : "missing"
-					);
-
-					LogInfo(
-						"[{}] {:>10} | [{}]",
-						e.version,
-						prefix,
-						e.description
-					);
-				}
-			}
-		}
-		LogSys.EnableMySQLErrorLogs();
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Automatically backing up database before applying updates");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-			auto s = DatabaseDumpService();
-			s.SetDumpAllTables(true);
-			s.SetDumpWithCompression(true);
-			s.DatabaseDump();
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Running database migrations. Please wait...");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		for (auto &m: missing_migrations) {
-			for (auto &e: entries) {
-				if (e.version == m) {
-					bool errored_migration = false;
-
-					auto r = m_database->QueryDatabaseMulti(e.sql);
-
-					// ignore empty query result "errors"
-					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
-						LogError("[{}]", r.ErrorMessage());
-						errored_migration = true;
-
-						LogInfo("Required database update failed. This could be a problem");
-						LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");
-
-						// user input
-						std::string input;
-						bool        gave_input        = false;
-						time_t      start_time        = time(nullptr);
-						time_t      wait_time_seconds = 60;
-
-						// 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") {
-							errored_migration = false;
-							LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-						}
-					}
-
-					LogInfo(
-						"[{}] [{}] [{}]",
-						e.version,
-						e.description,
-						(errored_migration ? "error" : "ok")
-					);
-
-					if (errored_migration) {
-						LogError("Fatal | Database migration [{}] failed to run", e.description);
-						LogError("Fatal | Shutting down");
-						std::exit(1);
-					}
-				}
-			}
-		}
-
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		return true;
-	}
-
-	return false;
-}
-
-DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
-{
-	m_database = db;
-
-	return this;
-}
-
-bool DatabaseUpdate::CheckVersions(DatabaseVersion v, DatabaseVersion b)
-{
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	LogInfo(
-		"{:>8} | database [{}] binary [{}] {}",
-		"Server",
-		v.server_database_version,
-		b.server_database_version,
-		(v.server_database_version == b.server_database_version) ? "up to date" : "checking updates"
-	);
-
-	if (b.bots_database_version > 0) {
-		LogInfo(
-			"{:>8} | database [{}] binary [{}] {}",
-			"Bots",
-			v.bots_database_version,
-			b.bots_database_version,
-			(v.bots_database_version == b.bots_database_version) ? "up to date" : "checking updates"
-		);
-	}
-
-	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
-
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	return (v.server_database_version == b.server_database_version) &&
-		   (v.bots_database_version == b.bots_database_version);
-}
-
-// checks to see if there are pending updates
-// used by zone to prevent launch or boot loop until updates are applied
-bool DatabaseUpdate::HasPendingUpdates()
-{
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-
-	return !CheckVersions(v, b);
-}
-
-void DatabaseUpdate::InjectBotsVersionColumn()
-{
-	auto r = m_database->QueryDatabase("show columns from db_version where Field like '%bots_version%'");
-	if (r.RowCount() == 0) {
-		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
-	}
-}
@@ -1,37 +0,0 @@
-#ifndef EQEMU_DATABASE_UPDATE_H
-#define EQEMU_DATABASE_UPDATE_H
-
-#include "../database.h"
-
-struct ManifestEntry {
-	int         version{};     // database version of the migration
-	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-	std::string check{};       // query that checks against the condition
-	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-};
-
-struct DatabaseVersion {
-	int server_database_version;
-	int bots_database_version;
-};
-
-class DatabaseUpdate {
-public:
-	DatabaseVersion GetDatabaseVersions();
-	DatabaseVersion GetBinaryDatabaseVersions();
-	void CheckDbUpdates();
-	std::string GetQueryResult(std::string query);
-	static bool ShouldRunMigration(ManifestEntry &e, std::string query_result);
-	bool UpdateManifest(std::vector<ManifestEntry> entries, int version_low, int version_high);
-
-	DatabaseUpdate *SetDatabase(Database *db);
-	bool HasPendingUpdates();
-private:
-	Database *m_database;
-	static bool CheckVersions(DatabaseVersion v, DatabaseVersion b);
-	void InjectBotsVersionColumn();
-};
-
-#endif //EQEMU_DATABASE_UPDATE_H
@@ -1,84 +0,0 @@
-#include "database_update.h"
-
-std::vector<ManifestEntry> bot_manifest_entries = {
-	ManifestEntry{
-		.version = 9035,
-		.description = "2022_12_04_bot_archery.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'archery_setting'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `archery_setting` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0' AFTER `enforce_spell_settings`;
-)",
-	},
-	ManifestEntry{
-		.version = 9036,
-		.description = "2023_01_19_drop_bot_views.sql",
-		.check = "SHOW TABLES LIKE 'vw_groups'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-DROP VIEW vw_bot_groups;
-DROP VIEW vw_bot_character_mobs;
-DROP VIEW vw_groups;
-DROP VIEW vw_guild_members;
-DROP TABLE bot_guild_members;
-
-)",
-	},
-	ManifestEntry{
-		.version = 9037,
-		.description = "2023_01_22_add_name_index.sql",
-		.check = "show index from bot_data WHERE key_name = 'name`",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-create index `name` on bot_data(`name`);
-)",
-	},
-	ManifestEntry{
-		.version = 9038,
-		.description = "2023_02_16_add_caster_range.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'caster_range'",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `caster_range` INT(11) UNSIGNED NOT NULL DEFAULT '300' AFTER `archery_setting`;
-)",
-	},
-	ManifestEntry{
-		.version = 9039,
-		.description = "2023_03_31_remove_bot_groups.sql",
-		.check = "SHOW TABLES LIKE 'bot_groups'",
-		.condition = "",
-		.match = "not_empty",
-		.sql = R"(
-SET FOREIGN_KEY_CHECKS = 0;
-DROP TABLE IF EXISTS `bot_groups`;
-DROP TABLE IF EXISTS `bot_group_members`;
-SET FOREIGN_KEY_CHECKS = 1;
-)",
-	},
-// -- template; copy/paste this when you need to create a new entry
-//	ManifestEntry{
-//		.version = 9228,
-//		.description = "some_new_migration.sql",
-//		.check = "SHOW COLUMNS FROM `table_name` LIKE 'column_name'",
-//		.condition = "empty",
-//		.match = "",
-//		.sql = R"(
-//
-//)"
-};
-
-// see struct definitions for what each field does
-// struct ManifestEntry {
-// 	int         version{};     // database version of the migration
-// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-// 	std::string check{};       // query that checks against the condition
-// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-// };
@@ -429,6 +429,8 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)

 void Database::DeleteInstance(uint16 instance_id)
 {
+	std::string query;
+
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));

 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
@@ -68,7 +68,7 @@ namespace DatabaseSchema {
 			{"character_spells",               "id"},
 			{"character_task_timers",          "character_id"},
 			{"character_tasks",                "charid"},
-			{"character_tribute",              "character_id"},
+			{"character_tribute",              "id"},
 			{"completed_tasks",                "charid"},
 			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
@@ -392,6 +392,9 @@ namespace DatabaseSchema {
 			"bot_command_settings",
 			"bot_create_combinations",
 			"bot_data",
+			"bot_group_members",
+			"bot_groups",
+			"bot_guild_members",
 			"bot_heal_rotation_members",
 			"bot_heal_rotation_targets",
 			"bot_heal_rotations",
@@ -13,7 +13,6 @@
 #include <iostream>
 #include <mysqld_error.h>
 #include <string.h>
-#include "strings.h"

 #ifdef _WINDOWS
 #define snprintf	_snprintf
@@ -75,13 +74,13 @@ void DBcore::ping()
 	m_mutex->unlock();
 }

-MySQLRequestResult DBcore::QueryDatabase(const std::string& query, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureOnce)
 {
 	auto r = QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 	return r;
 }

-bool DBcore::DoesTableExist(const std::string& table_name)
+bool DBcore::DoesTableExist(std::string table_name)
 {
 	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));

@@ -137,7 +136,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		/**
 		 * Error logging
 		 */
-		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
+		if (mysql_errno(mysql) > 0 && strlen(query) > 0) {
 			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}

@@ -306,92 +305,3 @@ void DBcore::SetMutex(Mutex *mutex)

 	DBcore::m_mutex = mutex;
 }
-
-// executes multiple statements in one query
-// do not use this in application logic
-// this was built and maintained for database migrations only
-MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
-{
-	SetMultiStatementsOn();
-
-	BenchTimer timer;
-	timer.reset();
-
-	LockMutex lock(m_mutex);
-
-	// Reconnect if we are not connected before hand.
-	if (pStatus != Connected) {
-		Open();
-	}
-
-	int status = mysql_real_query(mysql, query.c_str(), query.length());
-	if (status != 0) {
-		unsigned int error_number = mysql_errno(mysql);
-
-		if (error_number == CR_SERVER_GONE_ERROR) {
-			pStatus = Error;
-		}
-
-		// error logging
-		if (mysql_errno(mysql) > 0 && query.length() > 0 && mysql_errno(mysql) != 1065) {
-			std::string error_raw   = fmt::format("{}", mysql_error(mysql));
-			std::string mysql_err   = Strings::Trim(error_raw);
-			std::string clean_query = Strings::Replace(query, "\n", "");
-			LogMySQLQuery("[{}] ({}) query [{}]", mysql_err, mysql_errno(mysql), clean_query);
-		}
-	}
-
-	auto result = MySQLRequestResult{};
-
-	int index = 0;
-
-	// there could be a query with a semicolon in the actual data, this is best effort for
-	// logging / display purposes
-	// rare that we see this when this is only used in DDL statements
-	auto pieces = Strings::Split(query, ";");
-
-	// process each statement result
-	do {
-		uint32    row_count = 0;
-		MYSQL_RES *res      = mysql_store_result(mysql);
-
-		result = MySQLRequestResult(
-			res,
-			(uint32) mysql_affected_rows(mysql),
-			row_count,
-			(uint32) mysql_field_count(mysql),
-			(uint32) mysql_insert_id(mysql)
-		);
-
-		if (pieces.size() >= index) {
-			auto piece = pieces[index];
-			LogMySQLQuery(
-				"{} -- ({} row{} affected) ({}s)",
-				piece,
-				result.RowsAffected(),
-				result.RowsAffected() == 1 ? "" : "s",
-				std::to_string(timer.elapsed())
-			);
-		}
-
-		if (res) {
-			row_count = (uint32) mysql_num_rows(res);
-			mysql_free_result(res);
-		}
-
-		// more results? -1 = no, >0 = error, 0 = yes (keep looping)
-		if ((status = mysql_next_result(mysql)) > 0) {
-			if (mysql_errno(mysql) > 0) {
-				LogMySQLError("[{}] [{}]", mysql_errno(mysql), mysql_error(mysql));
-			}
-
-			// we handle errors elsewhere
-			return result;
-		}
-		index++;
-	} while (status == 0);
-
-	SetMultiStatementsOff();
-
-	return result;
-}
@@ -24,8 +24,7 @@ public:
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
 	MySQLRequestResult QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
+	MySQLRequestResult QueryDatabase(std::string query, bool retryOnFailureOnce = true);
 	void TransactionBegin();
 	void TransactionCommit();
 	void TransactionRollback();
@@ -36,7 +35,7 @@ public:
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);

-	bool DoesTableExist(const std::string& table_name);
+	bool DoesTableExist(std::string table_name);

 	void SetMySQL(const DBcore &o)
 	{
@@ -78,20 +77,8 @@ private:
 	uint32 pPort;
 	bool   pSSL;

-	// allows multiple queries to be executed within the same query
-	// do not use this under normal operation
-	// we use this during database migrations only currently
-	void SetMultiStatementsOn()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_ON);
-	}
-
-	// disables multiple statements to be executed in one query
-	void SetMultiStatementsOff()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
-	}
 };


 #endif
+
@@ -27,6 +27,9 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
+	httplib::Headers headers = {
+		{"Content-Type", "application/json"}
+	};

 	// payload
 	Json::Value p;
@@ -93,6 +96,9 @@ void Discord::SendPlayerEventMessage(
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
+	httplib::Headers headers = {
+		{"Content-Type", "application/json"}
+	};

 	std::string payload = PlayerEventLogs::GetDiscordPayloadFromEvent(e);
 	if (payload.empty()) {
@@ -37,7 +37,7 @@ void DiscordManager::ProcessMessageQueue()
 					message,
 					webhook.webhook_url
 				);
-				message.clear();
+				message = "";
 			}

 			message += m;
@@ -51,7 +51,7 @@ void DiscordManager::ProcessMessageQueue()
 						webhook.webhook_url
 					);
 				}
-				message.clear();
+				message = "";
 			}
 		}
 		// final flush
@@ -197,11 +197,11 @@ const std::map<int, std::string>& EQ::constants::GetLanguageMap()

 std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
-		return std::string();
+	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		return EQ::constants::GetLanguageMap().find(language_id)->second;
 	}

-	return EQ::constants::GetLanguageMap().find(language_id)->second;
+	return std::string();
 }

 const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
@@ -220,11 +220,11 @@ const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()

 std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 {
-	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return std::string();
+	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 	}

-	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+	return std::string();
 }

 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -243,11 +243,11 @@ const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()

 std::string EQ::constants::GetFlyModeName(int8 flymode_id)
 {
-	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return std::string();
+	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
 	}

-	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
+	return std::string();
 }

 const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
@@ -365,11 +365,11 @@ const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()

 std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
 {
-	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
-		return std::string();;
+	if (EQ::constants::GetConsiderLevelMap().find(faction_consider_level) != EQ::constants::GetConsiderLevelMap().end()) {
+		return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
 	}

-	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
@@ -386,11 +386,11 @@ const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()

 std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
 {
-	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return std::string();
+	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
 	}

-	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
@@ -407,11 +407,11 @@ const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()

 std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
 {
-	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return std::string();
+	if (EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
+		return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
 	}

-	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
@@ -429,11 +429,11 @@ const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()

 std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 {
-	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return std::string();
+	if (EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
+		return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
 	}

-	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
+	return std::string();
 }

 const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
@@ -507,12 +507,11 @@ const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()

 std::string EQ::constants::GetObjectTypeName(int object_type)
 {
-	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return std::string();
-
+	if (EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
+		return EQ::constants::GetObjectTypeMap().find(object_type)->second;
 	}

-	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
@@ -528,11 +527,11 @@ const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()

 std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
 {
-	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return std::string();
+	if (EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
+		return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
 	}

-	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
@@ -554,11 +553,11 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()

 std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 {
-	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return std::string();
+	if (EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
+		return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
 	}

-	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
@@ -574,9 +573,9 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()

 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
-		return std::string();
+	if (EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+		return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 	}

-	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
+	return std::string();
 }
@@ -593,29 +593,4 @@ enum class ApplySpellType {
 	Raid
 };

-
-namespace HeroicBonusBucket
-{
-	const std::string WisMaxMana 			= "HWIS-MaxMana";
-	const std::string WisManaRegen			= "HWIS-ManaRegen";
-	const std::string WisHealAmt			= "HWIS-HealAmt";
-	const std::string IntMaxMana			= "HINT-MaxMana";
-	const std::string IntManaRegen			= "HINT-ManaRegen";
-	const std::string IntSpellDmg			= "HINT-SpellDmg";
-	const std::string StrMeleeDamage		= "HSTR-MeleeDamage";
-	const std::string StrShieldAC			= "HSTR-ShieldAC";
-	const std::string StrMaxEndurance		= "HSTR-MaxEndurance";
-	const std::string StrEnduranceRegen		= "HSTR-EnduranceRegen";
-	const std::string StaMaxHP			= "HSTA-MaxHP";
-	const std::string StaHPRegen			= "HSTA-HPRegen";
-	const std::string StaMaxEndurance		= "HSTA-MaxEndurance";
-	const std::string StaEnduranceRegen		= "HSTA-EnduranceRegen";
-	const std::string AgiAvoidance			= "HAGI-Avoidance";
-	const std::string AgiMaxEndurance		= "HAGI-MaxEndurance";
-	const std::string AgiEnduranceRegen		= "HAGI-EnduranceRegen";
-	const std::string DexRangedDamage		= "HDEX-RangedDamage";
-	const std::string DexMaxEndurance		= "HDEX-MaxEndurance";
-	const std::string DexEnduranceRegen		= "HDEX-EnduranceRegen";
-}
-
 #endif /*COMMON_EMU_CONSTANTS_H*/
@@ -1045,11 +1045,4 @@ enum ResurrectionActions
 	Accept
 };

-enum ScribeSpellActions
-{
-	Scribe,
-	Memorize,
-	Unmemorize
-};
-
 #endif /*COMMON_EQ_CONSTANTS_H*/
@@ -129,7 +129,7 @@ namespace EQ

 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				const InventoryTypeSize_Struct& InventoryTypeSize,
+				InventoryTypeSize_Struct InventoryTypeSize,
 				uint64 EquipmentBitmask,
 				uint64 GeneralBitmask,
 				uint64 CursorBitmask,
@@ -236,6 +236,26 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }

+/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
+:	BasePacket(buf, len),
+	opcode(op)
+{
+
+uint32 offset;
+	opcode=ntohs(*(const uint16 *)buf);
+	offset=2;
+
+	if (len-offset) {
+		pBuffer= new unsigned char[len-offset];
+		memcpy(pBuffer,buf+offset,len-offset);
+		size=len-offset;
+	} else {
+		pBuffer=nullptr;
+		size=0;
+	}
+	OpMgr=&RawOpcodeManager;
+}*/
+
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
@@ -267,6 +287,74 @@ bool result=false;

 }

+/*
+this is the code to do app-layer combining, instead of protocol layer.
+this was taken out due to complex interactions with the opcode manager,
+and will require a bit more thinking (likely moving into EQStream) to
+get running again... but might be a good thing some day.
+
+bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
+{
+uint32 newsize=0, offset=0;
+unsigned char *tmpbuffer=nullptr;
+
+	if (opcode!=OP_AppCombined) {
+		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		offset=0;
+		if (size>254) {
+			tmpbuffer[offset++]=0xff;
+			*(uint16 *)(tmpbuffer+offset)=htons(size);
+			offset+=1;
+		} else {
+			tmpbuffer[offset++]=size;
+		}
+		offset+=serialize(tmpbuffer+offset);
+	} else {
+		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		memcpy(tmpbuffer,pBuffer,size);
+		offset=size;
+	}
+
+	if (rhs->size>254) {
+		tmpbuffer[offset++]=0xff;
+		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
+		offset+=1;
+	} else {
+		tmpbuffer[offset++]=rhs->size;
+	}
+	offset+=rhs->serialize(tmpbuffer+offset);
+
+	size=offset;
+	opcode=OP_AppCombined;
+
+	delete[] pBuffer;
+	pBuffer=tmpbuffer;
+
+	return true;
+}
+*/
+
+bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
+{
+bool valid=false;
+	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
+	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
+		valid=true;
+	} else {
+		uint16 comp_crc=CRC16(buffer,length-2,Key);
+		uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2));
+#ifdef EQN_DEBUG
+		if (packet_crc && comp_crc != packet_crc) {
+			std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl;
+		}
+#endif
+		valid = (!packet_crc || comp_crc == packet_crc);
+	}
+	return valid;
+}
+
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
 uint32 newlen=0;
@@ -315,6 +403,55 @@ uint32 flag_offset=1,newlength;
 	return newlength;
 }

+void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
+{
+	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=DecodeKey;
+		unsigned char *test=(unsigned char *)malloc(size);
+		buffer+=2;
+		size-=2;
+
+		int i;
+		for (i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = (*(int*)&buffer[i]);
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
+void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
+{
+	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=EncodeKey;
+		char *test=(char*)malloc(size);
+		int i;
+		buffer+=2;
+		size-=2;
+		for ( i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = pt;
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
 EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
@@ -378,4 +515,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}
@@ -80,8 +80,11 @@ public:

 protected:

+	static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key);
 	static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
 	static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
+	static void ChatDecode(unsigned char *buffer, int size, int DecodeKey);
+	static void ChatEncode(unsigned char *buffer, int size, int EncodeKey);

 	uint16 GetRawOpcode() const { return(opcode); }

@@ -1793,17 +1793,6 @@ struct GMSummon_Struct {
 /*104*/	uint32	unknown2; // E0 E0 56 00
 };

-struct GMFind_Struct {
-	char	charname[64];
-	char	gmname[64];
-	uint32	success;
-	uint32	zoneID;
-	float	x;
-	float	y;
-	float	z;
-	uint32	unknown2;
-};
-
 struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense as own packet
 /*  0*/ char	charname[64];

@@ -5533,11 +5522,7 @@ struct ServerLootItem_Struct {
 	uint32 aug_4;		  // uint32	aug_4;
 	uint32 aug_5;		  // uint32	aug_5;
 	uint32 aug_6;		  // uint32	aug_5;
-	bool attuned;
-	std::string custom_data;
-	uint32 ornamenticon {};
-	uint32 ornamentidfile {};
-	uint32 ornament_hero_model {};
+	uint8  attuned;
 	uint16 trivial_min_level;
 	uint16 trivial_max_level;
 	uint16 npc_min_level;
@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }

-void EQStreamIdentifier::RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -145,7 +145,7 @@ void EQStreamIdentifier::Process() {
 }

 void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> eqs) {
-	m_streams.emplace_back(Record(eqs));
+	m_streams.push_back(Record(eqs));
 	eqs = nullptr;
 }

@@ -18,7 +18,7 @@ public:
 	~EQStreamIdentifier();

 	//registration interface.
-	void RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);

 	//main processing interface
 	void Process();
@@ -23,6 +23,9 @@

 EQDB EQDB::s_EQDB;

+EQDB::EQDB() {
+}
+
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }
@@ -27,7 +27,7 @@

 //this is the main object exported to perl.
 class EQDB {
-	EQDB() = default;
+	EQDB();
 public:
 	static EQDB *Singleton() { return(&s_EQDB); }

@@ -34,13 +34,13 @@ void EQEmuConfig::parse_config()
 	LongName     = _root["server"]["world"].get("longname", "").asString();
 	WorldAddress = _root["server"]["world"].get("address", "").asString();
 	LocalAddress = _root["server"]["world"].get("localaddress", "").asString();
-	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString());
+	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString().c_str());
 	SharedKey    = _root["server"]["world"].get("key", "").asString();
 	LoginCount   = 0;

 	if (_root["server"]["world"]["loginserver"].isObject()) {
 		LoginHost   = _root["server"]["world"]["loginserver"].get("host", "login.eqemulator.net").asString();
-		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString());
+		LoginPort   = Strings::ToInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString().c_str());
 		LoginLegacy = false;
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
@@ -63,7 +63,7 @@ void EQEmuConfig::parse_config()

 			auto loginconfig = new LoginConfig;
 			loginconfig->LoginHost     = _root["server"]["world"][str].get("host", "login.eqemulator.net").asString();
-			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString());
+			loginconfig->LoginPort     = Strings::ToInt(_root["server"]["world"][str].get("port", "5998").asString().c_str());
 			loginconfig->LoginAccount  = _root["server"]["world"][str].get("account", "").asString();
 			loginconfig->LoginPassword = _root["server"]["world"][str].get("password", "").asString();

@@ -85,22 +85,16 @@ void EQEmuConfig::parse_config()
 	//The only way to enable locked is by switching to true, meaning this value is always false until manually set true
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; }
-
-	auto_database_updates = false;
-	if (_root["server"].get("auto_database_updates", "true").asString() == "true") {
-		auto_database_updates = true;
-	}
-
 	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
-	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());
+	WorldTCPPort = Strings::ToInt(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str());

 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
-	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString());
+	TelnetTCPPort = Strings::ToInt(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str());
 	TelnetEnabled = false;
 	if (_root["server"]["world"]["telnet"].get("enabled", "false").asString() == "true") { TelnetEnabled = true; }

 	WorldHTTPMimeFile = _root["server"]["world"]["http"].get("mimefile", "mime.types").asString();
-	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString());
+	WorldHTTPPort     = Strings::ToInt(_root["server"]["world"]["http"].get("port", "9080").asString().c_str());
 	WorldHTTPEnabled  = false;

 	if (_root["server"]["world"]["http"].get("enabled", "false").asString() == "true") {
@@ -115,9 +109,9 @@ void EQEmuConfig::parse_config()
 	 * UCS
 	 */
 	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
-	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
+	ChatPort = Strings::ToInt(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
 	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
-	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());
+	MailPort = Strings::ToInt(_root["server"]["mailserver"].get("port", "7778").asString().c_str());

 	/**
 	 * Database
@@ -125,7 +119,7 @@ void EQEmuConfig::parse_config()
 	DatabaseUsername = _root["server"]["database"].get("username", "eq").asString();
 	DatabasePassword = _root["server"]["database"].get("password", "eq").asString();
 	DatabaseHost     = _root["server"]["database"].get("host", "localhost").asString();
-	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString());
+	DatabasePort     = Strings::ToInt(_root["server"]["database"].get("port", "3306").asString().c_str());
 	DatabaseDB       = _root["server"]["database"].get("db", "eq").asString();

 	/**
@@ -134,14 +128,14 @@ void EQEmuConfig::parse_config()
 	ContentDbUsername = _root["server"]["content_database"].get("username", "").asString();
 	ContentDbPassword = _root["server"]["content_database"].get("password", "").asString();
 	ContentDbHost     = _root["server"]["content_database"].get("host", "").asString();
-	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString());
+	ContentDbPort     = Strings::ToInt(_root["server"]["content_database"].get("port", 0).asString().c_str());
 	ContentDbName     = _root["server"]["content_database"].get("db", "").asString();

 	/**
 	 * QS
 	 */
 	QSDatabaseHost     = _root["server"]["qsdatabase"].get("host", "localhost").asString();
-	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString());
+	QSDatabasePort     = Strings::ToInt(_root["server"]["qsdatabase"].get("port", "3306").asString().c_str());
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
@@ -149,9 +143,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
+	DefaultStatus = Strings::ToInt(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
+	ZonePortLow   = Strings::ToInt(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
+	ZonePortHigh  = Strings::ToInt(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());

 	/**
 	 * Files
@@ -181,10 +175,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
+	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
+	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
+	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
+	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
@@ -120,8 +120,6 @@ class EQEmuConfig
 		uint16 ZonePortHigh;
 		uint8 DefaultStatus;

-		bool auto_database_updates;
-
 //	uint16 DynamicCount;

 //	map<string,uint16> StaticZones;
@@ -149,6 +147,12 @@ class EQEmuConfig
 			return (_config);
 		}

+		// Allow the use to set the conf file to be used.
+		static void SetConfigFile(std::string file)
+		{
+			EQEmuConfig::ConfigFile = file;
+		}
+
 		// Load the config
 		static bool LoadConfig(const std::string& path = "")
 		{
@@ -104,9 +104,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * RFC 5424
 	 */
-	log_settings[Logs::Error].log_to_console   = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Warning].log_to_console = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_console    = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);

 	/**
 	 * Set Category enabled status on defaults
@@ -187,10 +187,9 @@ void EQEmuLogSys::ProcessLogWrite(
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
-		case Logs::Crash:
-		case Logs::Error:
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
+		case Logs::Error:
 			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
@@ -200,6 +199,8 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 		case Logs::Commands:
 		case Logs::Mercenaries:
 			return Chat::Magenta;
+		case Logs::Crash:
+			return Chat::Red;
 		default:
 			return Chat::Yellow;
 	}
@@ -219,7 +220,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	int line
 )
 {
-	bool is_error   = (
+	bool is_error = (
 		log_category == Logs::LogCategory::Error ||
 		log_category == Logs::LogCategory::MySQLError ||
 		log_category == Logs::LogCategory::Crash ||
@@ -261,7 +262,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	}

 	if (log_category == Logs::LogCategory::MySQLQuery) {
-		auto s = Strings::Split(message, "--");
+		auto        s     = Strings::Split(message, "--");
 		if (s.size() > 1) {
 			std::string query = Strings::Trim(s[0]);
 			std::string meta  = Strings::Trim(s[1]);
@@ -297,76 +298,19 @@ void EQEmuLogSys::ProcessConsoleMessage(
 					}
 				}

-				// color matching in []
-				// ex: [<red>variable] would produce [variable] with red inside brackets
-				std::map<std::string, rang::fgB> colors = {
-					{"<black>",   rang::fgB::black},
-					{"<green>",   rang::fgB::green},
-					{"<yellow>",  rang::fgB::yellow},
-					{"<blue>",    rang::fgB::blue},
-					{"<magenta>", rang::fgB::magenta},
-					{"<cyan>",    rang::fgB::cyan},
-					{"<gray>",    rang::fgB::gray},
-					{"<red>",     rang::fgB::red},
-				};
-
-				bool      match_color = false;
-				for (auto &c: colors) {
-					if (Strings::Contains(e, c.first)) {
-						e = Strings::Replace(e, c.first, "");
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< c.second
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-						match_color = true;
-					}
+				if (!is_upper) {
+					(!is_error ? std::cout : std::cerr)
+						<< rang::fgB::gray
+						<< "["
+						<< rang::style::bold
+						<< rang::fgB::yellow
+						<< e
+						<< rang::fgB::gray
+						<< "] "
+						;
 				}
-
-				// string match to colors
-				std::map<std::string, rang::fgB> matches = {
-					{"missing", rang::fgB::red},
-					{"error",   rang::fgB::red},
-					{"ok",      rang::fgB::green},
-				};
-
-				for (auto &c: matches) {
-					if (Strings::Contains(e, c.first)) {
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< c.second
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-						match_color = true;
-					}
-				}
-
-				// if we don't match a color in either the string matching or
-				// the color tag matching, we default to yellow inside brackets
-				// if uppercase, does not get colored
-				if (!match_color) {
-					if (!is_upper) {
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< rang::fgB::yellow
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-					}
-					else {
-						(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
-					}
+				else {
+					(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
 				}
 			}
 			else {
@@ -580,8 +524,6 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 */
 void EQEmuLogSys::SilenceConsoleLogging()
 {
-	std::copy(std::begin(log_settings), std::end(log_settings), std::begin(pre_silence_settings));
-
 	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
 		log_settings[log_index].log_to_console      = 0;
 		log_settings[log_index].is_category_enabled = 0;
@@ -595,7 +537,10 @@ void EQEmuLogSys::SilenceConsoleLogging()
 */
 void EQEmuLogSys::EnableConsoleLogging()
 {
-	std::copy(std::begin(pre_silence_settings), std::end(pre_silence_settings), std::begin(log_settings));
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = Logs::General;
+		log_settings[log_index].is_category_enabled = 1;
+	}
 }

 EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
@@ -797,16 +742,3 @@ EQEmuLogSys *EQEmuLogSys::SetLogPath(const std::string &log_path)
 	return this;
 }

-void EQEmuLogSys::DisableMySQLErrorLogs()
-{
-	log_settings[Logs::MySQLError].log_to_file    = 0;
-	log_settings[Logs::MySQLError].log_to_console = 0;
-	log_settings[Logs::MySQLError].log_to_gmsay   = 0;
-}
-
-void EQEmuLogSys::EnableMySQLErrorLogs()
-{
-	log_settings[Logs::MySQLError].log_to_file    = 1;
-	log_settings[Logs::MySQLError].log_to_console = 1;
-	log_settings[Logs::MySQLError].log_to_gmsay   = 1;
-}
@@ -324,9 +324,6 @@ public:
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};

-	// temporary bucket to re-load after silencing
-	LogSettings pre_silence_settings[Logs::LogCategory::MaxCategoryID]{};
-
 	struct LogEnabled {
 		bool log_to_file_enabled;
 		bool log_to_console_enabled;
@@ -377,9 +374,6 @@ public:
 	[[nodiscard]] const std::string &GetLogPath() const;
 	EQEmuLogSys * SetLogPath(const std::string &log_path);

-	void DisableMySQLErrorLogs();
-	void EnableMySQLErrorLogs();
-
 private:

 	// reference to database
@@ -58,6 +58,10 @@ EQTime::EQTime()
 	SetCurrentEQTimeOfDay(start, time(0));
 }

+EQTime::~EQTime()
+{
+}
+
 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
 //This function was written by the ShowEQ Project.
 //Input: Current Time (as a time_t), a pointer to the TimeOfDay_Struct that will be written to.
@@ -199,4 +203,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 		t->month, t->day, t->year, t->hour, t->minute);
 	buf[127] = '\0';
 	str = buf;
-}
+}
@@ -18,7 +18,7 @@ public:
 	//Constructor/destructor
 	EQTime(TimeOfDay_Struct start_eq, time_t start_real);
 	EQTime();
-	~EQTime() = default;
+	~EQTime();

 	//Get functions
 	int GetCurrentEQTimeOfDay( TimeOfDay_Struct *eqTimeOfDay ) { return(GetCurrentEQTimeOfDay(time(nullptr), eqTimeOfDay)); }
@@ -38,7 +38,7 @@ namespace EQ
 				_running = true;

 				for (size_t i = 0; i < threads; ++i) {
-					_threads.emplace_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
 				}
 			}
 			
@@ -333,10 +333,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
 			break;
 		}
-		case PlayerEvent::FISH_FAILURE:
-		case PlayerEvent::FORAGE_FAILURE:
-		case PlayerEvent::WENT_ONLINE:
-		case PlayerEvent::WENT_OFFLINE: {
+		case PlayerEvent::FISH_FAILURE: {
 			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
 			break;
 		}
@@ -351,6 +348,10 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
 			break;
 		}
+		case PlayerEvent::FORAGE_FAILURE: {
+			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
+			break;
+		}
 		case PlayerEvent::FORAGE_SUCCESS: {
 			PlayerEvent::ForageSuccessEvent n{};
 			std::stringstream               ss;
@@ -549,6 +550,11 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
 			break;
 		}
+		case PlayerEvent::WENT_ONLINE:
+		case PlayerEvent::WENT_OFFLINE: {
+			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
+			break;
+		}
 		case PlayerEvent::MERCHANT_PURCHASE: {
 			PlayerEvent::MerchantPurchaseEvent n{};
 			std::stringstream                  ss;
@@ -384,7 +384,7 @@ namespace PlayerEvent {
 	};

 	struct AAPurchasedEvent {
-		uint32 aa_id;
+		int32 aa_id;
 		int32 aa_cost;
 		int32 aa_previous_id;
 		int32 aa_next_id;
@@ -218,14 +218,14 @@ enum {	//some random constants
 #define HARD_LEVEL_CAP 127

 //the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
-#define USE_NPC_RANGE2 40000		//arbitrary right now
+#define USE_NPC_RANGE2 200*200		//arbitrary right now

 // Squared range for rampage 75.0 * 75.0 for now
 #define NPC_RAMPAGE_RANGE2 5625.0f

 //the formula for experience for killing a mob.
 //level is the only valid variable to use
-#define EXP_FORMULA (level * level * 75 * 35 / 10)
+#define EXP_FORMULA level*level*75*35/10

 #define HIGHEST_AA_VALUE 35

@@ -295,7 +295,7 @@ Developer configuration

 #define COMMON_PROFILE

-#define PROFILE_DUMP_TIME 180
+#define PROFILE_DUMP_TIME 3*60
 #endif	//EQPROFILE


@@ -37,7 +37,6 @@

 #include <fmt/format.h>
 #include <filesystem>
-#include <iostream>

 namespace fs = std::filesystem;

@@ -81,26 +80,3 @@ std::string File::GetCwd()
 {
 	return fs::current_path().string();
 }
-
-FileContentsResult File::GetContents(const std::string &file_name)
-{
-	std::string   error;
-	std::ifstream f;
-	f.open(file_name);
-	std::string line;
-	std::string lines;
-	if (f.is_open()) {
-		while (f) {
-			std::getline(f, line);
-			lines += line + "\n";
-		}
-	}
-	else {
-		error = fmt::format("Couldn't open file [{}]", file_name);
-	}
-
-	return FileContentsResult{
-		.contents = lines,
-		.error = error,
-	};
-}
@@ -25,16 +25,10 @@

 namespace fs = std::filesystem;

-struct FileContentsResult {
-	std::string contents;
-	std::string error;
-};
-
 class File {
 public:
 	static bool Exists(const std::string &name);
 	static void Makedir(const std::string& directory_name);
-	static FileContentsResult GetContents(const std::string &file_name);
 	static std::string FindEqemuConfigPath();
 	static std::string GetCwd();
 };
@@ -61,7 +61,7 @@ bool BaseGuildManager::LoadGuilds() {
 	}

 	for (auto row=results.begin();row!=results.end();++row)
-		_CreateGuild(Strings::ToUnsignedInt(row[0]), row[1], Strings::ToUnsignedInt(row[2]), Strings::ToUnsignedInt(row[3]), row[4], row[5], row[6], row[7]);
+		_CreateGuild(Strings::ToInt(row[0]), row[1], Strings::ToInt(row[2]), Strings::ToInt(row[3]), row[4], row[5], row[6], row[7]);

 	LogInfo("Loaded [{}] Guilds", Strings::Commify(std::to_string(results.RowCount())));

@@ -75,8 +75,8 @@ bool BaseGuildManager::LoadGuilds() {

 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint32 guild_id = Strings::ToUnsignedInt(row[0]);
-		uint8 rankn = Strings::ToUnsignedInt(row[1]);
+		uint32 guild_id = Strings::ToInt(row[0]);
+		uint8 rankn = Strings::ToInt(row[1]);

 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -131,7 +131,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {

 	auto row = results.begin();

-	info = _CreateGuild(guild_id, row[0], Strings::ToUnsignedInt(row[1]), Strings::ToUnsignedInt(row[2]), row[3], row[4], row[5], row[6]);
+	info = _CreateGuild(guild_id, row[0], Strings::ToInt(row[1]), Strings::ToInt(row[2]), row[3], row[4], row[5], row[6]);

    query = StringFormat("SELECT guild_id, `rank`, title, can_hear, can_speak, can_invite, can_remove, can_promote, can_demote, can_motd, can_warpeace "
                        "FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id);
@@ -144,7 +144,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {

 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint8 rankn = Strings::ToUnsignedInt(row[1]);
+		uint8 rankn = Strings::ToInt(row[1]);

 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -787,7 +787,9 @@ bool BaseGuildManager::GetBankerFlag(uint32 CharID)

 	auto row = results.begin();

-	return Strings::ToBool(row[0]);
+	bool IsBanker = Strings::ToInt(row[0]);
+
+	return IsBanker;
 }

 bool BaseGuildManager::DBSetAltFlag(uint32 charid, bool is_alt)
@@ -815,7 +817,9 @@ bool BaseGuildManager::GetAltFlag(uint32 CharID)

 	auto row = results.begin();

-	return Strings::ToBool(row[0]);
+	bool IsAlt = Strings::ToInt(row[0]);
+
+	return IsAlt;
 }

 bool BaseGuildManager::DBSetTributeFlag(uint32 charid, bool enabled) {
@@ -869,18 +873,18 @@ bool BaseGuildManager::QueryWithLogging(std::string query, const char *errmsg) {
 " FROM `character_data` AS c LEFT JOIN `guild_members` AS g ON c.`id` = g.`char_id` "
 static void ProcessGuildMember(MySQLRequestRow row, CharGuildInfo &into) {
 	//fields from `characer_`
-	into.char_id		= Strings::ToUnsignedInt(row[0]);
+	into.char_id		= Strings::ToInt(row[0]);
 	into.char_name		= row[1];
-	into.class_			= Strings::ToUnsignedInt(row[2]);
-	into.level			= Strings::ToUnsignedInt(row[3]);
+	into.class_			= Strings::ToInt(row[2]);
+	into.level			= Strings::ToInt(row[3]);
 	into.time_last_on	= Strings::ToUnsignedInt(row[4]);
-	into.zone_id		= Strings::ToUnsignedInt(row[5]);
+	into.zone_id		= Strings::ToInt(row[5]);

 	//fields from `guild_members`, leave at defaults if missing
-	into.guild_id		= row[6] ? Strings::ToUnsignedInt(row[6]) : GUILD_NONE;
-	into.rank			= row[7] ? Strings::ToUnsignedInt(row[7]) : (GUILD_MAX_RANK+1);
+	into.guild_id		= row[6] ? Strings::ToInt(row[6]) : GUILD_NONE;
+	into.rank			= row[7] ? Strings::ToInt(row[7]) : (GUILD_MAX_RANK+1);
 	into.tribute_enable = row[8] ? (row[8][0] == '0'?false:true) : false;
-	into.total_tribute	= row[9] ? Strings::ToUnsignedInt(row[9]) : 0;
+	into.total_tribute	= row[9] ? Strings::ToInt(row[9]) : 0;
 	into.last_tribute	= row[10]? Strings::ToUnsignedInt(row[10]) : 0;		//timestamp
 	into.banker			= row[11]? (row[11][0] == '0'?false:true) : false;
 	into.public_note	= row[12]? row[12] : "";
@@ -6690,7 +6690,7 @@ static WSInit wsinit_;
 		if (params.empty()) { return Get(path, headers); }

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, progress);
+		return Get(path_with_query.c_str(), headers, progress);
 	}

 	inline Result ClientImpl::Get(const std::string &path, const Params &params,
@@ -6710,7 +6710,7 @@ static WSInit wsinit_;
 		}

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, response_handler,
+		return Get(path_with_query.c_str(), headers, response_handler,
 				   content_receiver, progress);
 	}

@@ -6807,7 +6807,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body = detail::serialize_multipart_formdata(
 			items, detail::make_multipart_data_boundary(), content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}

 	inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
@@ -6820,7 +6820,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body =
 						detail::serialize_multipart_formdata(items, boundary, content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}

 	inline Result ClientImpl::Put(const std::string &path) {
@@ -412,12 +412,11 @@ bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 		// If there are no charges left on the item,
 		if (item_to_delete->GetCharges() <= 0) {
 			// If the item is stackable (e.g arrows), or
-			// the item is not a charged item, or is expendable, delete it
-			if (
-				item_to_delete->IsStackable() ||
-				item_to_delete->GetItem()->MaxCharges == 0 ||
-				item_to_delete->IsExpendable()
-			) {
+			// the item is not stackable, and is not a charged item, or is expendable, delete it
+			if (item_to_delete->IsStackable() ||
+				(!item_to_delete->IsStackable() &&
+				 ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))
+				) {
 				// Item can now be destroyed
 				InventoryProfile::MarkDirty(item_to_delete);
 				return true;
@@ -203,12 +203,12 @@ namespace EQ
 		void dumpBankItems();
 		void dumpSharedBankItems();

-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, const std::string& value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, int value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, float value);
-		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);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
+		std::string GetCustomItemData(int16 slot_id, std::string identifier);
+		static const int GetItemStatValue(uint32 item_id, std::string identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods
@@ -131,7 +131,7 @@ namespace EQ
 			Mounts?
 			Ornamentations?
 			GuildBanners?
-			Collectible?
+			Collectible? 
 			Placeable?
 			(others?)
 */
@@ -355,186 +355,181 @@ namespace EQ

 	struct ItemData {
 		// Non packet based fields
-		uint8	MinStatus {};
+		uint8	MinStatus;

 		// Packet based fields
-		uint8	ItemClass {};		// Item Type: 0=common, 1=container, 2=book
-		char	Name[64] {};		// Name
-		char	Lore[80] {};		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
-		char	IDFile[30] {};		// Visible model
-		uint32	ID {};				// Unique ID (also PK for DB)
-		int32	Weight {};			// Item weight * 10
-		uint8	NoRent{} ;			// No Rent: 0=norent, 255=not norent
-		uint8	NoDrop {};			// No Drop: 0=nodrop, 255=not nodrop
-		uint8	Size {};			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
-		uint32	Slots {};			// Bitfield for which slots this item can be used in
-		uint32	Price {};			// Item cost (?)
-		uint32	Icon {};			// Icon Number
-		int32	LoreGroup {};		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
-		bool	LoreFlag {};		// This will be true if LoreGroup is non-zero
-		bool	PendingLoreFlag {};
-		bool	ArtifactFlag {};
-		bool	SummonedFlag {};
-		uint8	FVNoDrop {};		// Firiona Vie nodrop flag
-		uint32	Favor {};			// Individual favor
-		uint32	GuildFavor {};		// Guild favor
-		uint32	PointType {};
+		uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
+		char	Name[64];		// Name
+		char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
+		char	IDFile[30];		// Visible model
+		uint32	ID;				// Unique ID (also PK for DB)
+		int32	Weight;			// Item weight * 10
+		uint8	NoRent;			// No Rent: 0=norent, 255=not norent
+		uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
+		uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
+		uint32	Slots;			// Bitfield for which slots this item can be used in
+		uint32	Price;			// Item cost (?)
+		uint32	Icon;			// Icon Number
+		int32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
+		bool	LoreFlag;		// This will be true if LoreGroup is non-zero
+		bool	PendingLoreFlag;
+		bool	ArtifactFlag;
+		bool	SummonedFlag;
+		uint8	FVNoDrop;		// Firiona Vie nodrop flag
+		uint32	Favor;			// Individual favor
+		uint32	GuildFavor;		// Guild favor
+		uint32	PointType;

 		//uint32	Unk117;
 		//uint32	Unk118;
 		//uint32	Unk121;
 		//uint32	Unk124;

-		uint8	BagType {};		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
-		uint8	BagSlots {};		// Number of slots: can only be 2, 4, 6, 8, or 10
-		uint8	BagSize {};		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
-		uint8	BagWR {};			// 0->100
+		uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
+		uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
+		uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
+		uint8	BagWR;			// 0->100

-		bool	BenefitFlag {};
-		bool	Tradeskills {};	// Is this a tradeskill item?
-		int8	CR {};				// Save vs Cold
-		int8	DR {};				// Save vs Disease
-		int8	PR {};				// Save vs Poison
-		int8	MR {};				// Save vs Magic
-		int8	FR {};				// Save vs Fire
-		int8	AStr {};			// Strength
-		int8	ASta {};			// Stamina
-		int8	AAgi {};			// Agility
-		int8	ADex {};			// Dexterity
-		int8	ACha {};			// Charisma
-		int8	AInt {};			// Intelligence
-		int8	AWis {};			// Wisdom
-		int32	HP {};				// HP
-		int32	Mana {};			// Mana
-		int32	AC {};				// AC
-		uint32	Deity {};			// Bitmask of Deities that can equip this item
+		bool	BenefitFlag;
+		bool	Tradeskills;	// Is this a tradeskill item?
+		int8	CR;				// Save vs Cold
+		int8	DR;				// Save vs Disease
+		int8	PR;				// Save vs Poison
+		int8	MR;				// Save vs Magic
+		int8	FR;				// Save vs Fire
+		int8	AStr;			// Strength
+		int8	ASta;			// Stamina
+		int8	AAgi;			// Agility
+		int8	ADex;			// Dexterity
+		int8	ACha;			// Charisma
+		int8	AInt;			// Intelligence
+		int8	AWis;			// Wisdom
+		int32	HP;				// HP
+		int32	Mana;			// Mana
+		int32	AC;				// AC
+		uint32	Deity;			// Bitmask of Deities that can equip this item
 		//uint32	Unk033
-		int32	SkillModValue {};	// % Mod to skill specified in SkillModType
-		int32	SkillModMax {};	// Max skill point modification
-		uint32	SkillModType {};	// Type of skill for SkillModValue to apply to
-		uint32	BaneDmgRace {};	// Bane Damage Race
-		int32	BaneDmgAmt {};		// Bane Damage Body Amount
-		uint32	BaneDmgBody {};	// Bane Damage Body
-		bool	Magic {};			// True=Magic Item, False=not
-		int32	CastTime_ {};
-		uint8	ReqLevel {};		// Required Level to use item
-		uint32	BardType {};		// Bard Skill Type
-		int32	BardValue {};		// Bard Skill Amount
-		int8	Light {};			// Light
-		uint8	Delay {};			// Delay * 10
-		uint8	RecLevel {};		// Recommended level to use item
-		uint8	RecSkill {};		// Recommended skill to use item (refers to primary skill of item)
-		uint8	ElemDmgType {};	// Elemental Damage Type (1=magic, 2=fire)
-		uint8	ElemDmgAmt {};		// Elemental Damage
-		uint8	Range {};			// Range of item
-		uint32	Damage {};			// Delay between item usage (in 0.1 sec increments)
-		uint32	Color {};			// RR GG BB 00 <-- as it appears in pc
-		uint32	Classes {};		// Bitfield of classes that can equip item (1 << class#)
-		uint32	Races {};			// Bitfield of races that can equip item (1 << race#)
-		//uint32	Unk054 {};
-		int16	MaxCharges {};		// Maximum charges items can hold: -1 if not a chargeable item
-		uint8	ItemType {};		// Item Type/Skill (itemClass* from above)
-		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
-		uint8	Material {};		// Item material type
-		uint32	HerosForgeModel {};// Hero's Forge Armor Model Type (2-13?)
-		float	SellRate {};		// Sell rate
-		//uint32	Unk059 {};
+		int32	SkillModValue;	// % Mod to skill specified in SkillModType
+		int32	SkillModMax;	// Max skill point modification
+		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
+		uint32	BaneDmgRace;	// Bane Damage Race
+		int32	BaneDmgAmt;		// Bane Damage Body Amount
+		uint32	BaneDmgBody;	// Bane Damage Body
+		bool	Magic;			// True=Magic Item, False=not
+		int32	CastTime_;
+		uint8	ReqLevel;		// Required Level to use item
+		uint32	BardType;		// Bard Skill Type
+		int32	BardValue;		// Bard Skill Amount
+		int8	Light;			// Light
+		uint8	Delay;			// Delay * 10
+		uint8	RecLevel;		// Recommended level to use item
+		uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
+		uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
+		uint8	ElemDmgAmt;		// Elemental Damage
+		uint8	Range;			// Range of item
+		uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
+		uint32	Color;			// RR GG BB 00 <-- as it appears in pc
+		uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
+		uint32	Races;			// Bitfield of races that can equip item (1 << race#)
+		//uint32	Unk054;
+		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
+		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
+		int32	SubType;		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
+		uint8	Material;		// Item material type
+		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
+		float	SellRate;		// Sell rate
+		//uint32	Unk059;
 		union {
 			uint32 Fulfilment;	// Food fulfilment (How long it lasts)
 			uint32 CastTime;		// Cast Time for clicky effects, in milliseconds
 		};
-		uint32 EliteMaterial {};
-		int32	ProcRate {};
-		int8	CombatEffects {};	// PoP: Combat Effects +
-		int8	Shielding {};		// PoP: Shielding %
-		int8	StunResist {};		// PoP: Stun Resist %
-		int8	StrikeThrough {};	// PoP: Strike Through %
-		int32	ExtraDmgSkill {};
-		int32	ExtraDmgAmt {};
-		int8	SpellShield {};	// PoP: Spell Shield %
-		int8	Avoidance {};		// PoP: Avoidance +
-		int8	Accuracy {};		// PoP: Accuracy +
-		uint32	CharmFileID {};
-		int32	FactionMod1 {};	// Faction Mod 1
-		int32	FactionMod2 {};	// Faction Mod 2
-		int32	FactionMod3 {};	// Faction Mod 3
-		int32	FactionMod4 {};	// Faction Mod 4
-		int32	FactionAmt1 {};	// Faction Amt 1
-		int32	FactionAmt2 {};	// Faction Amt 2
-		int32	FactionAmt3 {};	// Faction Amt 3
-		int32	FactionAmt4 {};	// Faction Amt 4
-		char	CharmFile[32] {};	// ?
-		uint32	AugType {};
-		uint8	AugSlotType[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Type
-		uint8	AugSlotVisible[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Visible
-		uint8	AugSlotUnk2[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
-		uint32	LDoNTheme {};
-		uint32	LDoNPrice {};
-		uint32	LDoNSold {};
-		uint32	BaneDmgRaceAmt {};
-		uint32	AugRestrict {};
-		int32	Endur {};
-		int32	DotShielding {};
-		int32	Attack {};
-		int32	Regen {};
-		int32	ManaRegen {};
-		int32	EnduranceRegen {};
-		int32	Haste {};
-		int32	DamageShield {};
-		uint32	RecastDelay {};
-		int	RecastType {};
-		uint32	AugDistiller {};
-		bool	Attuneable {};
-		bool	NoPet {};
-		bool	PotionBelt {};
-		bool	Stackable {};
-		bool	NoTransfer {};
-		bool	QuestItemFlag {};
-		int16	StackSize {};
-		uint8	PotionBeltSlots {};
-		item::ItemEffect_Struct Click {};
-		item::ItemEffect_Struct Proc {};
-		item::ItemEffect_Struct Worn {};
-		item::ItemEffect_Struct Focus {};
-		item::ItemEffect_Struct Scroll {};
-		item::ItemEffect_Struct Bard {};
+		uint32 EliteMaterial;
+		int32	ProcRate;
+		int8	CombatEffects;	// PoP: Combat Effects +
+		int8	Shielding;		// PoP: Shielding %
+		int8	StunResist;		// PoP: Stun Resist %
+		int8	StrikeThrough;	// PoP: Strike Through %
+		uint32	ExtraDmgSkill;
+		uint32	ExtraDmgAmt;
+		int8	SpellShield;	// PoP: Spell Shield %
+		int8	Avoidance;		// PoP: Avoidance +
+		int8	Accuracy;		// PoP: Accuracy +
+		uint32	CharmFileID;
+		int32	FactionMod1;	// Faction Mod 1
+		int32	FactionMod2;	// Faction Mod 2
+		int32	FactionMod3;	// Faction Mod 3
+		int32	FactionMod4;	// Faction Mod 4
+		int32	FactionAmt1;	// Faction Amt 1
+		int32	FactionAmt2;	// Faction Amt 2
+		int32	FactionAmt3;	// Faction Amt 3
+		int32	FactionAmt4;	// Faction Amt 4
+		char	CharmFile[32];	// ?
+		uint32	AugType;
+		uint8	AugSlotType[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Type
+		uint8	AugSlotVisible[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Visible
+		uint8	AugSlotUnk2[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
+		uint32	LDoNTheme;
+		uint32	LDoNPrice;
+		uint32	LDoNSold;
+		uint32	BaneDmgRaceAmt;
+		uint32	AugRestrict;
+		int32	Endur;
+		int32	DotShielding;
+		int32	Attack;
+		int32	Regen;
+		int32	ManaRegen;
+		int32	EnduranceRegen;
+		int32	Haste;
+		int32	DamageShield;
+		uint32	RecastDelay;
+		int	RecastType;
+		uint32	AugDistiller;
+		bool	Attuneable;
+		bool	NoPet;
+		bool	PotionBelt;
+		bool	Stackable;
+		bool	NoTransfer;
+		bool	QuestItemFlag;
+		int16	StackSize;
+		uint8	PotionBeltSlots;
+		item::ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;

-		uint8	Book {};			// 0=Not book, 1=Book
-		uint32	BookType {};
-		char	Filename[33] {};	// Filename for book data
+		uint8	Book;			// 0=Not book, 1=Book
+		uint32	BookType;
+		char	Filename[33];	// Filename for book data
 		// Begin SoF Fields
-		int32 SVCorruption {};
-		uint32 Purity {};
-		uint8 EvolvingItem {};
-		uint32 EvolvingID {};
-		uint8 EvolvingLevel {};
-		uint8 EvolvingMax {};
-		uint32 BackstabDmg {};
-		uint32 DSMitigation {};
-		int32 HeroicStr {};
-		int32 HeroicInt {};
-		int32 HeroicWis {};
-		int32 HeroicAgi {};
-		int32 HeroicDex {};
-		int32 HeroicSta {};
-		int32 HeroicCha {};
-		int32 HeroicMR {};
-		int32 HeroicFR {};
-		int32 HeroicCR {};
-		int32 HeroicDR {};
-		int32 HeroicPR {};
-		int32 HeroicSVCorrup {};
-		int32 HealAmt {};
-		int32 SpellDmg {};
-		uint32 LDoNSellBackRate {};
-		uint32 ScriptFileID {};
-		uint16 ExpendableArrow {};
-		uint32 Clairvoyance {};
-		char	ClickName[65] {};
-		char	ProcName[65] {};
-		char	WornName[65] {};
-		char	FocusName[65] {};
-		char	ScrollName[65] {};
+		int32 SVCorruption;
+		uint32 Purity;
+		uint8 EvolvingItem;
+		uint32 EvolvingID;
+		uint8 EvolvingLevel;
+		uint8 EvolvingMax;
+		uint32 BackstabDmg;
+		uint32 DSMitigation;
+		int32 HeroicStr;
+		int32 HeroicInt;
+		int32 HeroicWis;
+		int32 HeroicAgi;
+		int32 HeroicDex;
+		int32 HeroicSta;
+		int32 HeroicCha;
+		int32 HeroicMR;
+		int32 HeroicFR;
+		int32 HeroicCR;
+		int32 HeroicDR;
+		int32 HeroicPR;
+		int32 HeroicSVCorrup;
+		int32 HealAmt;
+		int32 SpellDmg;
+		uint32 LDoNSellBackRate;
+		uint32 ScriptFileID;
+		uint16 ExpendableArrow;
+		uint32 Clairvoyance;
+		char	ClickName[65];
+		char	ProcName[65];
+		char	WornName[65];
+		char	FocusName[65];
+		char	ScrollName[65];
 		//BardName

 		bool IsEquipable(uint16 Race, uint16 Class) const;
@@ -17,7 +17,6 @@
 */

 #include "inventory_profile.h"
-#include "../common/data_verification.h"
 //#include "classes.h"
 //#include "global_define.h"
 //#include "item_instance.h"
@@ -25,16 +24,16 @@
 #include "rulesys.h"
 #include "shareddb.h"
 #include "strings.h"
-
+#include "util/uuid.h"
 //#include "../common/light_source.h"

 #include <limits.h>

 //#include <iostream>

-int32 NextItemInstSerialNumber = 1;
+uint32 NextItemInstSerialNumber = 1;

-static inline int32 GetNextItemInstSerialNumber() {
+static inline uint32 GetNextItemInstSerialNumber() {

 	// The Bazaar relies on each item a client has up for Trade having a unique
 	// identifier. This 'SerialNumber' is sent in Serialized item packets and
@@ -46,7 +45,7 @@ static inline int32 GetNextItemInstSerialNumber() {
 	// NextItemInstSerialNumber is the next one to hand out.
 	//
 	// It is very unlikely to reach 2,147,483,647. Maybe we should call abort(), rather than wrapping back to 1.
-	if(NextItemInstSerialNumber >= INT_MAX)
+	if(NextItemInstSerialNumber >= UINT_MAX)
 		NextItemInstSerialNumber = 1;
 	else
 		NextItemInstSerialNumber++;
@@ -57,63 +56,131 @@ static inline int32 GetNextItemInstSerialNumber() {
 //
 // class EQ::ItemInstance
 //
-EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
-
-	if (item) {
+EQ::ItemInstance::ItemInstance(const ItemData* item, const std::string& guid, int16 charges) {
+	m_use_type = ItemInstNormal;
+	if(item) {
 		m_item = new ItemData(*item);
+	} else {
+		m_item = nullptr;
+	}
+
+	if (guid.empty()) {
+		m_guid = EQ::Util::UUID::Generate().ToString();
+	}
+	else {
+		m_guid = guid;
 	}

 	m_charges = charges;
-
-	if (m_item && m_item->IsClassCommon()) {
+	m_price = 0;
+	m_attuned = false;
+	m_merchantslot = 0;
+	if (m_item && m_item->IsClassCommon())
 		m_color = m_item->Color;
-	}
+	else
+		m_color = 0;
+	m_merchantcount = 1;
+	m_serial_number = GetNextItemInstSerialNumber();

-	m_SerialNumber  = GetNextItemInstSerialNumber();
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
 }

-EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
-
-	m_item     = db->GetItem(item_id);
-
-	if (m_item) {
+EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, const std::string& guid, int16 charges) {
+	m_use_type = ItemInstNormal;
+	m_item = db->GetItem(item_id);
+	if(m_item) {
 		m_item = new ItemData(*m_item);
 	}
+	else {
+		m_item = nullptr;
+	}
+
+	if (guid.empty()) {
+		m_guid = EQ::Util::UUID::Generate().ToString();
+	}
+	else {
+		m_guid = guid;
+	}

 	m_charges = charges;
-
-	if (m_item && m_item->IsClassCommon()) {
+	m_price = 0;
+	m_merchantslot = 0;
+	m_attuned=false;
+	if (m_item && m_item->IsClassCommon())
 		m_color = m_item->Color;
-	} else {
+	else
 		m_color = 0;
-	}
+	m_merchantcount = 1;
+	m_serial_number = GetNextItemInstSerialNumber();

-	m_SerialNumber  = GetNextItemInstSerialNumber();
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
 }

 EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) {
-	m_use_type     = use_type;
+	m_use_type = use_type;
+
+	m_guid = EQ::Util::UUID::Generate().ToString();
+	m_item = nullptr;
+	m_charges = 0;
+	m_price = 0;
+	m_attuned = false;
+	m_merchantslot = 0;
+	m_color = 0;
+	m_serial_number = 0;
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
+	m_merchantcount = 0;
 }

 // Make a copy of an EQ::ItemInstance object
 EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 {
-	m_use_type = copy.m_use_type;
-
-	if (copy.m_item) {
+	m_use_type=copy.m_use_type;
+	if(copy.m_item)
 		m_item = new ItemData(*copy.m_item);
-	} else {
+	else
 		m_item = nullptr;
-	}
-
-	m_charges       = copy.m_charges;
-	m_price         = copy.m_price;
-	m_color         = copy.m_color;
-	m_merchantslot  = copy.m_merchantslot;
-	m_currentslot   = copy.m_currentslot;
-	m_attuned       = copy.m_attuned;
-	m_merchantcount = copy.m_merchantcount;

+	m_guid = copy.m_guid;
+	m_charges=copy.m_charges;
+	m_price=copy.m_price;
+	m_color=copy.m_color;
+	m_merchantslot=copy.m_merchantslot;
+	m_currentslot=copy.m_currentslot;
+	m_attuned=copy.m_attuned;
+	m_merchantcount=copy.m_merchantcount;
 	// Copy container contents
 	for (auto it = copy.m_contents.begin(); it != copy.m_contents.end(); ++it) {
 		ItemInstance* inst_old = it->second;
@@ -123,42 +190,37 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 			inst_new = inst_old->Clone();
 		}

-		if (inst_new) {
+		if (inst_new != nullptr) {
 			m_contents[it->first] = inst_new;
 		}
 	}
-
 	std::map<std::string, std::string>::const_iterator iter;
 	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); ++iter) {
 		m_custom_data[iter->first] = iter->second;
 	}
+	m_serial_number = copy.m_serial_number;
+	m_custom_data = copy.m_custom_data;
+	m_timers = copy.m_timers;

-	m_SerialNumber = copy.m_SerialNumber;
-	m_custom_data  = copy.m_custom_data;
-	m_timers       = copy.m_timers;
-
-	m_exp       = copy.m_exp;
+	m_exp = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
 	m_activated = copy.m_activated;
-
-	if (copy.m_scaledItem) {
+	if (copy.m_scaledItem)
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
-	} else {
+	else
 		m_scaledItem = nullptr;
-	}

-	if (copy.m_evolveInfo) {
+	if(copy.m_evolveInfo)
 		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
-	} else {
+	else
 		m_evolveInfo = nullptr;
-	}

-	m_scaling             = copy.m_scaling;
-	m_ornamenticon        = copy.m_ornamenticon;
-	m_ornamentidfile      = copy.m_ornamentidfile;
+	m_scaling = copy.m_scaling;
+	m_ornamenticon = copy.m_ornamenticon;
+	m_ornamentidfile = copy.m_ornamentidfile;
 	m_ornament_hero_model = copy.m_ornament_hero_model;
-	m_recast_timestamp    = copy.m_recast_timestamp;
-	m_new_id_file         = copy.m_new_id_file;
+	m_recast_timestamp = copy.m_recast_timestamp;
+	m_new_id_file = copy.m_new_id_file;
 }

 // Clean up container contents
@@ -176,13 +238,11 @@ bool EQ::ItemInstance::IsType(item::ItemClass item_class) const
 	// IsType(<ItemClassTypes>) does not protect against 'm_item = nullptr'

 	// Check usage type
-	if (m_use_type == ItemInstWorldContainer && item_class == item::ItemClassBag) {
+	if ((m_use_type == ItemInstWorldContainer) && (item_class == item::ItemClassBag))
 		return true;
-	}

-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}

 	return (m_item->ItemClass == item_class);
 }
@@ -205,20 +265,21 @@ bool EQ::ItemInstance::IsClassBook() const
 // Is item stackable?
 bool EQ::ItemInstance::IsStackable() const
 {
-	return (m_item && m_item->Stackable);
+	if (!m_item)
+		return false;
+
+	return m_item->Stackable;
 }

 bool EQ::ItemInstance::IsCharged() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}

-	if (m_item->MaxCharges > 1) {
+	if (m_item->MaxCharges > 1)
 		return true;
-	} else {
+	else
 		return false;
-	}
 }

 // Can item be equipped?
@@ -267,30 +328,26 @@ bool EQ::ItemInstance::IsEquipable(int16 slot_id) const

 bool EQ::ItemInstance::IsAugmentable() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}

 	for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
-		if (m_item->AugSlotType[index] != 0) {
+		if (m_item->AugSlotType[index] != 0)
 			return true;
-		}
 	}

 	return false;
 }

 bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
-	if (!m_item || !m_item->IsClassCommon()) {
+	if (!m_item || !m_item->IsClassCommon())
 		return false;
-	}

 	int index = invslot::EQUIPMENT_BEGIN;
 	for (; index <= invslot::EQUIPMENT_END; ++index) {
 		if (m_item->Slots & (1 << index)) {
-			if (aug_wear_slots & (1 << index)) {
+			if (aug_wear_slots & (1 << index))
 				break;
-			}
 		}
 	}

@@ -359,10 +416,9 @@ EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const

 uint32 EQ::ItemInstance::GetItemID(uint8 slot) const
 {
-	const auto item = GetItem(slot);
-	if (item) {
+	ItemInstance *item = GetItem(slot);
+	if (item)
 		return item->GetID();
-	}

 	return 0;
 }
@@ -486,21 +542,14 @@ uint8 EQ::ItemInstance::FirstOpenSlot() const

 uint8 EQ::ItemInstance::GetTotalItemCount() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return 0;
-	}

 	uint8 item_count = 1;

-	if (!m_item->IsClassBag()) {
-		return item_count;
-	}
+	if (m_item && !m_item->IsClassBag()) { return item_count; }

-	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) {
-		if (GetItem(index)) {
-			++item_count;
-		}
-	}
+	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) { if (GetItem(index)) { ++item_count; } }

 	return item_count;
 }
@@ -528,99 +577,78 @@ EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 augment_index) const
 	return nullptr;
 }

-bool EQ::ItemInstance::IsOrnamentationAugment(EQ::ItemInstance* augment) const
+EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
 {
-	if (!m_item || !m_item->IsClassCommon() || !augment) {
-		return false;
-	}
+	if (!m_item || !m_item->IsClassCommon()) { return nullptr; }
+	if (ornamentationAugtype == 0) { return nullptr; }

-	const auto augment_item = augment->GetItem();
-	if (!augment_item) {
-		return false;
-	}
-
-	const std::string& idfile = augment_item->IDFile;
-
-	if (
-		EQ::ValueWithin(
-			augment->GetAugmentType(),
-			OrnamentationAugmentTypes::StandardOrnamentation,
-			OrnamentationAugmentTypes::SpecialOrnamentation
-		) ||
-		(
-			idfile != "IT63" &&
-			idfile != "IT64"
-		) ||
-		augment_item->HerosForgeModel
-	) {
-		return true;
-	}
-
-	return false;
-}
-
-EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
-{
-	if (!m_item || !m_item->IsClassCommon()) {
-		return nullptr;
-	}
-
-	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++) {
-		const auto augment = GetAugment(i);
-		if (augment && IsOrnamentationAugment(augment)) {
-			return augment;
+	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++)
+	{
+		if (GetAugment(i) && m_item->AugSlotType[i] == ornamentationAugtype)
+		{
+			const char *item_IDFile = GetAugment(i)->GetItem()->IDFile;
+			if (
+				(strncmp(item_IDFile, "IT64", strlen(item_IDFile)) == 0
+				|| strncmp(item_IDFile, "IT63", strlen(item_IDFile)) == 0)
+				&& GetAugment(i)->GetItem()->HerosForgeModel == 0
+				)
+			{
+				continue;
+			}
+			return GetAugment(i);
 		}
 	}

 	return nullptr;
 }

-uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
-{
+uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0 || material_slot < 0) {
+	if (m_ornament_hero_model == 0 || material_slot < 0)
 		return 0;
-	}

 	// Item is using an explicit Hero Forge ID
-	if (m_ornament_hero_model >= 1000) {
+	if (m_ornament_hero_model >= 1000)
 		return m_ornament_hero_model;
-	}

 	// Item is using a shorthand ID
 	return (m_ornament_hero_model * 100) + material_slot;
 }

-bool EQ::ItemInstance::UpdateOrnamentationInfo()
-{
-	if (!m_item || !m_item->IsClassCommon()) {
+bool EQ::ItemInstance::UpdateOrnamentationInfo() {
+	if (!m_item || !m_item->IsClassCommon())
 		return false;
-	}

-	const auto augment = GetOrnamentationAugment();
+	bool ornamentSet = false;

-	if (augment) {
-		const auto augment_item = GetOrnamentationAugment()->GetItem();
-
-		if (augment_item) {
-			SetOrnamentIcon(augment_item->Icon);
-			SetOrnamentHeroModel(augment_item->HerosForgeModel);
-
-			if (strlen(augment_item->IDFile) > 2) {
-				SetOrnamentationIDFile(Strings::ToUnsignedInt(&augment_item->IDFile[2]));
-			} else {
+	int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
+	if (GetOrnamentationAug(ornamentationAugtype))
+	{
+		const ItemData* ornamentItem;
+		ornamentItem = GetOrnamentationAug(ornamentationAugtype)->GetItem();
+		if (ornamentItem != nullptr)
+		{
+			SetOrnamentIcon(ornamentItem->Icon);
+			SetOrnamentHeroModel(ornamentItem->HerosForgeModel);
+			if (strlen(ornamentItem->IDFile) > 2)
+			{
+				SetOrnamentationIDFile(Strings::ToInt(&ornamentItem->IDFile[2]));
+			}
+			else
+			{
 				SetOrnamentationIDFile(0);
 			}
-
-			return true;
+			ornamentSet = true;
 		}
 	}
+	else
+	{
+		SetOrnamentIcon(0);
+		SetOrnamentHeroModel(0);
+		SetOrnamentationIDFile(0);
+	}

-	SetOrnamentIcon(0);
-	SetOrnamentHeroModel(0);
-	SetOrnamentationIDFile(0);
-
-	return false;
+	return ornamentSet;
 }

 bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
@@ -834,20 +862,7 @@ std::string EQ::ItemInstance::GetCustomDataString() const {
 	return ret_val;
 }

-void EQ::ItemInstance::SetCustomDataString(const std::string& str)
-{
-	auto components = Strings::Split(str, "^");
-	auto value_count = components.size() / 2;
-
-	for (auto i = 0; i < value_count; i++) {
-		auto identifier = components[i * 2];
-		auto value = components[(i * 2) + 1];
-
-		SetCustomData(identifier, value);
-	}
-}
-
-std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
+std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
 	std::map<std::string, std::string>::const_iterator iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		return iter->second;
@@ -856,33 +871,33 @@ std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
 	return "";
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, const std::string& value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) {
 	DeleteCustomData(identifier);
 	m_custom_data[identifier] = value;
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, int value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, int value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, float value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, float value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, bool value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::DeleteCustomData(const std::string& identifier) {
+void EQ::ItemInstance::DeleteCustomData(std::string identifier) {
 	auto iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		m_custom_data.erase(iter);
@@ -934,9 +949,8 @@ bool EQ::ItemInstance::IsDroppable(bool recurse) const

 void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	// if there's no actual item, don't do anything
-	if (!m_item) {
+	if (!m_item)
 		return;
-	}

 	// initialize scaling items
 	if (m_item->CharmFileID != 0) {
@@ -945,7 +959,7 @@ void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	}

 	// initialize evolving items
-	else if (db && m_item->LoreGroup >= 1000) {
+	else if ((db) && m_item->LoreGroup >= 1000 && m_item->LoreGroup != -1) {
 		// not complete yet
 	}
 }
@@ -51,11 +51,6 @@ typedef enum {
 	byFlagNotSet	//apply action if the flag is NOT set
 } byFlagSetting;

-enum OrnamentationAugmentTypes {
-	StandardOrnamentation = 20,
-	SpecialOrnamentation = 21
-};
-
 class SharedDatabase;

 // ########################################
@@ -74,9 +69,9 @@ namespace EQ
 		/////////////////////////

 		// Constructors/Destructor
-		ItemInstance(const ItemData* item = nullptr, int16 charges = 0);
+		ItemInstance(const ItemData* item, const std::string& guid, int16 charges);

-		ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges = 0);
+		ItemInstance(SharedDatabase *db, uint32 item_id, const std::string &guid, int16 charges);

 		ItemInstance(ItemInstTypes use_type);

@@ -84,6 +79,8 @@ namespace EQ

 		~ItemInstance();

+		inline std::string GetGuid() const { return m_guid; }
+
 		// Query item type
 		bool IsType(item::ItemClass item_class) const;

@@ -108,8 +105,7 @@ namespace EQ
 		bool AvailableWearSlot(uint32 aug_wear_slots) const;
 		int8 AvailableAugmentSlot(int32 augment_type) const;
 		bool IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const;
-		inline int GetAugmentType() const { return m_item ? m_item->AugType : 0; }
-		inline uint32 GetAugmentRestriction() const { return m_item ? m_item->AugRestrict : 0; }
+		inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : 0); }

 		inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); }

@@ -142,8 +138,7 @@ namespace EQ
 		bool IsAugmented();
 		bool ContainsAugmentByID(uint32 item_id);
 		int CountAugmentByID(uint32 item_id);
-		bool IsOrnamentationAugment(EQ::ItemInstance* augment) const;
-		ItemInstance* GetOrnamentationAugment() const;
+		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
 		bool UpdateOrnamentationInfo();
 		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);

@@ -182,13 +177,12 @@ namespace EQ
 		void SetAttuned(bool flag)				{ m_attuned = flag; }

 		std::string GetCustomDataString() const;
-		std::string GetCustomData(const std::string &identifier);
-		void SetCustomDataString(const std::string& str);
-		void SetCustomData(const std::string &identifier, const std::string& value);
-		void SetCustomData(const std::string &identifier, int value);
-		void SetCustomData(const std::string &identifier, float value);
-		void SetCustomData(const std::string &identifier, bool value);
-		void DeleteCustomData(const std::string& identifier);
+		std::string GetCustomData(std::string identifier);
+		void SetCustomData(std::string identifier, std::string value);
+		void SetCustomData(std::string identifier, int value);
+		void SetCustomData(std::string identifier, float value);
+		void SetCustomData(std::string identifier, bool value);
+		void DeleteCustomData(std::string identifier);

 		// Allows treatment of this object as though it were a pointer to m_item
 		operator bool() const { return (m_item != nullptr); }
@@ -233,8 +227,8 @@ namespace EQ
 		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)); }

-		inline int32 GetSerialNumber() const { return m_SerialNumber; }
-		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
+		inline int32 GetSerialNumber() const { return m_serial_number; }
+		inline void SetSerialNumber(int32 id) { m_serial_number = id; }

 		std::map<std::string, ::Timer>& GetTimers() { return m_timers; }
 		void SetTimer(std::string name, uint32 time);
@@ -311,33 +305,35 @@ namespace EQ

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

-		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
-		const ItemData*		m_item {nullptr};		// Ptr to item data
-		int16				m_charges {0};	// # of charges for chargeable items
-		uint32				m_price {0};	// Bazaar /trader price
-		uint32				m_color {0};
-		uint32				m_merchantslot {0};
-		int16				m_currentslot {0};
-		bool				m_attuned {false};
-		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
-		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32				m_exp {0};
-		int8				m_evolveLvl {0};
-		bool				m_activated {false};
-		ItemData*			m_scaledItem {nullptr};
-		::EvolveInfo*		m_evolveInfo {nullptr};
-		bool				m_scaling {false};
-		uint32				m_ornamenticon {0};
-		uint32				m_ornamentidfile {0};
-		uint32				m_new_id_file {0};
-		uint32				m_ornament_hero_model {0};
-		uint32				m_recast_timestamp {0};
-		int                 m_task_delivered_count {0};
+		std::string         m_guid;
+		ItemInstTypes		m_use_type;	// Usage type for item
+		const ItemData*		m_item;		// Ptr to item data
+		int16				m_charges;	// # of charges for chargeable items
+		uint32				m_price;	// Bazaar /trader price
+		uint32				m_color;
+		uint32				m_merchantslot;
+		int16				m_currentslot;
+		bool				m_attuned;
+		int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
+		uint32				m_serial_number;	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp;
+		int8				m_evolveLvl;
+		bool				m_activated;
+		ItemData*			m_scaledItem;
+		::EvolveInfo*		m_evolveInfo;
+		bool				m_scaling;
+		uint32				m_ornamenticon;
+		uint32				m_ornamentidfile;
+		uint32				m_new_id_file;
+		uint32				m_ornament_hero_model;
+		uint32				m_recast_timestamp;
+		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 {};
-		std::map<std::string, ::Timer>		m_timers {};
+		//
+		// Items inside of this item (augs or contents);
+		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data;
+		std::map<std::string, ::Timer>		m_timers;
 	};
 }

@@ -151,7 +151,7 @@ static char *temp=nullptr;
 		return false;
 	}
 	ptr++;
-	uint32 id = Strings::ToUnsignedInt(field[id_pos]);
+	uint32 id = Strings::ToInt(field[id_pos].c_str());
 	items[id]=field;

 	for(i=0;i<10;i++) {
@@ -131,7 +131,7 @@ bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf
 		if (*oIP == 0)
 			return false;
 		if (oPort)
-			*oPort = Strings::ToUnsignedInt(sep.arg[1]);
+			*oPort = Strings::ToInt(sep.arg[1]);
 		return true;
 	}
 	return false;
@@ -7,7 +7,7 @@ EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(addr, port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		ConsoleServerConnection *c = new ConsoleServerConnection(this, connection);
-		m_connections.emplace(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
+		m_connections.insert(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
 	});
 }

@@ -97,7 +97,7 @@ void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int po
 		m_on_new_connection(connection);
 	}

-	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
+	m_connections.insert(std::make_pair(std::make_pair(addr, port), connection));
 }

 void EQ::Net::DaybreakConnectionManager::Process()
@@ -234,7 +234,7 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi
 				if (m_on_new_connection) {
 					m_on_new_connection(connection);
 				}
-				m_connections.emplace(std::make_pair(std::make_pair(endpoint, port), connection));
+				m_connections.insert(std::make_pair(std::make_pair(endpoint, port), connection));
 				connection->ProcessPacket(p);
 			}
 			else if (data[1] != OP_OutOfSession) {
@@ -527,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
 		DynamicPacket *out = new DynamicPacket();
 		out->PutPacket(0, p);

-		s->packet_queue.emplace(std::make_pair(seq, out));
+		s->packet_queue.insert(std::make_pair(seq, out));
 	}
 }

@@ -1427,7 +1427,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(first_packet);
@@ -1459,7 +1459,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
-			stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+			stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 			stream->sequence_out++;

 			InternalBufferedSend(packet);
@@ -1483,7 +1483,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(packet);
@@ -22,7 +22,7 @@ void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions
 void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
-	m_streams.emplace(std::make_pair(connection, stream));
+	m_streams.insert(std::make_pair(connection, stream));
 	if (m_on_new_connection) {
 		m_on_new_connection(stream);
 	}
@@ -45,7 +45,7 @@ void EQ::Net::ServertalkClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -41,7 +41,7 @@ void EQ::Net::ServertalkLegacyClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkLegacyClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkLegacyClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -19,12 +19,12 @@ void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)

 void EQ::Net::ServertalkServer::OnConnectionIdentified(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_ident.emplace(std::make_pair(type, cb));
+	m_on_ident.insert(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::OnConnectionRemoved(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_disc.emplace(std::make_pair(type, cb));
+	m_on_disc.insert(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::ConnectionDisconnected(ServertalkServerConnection *conn)
@@ -75,7 +75,7 @@ void EQ::Net::ServertalkServer::ConnectionIdentified(ServertalkServerConnection
 			else {
 				std::vector<std::shared_ptr<EQ::Net::ServertalkServerConnection>> vec;
 				vec.push_back(*iter);
-				m_ident_connections.emplace(std::make_pair(conn->GetIdentifier(), vec));
+				m_ident_connections.insert(std::make_pair(conn->GetIdentifier(), vec));
 			}

 			m_unident_connections.erase(iter);
@@ -100,7 +100,7 @@ void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkServerConnection::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -142,7 +142,7 @@ void EQ::Net::TCPConnection::Write(const char *data, size_t count)

 	WriteBaton *baton = new WriteBaton;
 	baton->connection = this;
-	baton->buffer = new char[count];
+	baton->buffer = new char[count];;

 	uv_write_t *write_req = new uv_write_t;
 	memset(write_req, 0, sizeof(uv_write_t));
@@ -1050,7 +1050,7 @@ namespace RoF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1069,7 +1069,7 @@ namespace RoF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1099,7 +1099,7 @@ namespace RoF

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1169,7 +1169,7 @@ namespace RoF
 			return;

 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -5218,6 +5218,7 @@ namespace RoF
 		/**
 		 * Ornamentation
 		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;

@@ -1101,7 +1101,7 @@ namespace RoF2
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1120,7 +1120,7 @@ namespace RoF2
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1150,7 +1150,7 @@ namespace RoF2

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1220,7 +1220,7 @@ namespace RoF2
 			return;

 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -5477,6 +5477,7 @@ namespace RoF2
 		/**
 		 * Ornamentation
 		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;

@@ -2590,7 +2590,7 @@ struct GroupUpdate_Struct_Live {	// New for Live

 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2600,7 +2600,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -2566,7 +2566,7 @@ struct GroupUpdate_Struct_Live {	// New for Live

 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2576,7 +2576,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -785,7 +785,7 @@ namespace SoD
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -804,7 +804,7 @@ namespace SoD
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -834,7 +834,7 @@ namespace SoD

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -902,7 +902,7 @@ namespace SoD
 			return;
 		}

-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -2085,7 +2085,7 @@ struct GroupUpdate_Struct_SoD {	// New for SoD

 struct GroupMembers_Struct {	// New for SoD
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2095,7 +2095,7 @@ struct GroupJoin_Struct_SoD {	// New for SoD
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -927,7 +927,7 @@ namespace UF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -947,7 +947,7 @@ namespace UF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -977,7 +977,7 @@ namespace UF

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1045,7 +1045,7 @@ namespace UF
 			delete in;
 			return;
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -3851,17 +3851,17 @@ namespace UF
 			ob.write((const char*)&evotop, sizeof(UF::structs::EvolvingItem));
 		}

-		uint16     ornament_icon = 0;
-		const auto augment       = inst->GetOrnamentationAugment();
+		//ORNAMENT IDFILE / ICON -
+		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
+		uint16 ornaIcon = 0;
+		if (inst->GetOrnamentationAug(ornamentationAugtype)) {
+			const EQ::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
+			ornaIcon = aug_weap->Icon;

-		if (augment) {
-			const auto augment_item = augment->GetItem();
-			ornament_icon = augment_item->Icon;
-
-			ob.write(augment_item->IDFile, strlen(augment_item->IDFile));
+			ob.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
 		}
 		else if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon()) {
-			ornament_icon = inst->GetOrnamentationIcon();
+			ornaIcon = inst->GetOrnamentationIcon();
 			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());

 			ob.write(tmp, strlen(tmp));
@@ -3870,7 +3870,7 @@ namespace UF

 		UF::structs::ItemSerializationHeaderFinish hdrf;

-		hdrf.ornamentIcon = ornament_icon;
+		hdrf.ornamentIcon = ornaIcon;
 		hdrf.unknown060 = 0; //This is Always 0.. or it breaks shit..
 		hdrf.unknown061 = 0; //possibly ornament / special ornament
 		hdrf.isCopied = 0; //Flag for item to be 'Copied'
@@ -2128,7 +2128,7 @@ struct GroupUpdate_Struct_Underfoot {	// New for Underfoot

 struct GroupMembers_Struct {	// New for Underfoot
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2138,7 +2138,7 @@ struct GroupJoin_Struct_Underfoot {	// New for Underfoot
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -64,7 +64,7 @@ void ProcLauncher::Process() {
 		if(GetExitCodeProcess(cur->second->proc_info.hProcess, &res)) {
 			//got exit code, see if its still running...
 			if(res == STILL_ACTIVE) {
-				++cur;
+				cur++;
 				continue;
 			}
 			//else, it died, handle properly
@@ -76,7 +76,7 @@ void ProcLauncher::Process() {

 		//if we get here, the current process died.
 		tmp = cur;
-		++tmp;
+		tmp++;
 		ProcessTerminated(cur);
 		cur = tmp;
 	}
@@ -174,7 +174,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	std::vector<std::string>::iterator cur, end;
 	cur = it->args.begin();
 	end = it->args.end();
-	for(; cur != end; ++cur) {
+	for(; cur != end; cur++) {
 		args += " ";
 		args += *cur;
 	}
@@ -306,7 +306,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = m_running.begin();
 		end = m_running.end();
-		for(; cur != end; ++cur) {
+		for(; cur != end; cur++) {
 			Terminate(cur->first, true);
 		}
 	} else {
@@ -317,7 +317,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = running.begin();
 		end = running.end();
-		for(; cur != end; ++cur) {
+		for(; cur != end; cur++) {
 			Terminate(cur->first, true);
 			safe_delete(cur->second);
 		}
@@ -4,8 +4,7 @@

 std::string Process::execute(const std::string &cmd)
 {
-	std::string           command = fmt::format("{} 2>&1", cmd);
-	std::shared_ptr<FILE> pipe(popen(command.c_str(), "r"), pclose);
+	std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
 	if (!pipe) { return "ERROR"; }
 	char        buffer[128];
 	std::string result;
@@ -258,7 +258,7 @@ bool EQ::ProfanityManager::clear_database_entries(DBcore *db) {
 	return true;
 }

-bool EQ::ProfanityManager::check_for_existing_entry(const std::string& profanity) {
+bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) {
 	if (profanity.empty()) {
 		return false;
 	}
@@ -53,7 +53,7 @@ namespace EQ
 	private:
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
-		static bool check_for_existing_entry(const std::string& profanity);
+		static bool check_for_existing_entry(std::string profanity);
 		
 	};

@@ -288,9 +288,9 @@ bool PTimerList::Load(Database *db) {
 	PersistentTimer *cur;

    for (auto row = results.begin(); row != results.end(); ++row) {
-		type = Strings::ToUnsignedInt(row[0]);
-		start_time = Strings::ToUnsignedInt(row[1]);
-		timer_time = Strings::ToUnsignedInt(row[2]);
+		type = Strings::ToInt(row[0]);
+		start_time = strtoul(row[1], nullptr, 10);
+		timer_time = strtoul(row[2], nullptr, 10);
 		enabled = (row[3][0] == '1');

 		//if it expired allready, dont bother.
@@ -1,354 +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://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H
-#define EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseCharacterTributeRepository {
-public:
-	struct CharacterTribute {
-		int32_t  id;
-		uint32_t character_id;
-		uint8_t  tier;
-		uint32_t tribute;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"character_id",
-			"tier",
-			"tribute",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"character_id",
-			"tier",
-			"tribute",
-		};
-	}
-
-	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_tribute");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static CharacterTribute NewEntity()
-	{
-		CharacterTribute e{};
-
-		e.id           = 0;
-		e.character_id = 0;
-		e.tier         = 0;
-		e.tribute      = 0;
-
-		return e;
-	}
-
-	static CharacterTribute GetCharacterTribute(
-		const std::vector<CharacterTribute> &character_tributes,
-		int character_tribute_id
-	)
-	{
-		for (auto &character_tribute : character_tributes) {
-			if (character_tribute.id == character_tribute_id) {
-				return character_tribute;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static CharacterTribute FindOne(
-		Database& db,
-		int character_tribute_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				character_tribute_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			CharacterTribute e{};
-
-			e.id           = static_cast<int32_t>(atoi(row[0]));
-			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.tribute      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int character_tribute_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				character_tribute_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const CharacterTribute &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.tier));
-		v.push_back(columns[3] + " = " + std::to_string(e.tribute));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static CharacterTribute InsertOne(
-		Database& db,
-		CharacterTribute 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.tier));
-		v.push_back(std::to_string(e.tribute));
-
-		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<CharacterTribute> &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.tier));
-			v.push_back(std::to_string(e.tribute));
-
-			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<CharacterTribute> All(Database& db)
-	{
-		std::vector<CharacterTribute> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			CharacterTribute e{};
-
-			e.id           = static_cast<int32_t>(atoi(row[0]));
-			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.tribute      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<CharacterTribute> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<CharacterTribute> 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) {
-			CharacterTribute e{};
-
-			e.id           = static_cast<int32_t>(atoi(row[0]));
-			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.tribute      = static_cast<uint32_t>(strtoul(row[3], 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);
-	}
-
-};
-
-#endif //EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H
@@ -16,12 +16,11 @@
 #include "../../strings.h"
 #include <ctime>

-
 class BaseDataBucketsRepository {
 public:
 	struct DataBuckets {
 		uint64_t    id;
-		std::string key_;
+		std::string key;
 		std::string value;
 		uint32_t    expires;
 	};
@@ -35,7 +34,7 @@ public:
 	{
 		return {
 			"id",
-			"`key`",
+			"key",
 			"value",
 			"expires",
 		};
@@ -45,7 +44,7 @@ public:
 	{
 		return {
 			"id",
-			"`key`",
+			"key",
 			"value",
 			"expires",
 		};
@@ -89,7 +88,7 @@ public:
 		DataBuckets e{};

 		e.id      = 0;
-		e.key_    = "";
+		e.key     = "";
 		e.value   = "";
 		e.expires = 0;

@@ -117,9 +116,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				data_buckets_id
 			)
 		);
@@ -129,7 +127,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -165,7 +163,7 @@ public:

 		auto columns = Columns();

-		v.push_back(columns[1] + " = '" + Strings::Escape(e.key_) + "'");
+		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));

@@ -190,7 +188,7 @@ public:
 		std::vector<std::string> v;

 		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.key_) + "'");
+		v.push_back("'" + Strings::Escape(e.key) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));

@@ -223,7 +221,7 @@ public:
 			std::vector<std::string> v;

 			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.key_) + "'");
+			v.push_back("'" + Strings::Escape(e.key) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));

@@ -260,7 +258,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -288,7 +286,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -25,7 +25,7 @@ public:
 		std::string zone_id_list;
 		std::string instance_version_list;
 		int32_t     ac;
-		int64_t     hp;
+		int32_t     hp;
 		int32_t     accuracy;
 		int32_t     slow_mitigation;
 		int32_t     attack;
@@ -45,13 +45,10 @@ public:
 		int32_t     physical_resist;
 		int32_t     min_dmg;
 		int32_t     max_dmg;
-		int64_t     hp_regen_rate;
-		int64_t     hp_regen_per_second;
+		int32_t     hp_regen_rate;
 		int32_t     attack_delay;
 		int32_t     spell_scale;
 		int32_t     heal_scale;
-		uint32_t    avoidance;
-		int32_t     heroic_strikethrough;
 		std::string special_abilities;
 	};

@@ -89,12 +86,9 @@ public:
 			"min_dmg",
 			"max_dmg",
 			"hp_regen_rate",
-			"hp_regen_per_second",
 			"attack_delay",
 			"spell_scale",
 			"heal_scale",
-			"avoidance",
-			"heroic_strikethrough",
 			"special_abilities",
 		};
 	}
@@ -128,12 +122,9 @@ public:
 			"min_dmg",
 			"max_dmg",
 			"hp_regen_rate",
-			"hp_regen_per_second",
 			"attack_delay",
 			"spell_scale",
 			"heal_scale",
-			"avoidance",
-			"heroic_strikethrough",
 			"special_abilities",
 		};
 	}
@@ -201,12 +192,9 @@ public:
 		e.min_dmg               = 0;
 		e.max_dmg               = 0;
 		e.hp_regen_rate         = 0;
-		e.hp_regen_per_second   = 0;
 		e.attack_delay          = 0;
 		e.spell_scale           = 100;
 		e.heal_scale            = 100;
-		e.avoidance             = 0;
-		e.heroic_strikethrough  = 0;
 		e.special_abilities     = "";

 		return e;
@@ -249,7 +237,7 @@ public:
 			e.zone_id_list          = row[2] ? row[2] : "";
 			e.instance_version_list = row[3] ? row[3] : "";
 			e.ac                    = static_cast<int32_t>(atoi(row[4]));
-			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.hp                    = static_cast<int32_t>(atoi(row[5]));
 			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
 			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
 			e.attack                = static_cast<int32_t>(atoi(row[8]));
@@ -269,14 +257,11 @@ public:
 			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
 			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
 			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
-			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
-			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
-			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
-			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
-			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
-			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
-			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
-			e.special_abilities     = row[32] ? row[32] : "";
+			e.hp_regen_rate         = static_cast<int32_t>(atoi(row[25]));
+			e.attack_delay          = static_cast<int32_t>(atoi(row[26]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[27]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[28]));
+			e.special_abilities     = row[29] ? row[29] : "";

 			return e;
 		}
@@ -336,13 +321,10 @@ public:
 		v.push_back(columns[23] + " = " + std::to_string(e.min_dmg));
 		v.push_back(columns[24] + " = " + std::to_string(e.max_dmg));
 		v.push_back(columns[25] + " = " + std::to_string(e.hp_regen_rate));
-		v.push_back(columns[26] + " = " + std::to_string(e.hp_regen_per_second));
-		v.push_back(columns[27] + " = " + std::to_string(e.attack_delay));
-		v.push_back(columns[28] + " = " + std::to_string(e.spell_scale));
-		v.push_back(columns[29] + " = " + std::to_string(e.heal_scale));
-		v.push_back(columns[30] + " = " + std::to_string(e.avoidance));
-		v.push_back(columns[31] + " = " + std::to_string(e.heroic_strikethrough));
-		v.push_back(columns[32] + " = '" + Strings::Escape(e.special_abilities) + "'");
+		v.push_back(columns[26] + " = " + std::to_string(e.attack_delay));
+		v.push_back(columns[27] + " = " + std::to_string(e.spell_scale));
+		v.push_back(columns[28] + " = " + std::to_string(e.heal_scale));
+		v.push_back(columns[29] + " = '" + Strings::Escape(e.special_abilities) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -390,12 +372,9 @@ public:
 		v.push_back(std::to_string(e.min_dmg));
 		v.push_back(std::to_string(e.max_dmg));
 		v.push_back(std::to_string(e.hp_regen_rate));
-		v.push_back(std::to_string(e.hp_regen_per_second));
 		v.push_back(std::to_string(e.attack_delay));
 		v.push_back(std::to_string(e.spell_scale));
 		v.push_back(std::to_string(e.heal_scale));
-		v.push_back(std::to_string(e.avoidance));
-		v.push_back(std::to_string(e.heroic_strikethrough));
 		v.push_back("'" + Strings::Escape(e.special_abilities) + "'");

 		auto results = db.QueryDatabase(
@@ -452,12 +431,9 @@ public:
 			v.push_back(std::to_string(e.min_dmg));
 			v.push_back(std::to_string(e.max_dmg));
 			v.push_back(std::to_string(e.hp_regen_rate));
-			v.push_back(std::to_string(e.hp_regen_per_second));
 			v.push_back(std::to_string(e.attack_delay));
 			v.push_back(std::to_string(e.spell_scale));
 			v.push_back(std::to_string(e.heal_scale));
-			v.push_back(std::to_string(e.avoidance));
-			v.push_back(std::to_string(e.heroic_strikethrough));
 			v.push_back("'" + Strings::Escape(e.special_abilities) + "'");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -497,7 +473,7 @@ public:
 			e.zone_id_list          = row[2] ? row[2] : "";
 			e.instance_version_list = row[3] ? row[3] : "";
 			e.ac                    = static_cast<int32_t>(atoi(row[4]));
-			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.hp                    = static_cast<int32_t>(atoi(row[5]));
 			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
 			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
 			e.attack                = static_cast<int32_t>(atoi(row[8]));
@@ -517,14 +493,11 @@ public:
 			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
 			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
 			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
-			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
-			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
-			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
-			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
-			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
-			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
-			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
-			e.special_abilities     = row[32] ? row[32] : "";
+			e.hp_regen_rate         = static_cast<int32_t>(atoi(row[25]));
+			e.attack_delay          = static_cast<int32_t>(atoi(row[26]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[27]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[28]));
+			e.special_abilities     = row[29] ? row[29] : "";

 			all_entries.push_back(e);
 		}
@@ -554,7 +527,7 @@ public:
 			e.zone_id_list          = row[2] ? row[2] : "";
 			e.instance_version_list = row[3] ? row[3] : "";
 			e.ac                    = static_cast<int32_t>(atoi(row[4]));
-			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.hp                    = static_cast<int32_t>(atoi(row[5]));
 			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
 			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
 			e.attack                = static_cast<int32_t>(atoi(row[8]));
@@ -574,14 +547,11 @@ public:
 			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
 			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
 			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
-			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
-			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
-			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
-			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
-			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
-			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
-			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
-			e.special_abilities     = row[32] ? row[32] : "";
+			e.hp_regen_rate         = static_cast<int32_t>(atoi(row[25]));
+			e.attack_delay          = static_cast<int32_t>(atoi(row[26]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[27]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[28]));
+			e.special_abilities     = row[29] ? row[29] : "";

 			all_entries.push_back(e);
 		}
@@ -16,14 +16,11 @@
 #include "../../strings.h"
 #include <ctime>

-
 class BaseRaidMembersRepository {
 public:
 	struct RaidMembers {
-		uint64_t    id;
 		int32_t     raidid;
 		int32_t     charid;
-		int32_t     bot_id;
 		uint32_t    groupid;
 		int8_t      _class;
 		int8_t      level;
@@ -35,16 +32,14 @@ public:

 	static std::string PrimaryKey()
 	{
-		return std::string("id");
+		return std::string("charid");
 	}

 	static std::vector<std::string> Columns()
 	{
 		return {
-			"id",
 			"raidid",
 			"charid",
-			"bot_id",
 			"groupid",
 			"_class",
 			"level",
@@ -58,10 +53,8 @@ public:
 	static std::vector<std::string> SelectColumns()
 	{
 		return {
-			"id",
 			"raidid",
 			"charid",
-			"bot_id",
 			"groupid",
 			"_class",
 			"level",
@@ -109,10 +102,8 @@ public:
 	{
 		RaidMembers e{};

-		e.id            = 0;
 		e.raidid        = 0;
 		e.charid        = 0;
-		e.bot_id        = 0;
 		e.groupid       = 0;
 		e._class        = 0;
 		e.level         = 0;
@@ -130,7 +121,7 @@ public:
 	)
 	{
 		for (auto &raid_members : raid_memberss) {
-			if (raid_members.id == raid_members_id) {
+			if (raid_members.charid == raid_members_id) {
 				return raid_members;
 			}
 		}
@@ -145,9 +136,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				raid_members_id
 			)
 		);
@@ -156,17 +146,15 @@ public:
 		if (results.RowCount() == 1) {
 			RaidMembers e{};

-			e.id            = strtoull(row[0], nullptr, 10);
-			e.raidid        = static_cast<int32_t>(atoi(row[1]));
-			e.charid        = static_cast<int32_t>(atoi(row[2]));
-			e.bot_id        = static_cast<int32_t>(atoi(row[3]));
-			e.groupid       = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e._class        = static_cast<int8_t>(atoi(row[5]));
-			e.level         = static_cast<int8_t>(atoi(row[6]));
-			e.name          = row[7] ? row[7] : "";
-			e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
-			e.israidleader  = static_cast<int8_t>(atoi(row[9]));
-			e.islooter      = static_cast<int8_t>(atoi(row[10]));
+			e.raidid        = static_cast<int32_t>(atoi(row[0]));
+			e.charid        = static_cast<int32_t>(atoi(row[1]));
+			e.groupid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e._class        = static_cast<int8_t>(atoi(row[3]));
+			e.level         = static_cast<int8_t>(atoi(row[4]));
+			e.name          = row[5] ? row[5] : "";
+			e.isgroupleader = static_cast<int8_t>(atoi(row[6]));
+			e.israidleader  = static_cast<int8_t>(atoi(row[7]));
+			e.islooter      = static_cast<int8_t>(atoi(row[8]));

 			return e;
 		}
@@ -200,16 +188,15 @@ public:

 		auto columns = Columns();

-		v.push_back(columns[1] + " = " + std::to_string(e.raidid));
-		v.push_back(columns[2] + " = " + std::to_string(e.charid));
-		v.push_back(columns[3] + " = " + std::to_string(e.bot_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.groupid));
-		v.push_back(columns[5] + " = " + std::to_string(e._class));
-		v.push_back(columns[6] + " = " + std::to_string(e.level));
-		v.push_back(columns[7] + " = '" + Strings::Escape(e.name) + "'");
-		v.push_back(columns[8] + " = " + std::to_string(e.isgroupleader));
-		v.push_back(columns[9] + " = " + std::to_string(e.israidleader));
-		v.push_back(columns[10] + " = " + std::to_string(e.islooter));
+		v.push_back(columns[0] + " = " + std::to_string(e.raidid));
+		v.push_back(columns[1] + " = " + std::to_string(e.charid));
+		v.push_back(columns[2] + " = " + std::to_string(e.groupid));
+		v.push_back(columns[3] + " = " + std::to_string(e._class));
+		v.push_back(columns[4] + " = " + std::to_string(e.level));
+		v.push_back(columns[5] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[6] + " = " + std::to_string(e.isgroupleader));
+		v.push_back(columns[7] + " = " + std::to_string(e.israidleader));
+		v.push_back(columns[8] + " = " + std::to_string(e.islooter));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -217,7 +204,7 @@ public:
 				TableName(),
 				Strings::Implode(", ", v),
 				PrimaryKey(),
-				e.id
+				e.charid
 			)
 		);

@@ -231,10 +218,8 @@ public:
 	{
 		std::vector<std::string> v;

-		v.push_back(std::to_string(e.id));
 		v.push_back(std::to_string(e.raidid));
 		v.push_back(std::to_string(e.charid));
-		v.push_back(std::to_string(e.bot_id));
 		v.push_back(std::to_string(e.groupid));
 		v.push_back(std::to_string(e._class));
 		v.push_back(std::to_string(e.level));
@@ -252,7 +237,7 @@ public:
 		);

 		if (results.Success()) {
-			e.id = results.LastInsertedID();
+			e.charid = results.LastInsertedID();
 			return e;
 		}

@@ -271,10 +256,8 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;

-			v.push_back(std::to_string(e.id));
 			v.push_back(std::to_string(e.raidid));
 			v.push_back(std::to_string(e.charid));
-			v.push_back(std::to_string(e.bot_id));
 			v.push_back(std::to_string(e.groupid));
 			v.push_back(std::to_string(e._class));
 			v.push_back(std::to_string(e.level));
@@ -315,17 +298,15 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			RaidMembers e{};

-			e.id            = strtoull(row[0], nullptr, 10);
-			e.raidid        = static_cast<int32_t>(atoi(row[1]));
-			e.charid        = static_cast<int32_t>(atoi(row[2]));
-			e.bot_id        = static_cast<int32_t>(atoi(row[3]));
-			e.groupid       = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e._class        = static_cast<int8_t>(atoi(row[5]));
-			e.level         = static_cast<int8_t>(atoi(row[6]));
-			e.name          = row[7] ? row[7] : "";
-			e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
-			e.israidleader  = static_cast<int8_t>(atoi(row[9]));
-			e.islooter      = static_cast<int8_t>(atoi(row[10]));
+			e.raidid        = static_cast<int32_t>(atoi(row[0]));
+			e.charid        = static_cast<int32_t>(atoi(row[1]));
+			e.groupid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e._class        = static_cast<int8_t>(atoi(row[3]));
+			e.level         = static_cast<int8_t>(atoi(row[4]));
+			e.name          = row[5] ? row[5] : "";
+			e.isgroupleader = static_cast<int8_t>(atoi(row[6]));
+			e.israidleader  = static_cast<int8_t>(atoi(row[7]));
+			e.islooter      = static_cast<int8_t>(atoi(row[8]));

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

-			e.id            = strtoull(row[0], nullptr, 10);
-			e.raidid        = static_cast<int32_t>(atoi(row[1]));
-			e.charid        = static_cast<int32_t>(atoi(row[2]));
-			e.bot_id        = static_cast<int32_t>(atoi(row[3]));
-			e.groupid       = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e._class        = static_cast<int8_t>(atoi(row[5]));
-			e.level         = static_cast<int8_t>(atoi(row[6]));
-			e.name          = row[7] ? row[7] : "";
-			e.isgroupleader = static_cast<int8_t>(atoi(row[8]));
-			e.israidleader  = static_cast<int8_t>(atoi(row[9]));
-			e.islooter      = static_cast<int8_t>(atoi(row[10]));
+			e.raidid        = static_cast<int32_t>(atoi(row[0]));
+			e.charid        = static_cast<int32_t>(atoi(row[1]));
+			e.groupid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e._class        = static_cast<int8_t>(atoi(row[3]));
+			e.level         = static_cast<int8_t>(atoi(row[4]));
+			e.name          = row[5] ? row[5] : "";
+			e.isgroupleader = static_cast<int8_t>(atoi(row[6]));
+			e.israidleader  = static_cast<int8_t>(atoi(row[7]));
+			e.islooter      = static_cast<int8_t>(atoi(row[8]));

 			all_entries.push_back(e);
 		}
@@ -1,50 +0,0 @@
-#ifndef EQEMU_CHARACTER_TRIBUTE_REPOSITORY_H
-#define EQEMU_CHARACTER_TRIBUTE_REPOSITORY_H
-
-#include "../database.h"
-#include "../strings.h"
-#include "base/base_character_tribute_repository.h"
-
-class CharacterTributeRepository: public BaseCharacterTributeRepository {
-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
-     *
-     * CharacterTributeRepository::GetByZoneAndVersion(int zone_id, int zone_version)
-     * CharacterTributeRepository::GetWhereNeverExpires()
-     * CharacterTributeRepository::GetWhereXAndY()
-     * CharacterTributeRepository::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_CHARACTER_TRIBUTE_REPOSITORY_H
@@ -141,11 +141,11 @@ bool RuleManager::SetRule(const std::string &rule_name, const std::string &rule_

 	switch (type) {
 		case IntRule:
-			m_RuleIntValues[index] = Strings::ToInt(rule_value);
+			m_RuleIntValues[index] = Strings::ToInt(rule_value.c_str());
 			LogRules("Set rule [{}] to value [{}]", rule_name, m_RuleIntValues[index]);
 			break;
 		case RealRule:
-			m_RuleRealValues[index] = Strings::ToFloat(rule_value);
+			m_RuleRealValues[index] = Strings::ToFloat(rule_value.c_str());
 			LogRules("Set rule [{}] to value [{:.2f}]", rule_name, m_RuleRealValues[index]);
 			break;
 		case BoolRule:
@@ -369,7 +369,7 @@ void RuleManager::_SaveRule(Database *db, RuleType type, uint16 index) {
 			break;
 	}

-	const auto& rule_notes = _GetRuleNotes(type, index);
+	const auto rule_notes = _GetRuleNotes(type, index);

 	const auto& l = RuleValuesRepository::GetWhere(
 		*db,
@@ -93,9 +93,6 @@ RULE_INT(Character, ItemEnduranceRegenCap, 15, "Limit on endurance regeneration
 RULE_INT(Character, ItemExtraDmgCap, 150, "Cap for bonuses to melee skills like Bash, Frenzy, etc.")
 RULE_INT(Character, HasteCap, 100, "Haste cap for non-v3(over haste) haste")
 RULE_INT(Character, Hastev3Cap, 25, "Haste cap for v3(over haste) haste")
-RULE_BOOL(Character, HeroicStatsUseDataBucketsToScale, false, "Allows scaling the benefits a character receives from Heroic Stats using Data Buckets. Stacks with other Heroic Stats Mulitplier Rules.")
-RULE_REAL(Character, HeroicIntelligenceIncreaseSpellDmgMultiplier, 0.00, "Allows Heroic Intelligence to increase a Players Worn Spell Damage Stat from Equipment, for example, setting this rule to 1.00 will always grant 1 Spell Damage per 1 Heroic Intelligence")
-RULE_REAL(Character, HeroicWisdomIncreaseHealAmtMultiplier, 0.00, "Allows Heroic Wisdom to increase a Players Worn Heal Amount Stat from Equipment, for example, setting this rule to 1.00 will always grant 1 Heal Amount per 1 Heroic Wisdom")
 RULE_REAL(Character, HeroicStrengthMultiplier, 1.00, "Multplier scales benefits from Heroic Strength. Grants 25 Base Endurance, 0.05 Endurance Regen, 1 Melee Damage each Hit, and 1 Shield AC per 10 Heroic Strength.")
 RULE_REAL(Character, HeroicStaminaMultiplier, 1.00, "Multplier scales benefits from Heroic Stamina. Grants 25 Base Endurance, 0.05 Endurance Regen, 100 Base HP, and 0.5 HP Regen per 10 Heroic Stamina.")
 RULE_REAL(Character, HeroicAgilityMultiplier, 1.00, "Multplier scales benefits from Heroic Agility. Grants 25 Base Endurance, 0.05 Endurance Regen, and 1 Avoidance AC per 10 Heroic Agility. (Rule does not change Dodge Chance)")
@@ -136,6 +133,7 @@ RULE_BOOL(Character, EnableFoodRequirement, true, "If disabled, food is no longe
 RULE_INT(Character, BaseInstrumentSoftCap, 36, "Softcap for instrument mods, 36 commonly referred to as 3.6 as well")
 RULE_BOOL(Character, UseSpellFileSongCap, true, "When they removed the AA that increased the cap they removed the above and just use the spell field")
 RULE_INT(Character, BaseRunSpeedCap, 158, "Base Run Speed Cap, on live it's 158% which will give you a runspeed of 1.580 hard capped to 225")
+RULE_INT(Character, OrnamentationAugmentType, 20, "Ornamentation Augment Type")
 RULE_REAL(Character, EnvironmentDamageMulipliter, 1, "Multiplier for environmental damage like fall damage.")
 RULE_BOOL(Character, UnmemSpellsOnDeath, true, "Setting whether at death all memorized Spells are forgotten")
 RULE_REAL(Character, TradeskillUpAlchemy, 2.0, "Alchemy skillup rate adjustment. Lower is faster")
@@ -213,7 +211,6 @@ RULE_BOOL(Character, IgnoreLevelBasedHasteCaps, false, "Ignores hard coded level
 RULE_BOOL(Character, EnableRaidEXPModifier, true, "Enable or disable the raid experience modifier, default is true")
 RULE_BOOL(Character, EnableRaidMemberEXPModifier, true, "Enable or disable the raid experience modifier based on members in raid, default is true")
 RULE_BOOL(Character, LeaveCursorMoneyOnCorpse, false, "Enable or disable leaving cursor money on player corpses")
-RULE_BOOL(Character, ItemExtraSkillDamageCalcAsPercent, false, "If enabled, apply Item Extra Skill Damage as Percentage-based modifiers")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Mercs)
@@ -273,6 +270,7 @@ RULE_BOOL(World, EnableTutorialButton, true, "Setting whether the Tutorial butto
 RULE_BOOL(World, EnableReturnHomeButton, true, "Setting whether the Return Home button should be active")
 RULE_INT(World, MaxLevelForTutorial, 10, "The highest level with which you can enter the tutorial")
 RULE_INT(World, TutorialZoneID, 189, "Zone ID of the tutorial")
+RULE_INT(World, GuildBankZoneID, 345, "Zone ID of the guild bank")
 RULE_INT(World, MinOfflineTimeToReturnHome, 21600, "Minimum offline time to activate the Return Home button. 21600 seconds is 6 Hours")
 RULE_INT(World, MaxClientsPerIP, -1, "Maximum number of clients allowed to connect per IP address if account status is < AddMaxClientsStatus. Default value: -1 (feature disabled)")
 RULE_INT(World, ExemptMaxClientsStatus, -1, "Exempt accounts from the MaxClientsPerIP and AddMaxClientsStatus rules, if their status is >= this value. Default value: -1 (feature disabled)")
@@ -297,7 +295,6 @@ RULE_BOOL(World, StartZoneSameAsBindOnCreation, true, "Should the start zone alw
 RULE_BOOL(World, EnforceCharacterLimitAtLogin, false, "Enforce the limit for characters that are online at login")
 RULE_BOOL(World, EnableDevTools, true, "Enable or Disable the Developer Tools globally (Most of the time you want this enabled)")
 RULE_BOOL(World, EnableChecksumVerification, false, "Enable or Disable the Checksum Verification for eqgame.exe and spells_us.txt")
-RULE_INT(World, MaximumQuestErrors, 30, "Changes the maximum number of quest errors that can be displayed in #questerrors, default is 30")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Zone)
@@ -353,7 +350,6 @@ RULE_REAL(Watermap, FishingLineStepSize, 1, "Basic step size for fishing calc, t
 RULE_CATEGORY_END()

 RULE_CATEGORY(Spells)
-RULE_BOOL(Spells, AllowExtraDmgSkill, false, "Allow ExtraDmgSkill from Items, Spells, and AAs to apply ExtraDmgAmt when the ExtraDmgSkill matches the casted Spells Skill Type.")
 RULE_INT(Spells, BaseCritChance, 0, "Base percentage chance that everyone has to crit a spell")
 RULE_INT(Spells, BaseCritRatio, 100, "Base percentage bonus to damage on a successful spell crit. 100=2xdamage")
 RULE_INT(Spells, WizCritLevel, 12, "Level wizards first get spell crits")
@@ -445,8 +441,7 @@ RULE_BOOL(Spells, IllusionsAlwaysPersist, false, "Allows Illusions to persist be
 RULE_BOOL(Spells, UseItemCastMessage, false, "Enable to use the \"item begins to glow\" messages when casting from an item.")
 RULE_BOOL(Spells, TargetsTargetRequiresCombatRange, true, "Disable to remove combat range requirement from Target's Target Spell Target Type")
 RULE_BOOL(Spells, NPCBuffLevelRestrictions, false, "Impose BuffLevelRestrictions on NPCs if true")
-RULE_INT(Spells, ResurrectionEffectBlock, 2, "0 = allow overwrites/rule disabled. If set to 1 = Block all buffs that would overwrite Resurrection Effects. If set to 2 = Will not overwrite Resurrection Effects, instead moves new buff to an empty slot if available. Default is 2.")
-RULE_BOOL(Spells, WaterMatchRequiredForLoS, true, "Enable/Disable the requirement of both the attacker/victim being both in or out of water for spells LoS to pass.")
+RULE_BOOL(Spells, ResurrectionEffectsBlock, true, "If enabled, resurrection effects cannot be overwritten.")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Combat)
@@ -519,8 +514,6 @@ RULE_BOOL(Combat, HeadshotOnlyHumanoids, true, "Enable or disable Headshot only
 RULE_BOOL(Combat, EnableWarriorShielding, true, "Enable or disable Warrior Shielding Ability (/shield), true by default.")
 RULE_BOOL(Combat, BackstabIgnoresElemental, false, "Enable or disable Elemental weapon damage affecting backstab damage, false by default.")
 RULE_BOOL(Combat, BackstabIgnoresBane, false, "Enable or disable Bane weapon damage affecting backstab damage, false by default.")
-RULE_BOOL(Combat, SummonMeleeRange, true, "Enable or disable summoning of a player when already in melee range of the summoner.")
-RULE_BOOL(Combat, WaterMatchRequiredForAutoFireLoS, true, "Enable/Disable the requirement of both the attacker/victim being both in or out of water for AutoFire LoS to pass.")
 RULE_CATEGORY_END()

 RULE_CATEGORY(NPC)
@@ -585,7 +578,6 @@ RULE_BOOL(TaskSystem, RecordCompletedOptionalActivities, false, "Record complete
 RULE_BOOL(TaskSystem, KeepOneRecordPerCompletedTask, true, "Keep only one record per completed task")
 RULE_BOOL(TaskSystem, EnableTaskProximity, true, "Enable task proximity system")
 RULE_INT(TaskSystem, RequestCooldownTimerSeconds, 15, "Seconds between allowing characters to request tasks (live-like default: 15 seconds)")
-RULE_BOOL(TaskSystem, ExpRewardsIgnoreLevelBasedEXPMods, false, "Rewarding Level Based Exp will ignore Rule LevelBasedEXPMods if true")
 RULE_INT(TaskSystem, SharedTasksWorldProcessRate, 6000, "Timer interval (milliseconds) that shared tasks are processed in world")
 RULE_INT(TaskSystem, SharedTasksTerminateTimerMS, 120000, "Delay (milliseconds) until a shared task is terminated if requirements are no longer met after member removal (default: 2 minutes)")
 RULE_BOOL(TaskSystem, UpdateOneElementPerTask, true, "If true (live-like) task updates only increment the first matching activity. If false all matching elements will be incremented.")
@@ -294,7 +294,7 @@ void EQ::SayLinkEngine::generate_text()
 	m_LinkText = "null";
 }

-std::string EQ::SayLinkEngine::GenerateQuestSaylink(const std::string& saylink_text, bool silent, const std::string& link_name)
+std::string EQ::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name)
 {
 	uint32 saylink_id = 0;

@@ -403,14 +403,16 @@ SaylinkRepository::Saylink EQ::SayLinkEngine::GetOrSaveSaylink(std::string sayli
 	}

 	// if not found in database - save
-	auto new_saylink = SaylinkRepository::NewEntity();
-	new_saylink.phrase = saylink_text;
+	if (saylinks.empty()) {
+		auto new_saylink = SaylinkRepository::NewEntity();
+		new_saylink.phrase = saylink_text;

-	// persist to database
-	auto link = SaylinkRepository::InsertOne(database, new_saylink);
-	if (link.id > 0) {
-		g_cached_saylinks.emplace_back(link);
-		return link;
+		// persist to database
+		auto link = SaylinkRepository::InsertOne(database, new_saylink);
+		if (link.id > 0) {
+			g_cached_saylinks.emplace_back(link);
+			return link;
+		}
 	}

 	return {};
@@ -101,7 +101,7 @@ namespace EQ
 		const std::string& LinkBody() { return m_LinkBody; }	// contains string format: '<LinkBody>'
 		const std::string& LinkText() { return m_LinkText; }	// contains string format: '<LinkText>'

-		static std::string GenerateQuestSaylink(const std::string& saylink_text, bool silent, const std::string& link_name);
+		static std::string GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name);

 		void Reset();

@@ -99,9 +99,8 @@ public:
 		}
 	}
 	~Seperator() {
-		for (int i=0; i<=maxargnum; i++) {
+		for (int i=0; i<=maxargnum; i++)
 			safe_delete_array(arg[i]);
-		}
 		safe_delete_array(arg);
 		safe_delete_array(argplus);
 		safe_delete_array(msg);
@@ -235,19 +235,18 @@
 #define ServerOP_ReloadMerchants 0x4109
 #define ServerOP_ReloadNPCEmotes 0x4110
 #define ServerOP_ReloadObjects 0x4111
-#define ServerOP_ReloadOpcodes 0x4112
-#define ServerOP_ReloadPerlExportSettings 0x4113
-#define ServerOP_ReloadRules 0x4114
-#define ServerOP_ReloadStaticZoneData 0x4115
-#define ServerOP_ReloadTasks 0x4116
-#define ServerOP_ReloadTitles 0x4117
-#define ServerOP_ReloadTraps 0x4118
-#define ServerOP_ReloadVariables 0x4119
-#define ServerOP_ReloadVeteranRewards 0x4120
-#define ServerOP_ReloadWorld 0x4121
-#define ServerOP_ReloadZonePoints 0x4122
-#define ServerOP_ReloadDzTemplates 0x4123
-#define ServerOP_ReloadZoneData 0x4124
+#define ServerOP_ReloadPerlExportSettings 0x4112
+#define ServerOP_ReloadRules 0x4113
+#define ServerOP_ReloadStaticZoneData 0x4114
+#define ServerOP_ReloadTasks 0x4115
+#define ServerOP_ReloadTitles 0x4116
+#define ServerOP_ReloadTraps 0x4117
+#define ServerOP_ReloadVariables 0x4118
+#define ServerOP_ReloadVeteranRewards 0x4119
+#define ServerOP_ReloadWorld 0x4120
+#define ServerOP_ReloadZonePoints 0x4121
+#define ServerOP_ReloadDzTemplates 0x4122
+#define ServerOP_ReloadZoneData 0x4123

 #define ServerOP_CZDialogueWindow 0x4500
 #define ServerOP_CZLDoNUpdate 0x4501
@@ -47,9 +47,9 @@ const SharedTasksRepository::SharedTasks &SharedTask::GetDbSharedTask() const
 	return m_db_shared_task;
 }

-void SharedTask::SetDbSharedTask(const SharedTasksRepository::SharedTasks &t)
+void SharedTask::SetDbSharedTask(const SharedTasksRepository::SharedTasks &m_db_shared_task)
 {
-	SharedTask::m_db_shared_task = t;
+	SharedTask::m_db_shared_task = m_db_shared_task;
 }

 SharedTaskRequest SharedTask::GetRequestCharacters(Database &db, uint32_t requested_character_id)
@@ -216,7 +216,7 @@ public:

 	// active record of database shared task
 	const SharedTasksRepository::SharedTasks &GetDbSharedTask() const;
-	void SetDbSharedTask(const SharedTasksRepository::SharedTasks &t);
+	void SetDbSharedTask(const SharedTasksRepository::SharedTasks &m_db_shared_task);

 	std::vector<SharedTaskActivityStateEntry> m_shared_task_activity_state;
 	std::vector<SharedTaskMember>             m_members;
@@ -126,61 +126,62 @@ uint32 SharedDatabase::GetTotalTimeEntitledOnAccount(uint32 AccountID) {
 	const std::string query = StringFormat("SELECT `time_played` FROM `character_data` WHERE `account_id` = %u", AccountID);
 	auto results = QueryDatabase(query);
 	for (auto& row = results.begin(); row != results.end(); ++row) {
-		EntitledTime += Strings::ToUnsignedInt(row[0]);
+		EntitledTime += Strings::ToInt(row[0]);
 	}
 	return EntitledTime;
 }

 void SharedDatabase::SetMailKey(int CharID, int IPAddress, int MailKey)
 {
-	char mail_key[17];
+	char MailKeyString[17];

-	if (RuleB(Chat, EnableMailKeyIPVerification) == true) {
-		sprintf(mail_key, "%08X%08X", IPAddress, MailKey);
-	}
-	else {
-		sprintf(mail_key, "%08X", MailKey);
-	}
+	if (RuleB(Chat, EnableMailKeyIPVerification) == true)
+		sprintf(MailKeyString, "%08X%08X", IPAddress, MailKey);
+	else
+		sprintf(MailKeyString, "%08X", MailKey);

-	const std::string query = StringFormat(
-		"UPDATE character_data SET mailkey = '%s' WHERE id = '%i'",
-		mail_key, CharID
-	);
+	const std::string query = StringFormat("UPDATE character_data SET mailkey = '%s' WHERE id = '%i'",
+	                                       MailKeyString, CharID);
+	const auto results = QueryDatabase(query);
+	if (!results.Success())
+		LogError("SharedDatabase::SetMailKey({}, {}) : {}", CharID, MailKeyString, results.ErrorMessage().c_str());

-	const auto        results = QueryDatabase(query);
-	if (!results.Success()) {
-		LogError("SharedDatabase::SetMailKey({}, {}) : {}", CharID, mail_key, results.ErrorMessage().c_str());
-	}
 }

-SharedDatabase::MailKeys SharedDatabase::GetMailKey(int character_id)
+std::string SharedDatabase::GetMailKey(int CharID, bool key_only)
 {
-	const std::string query   = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `id`='%i' LIMIT 1", character_id);
-	auto              results = QueryDatabase(query);
+	const std::string query = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `id`='%i' LIMIT 1", CharID);
+	auto results = QueryDatabase(query);
+
 	if (!results.Success()) {
-		return MailKeys{};
+
+		Log(Logs::Detail, Logs::MySQLError, "Error retrieving mailkey from database: %s", results.ErrorMessage().c_str());
+		return std::string();
 	}

 	if (!results.RowCount()) {
-		Log(Logs::General,
-			Logs::ClientLogin,
-			"Error: Mailkey for character id [%i] does not exist or could not be found",
-			character_id
-		);
-		return MailKeys{};
+
+		Log(Logs::General, Logs::ClientLogin, "Error: Mailkey for character id [%i] does not exist or could not be found", CharID);
+		return std::string();
 	}

-	auto &row = results.begin();
+	auto& row = results.begin();
 	if (row != results.end()) {
+
 		std::string mail_key = row[0];

-		return MailKeys{
-			.mail_key = mail_key.substr(8),
-			.mail_key_full = mail_key
-		};
+		if (mail_key.length() > 8 && key_only) {
+			return mail_key.substr(8);
+		}
+		else {
+			return mail_key;
+		}
 	}
+	else {

-	return MailKeys{};
+		Log(Logs::General, Logs::MySQLError, "Internal MySQL error in SharedDatabase::GetMailKey(int, bool)");
+		return std::string();
+	}
 }

 bool SharedDatabase::SaveCursor(uint32 char_id, std::list<EQ::ItemInstance*>::const_iterator &start, std::list<EQ::ItemInstance*>::const_iterator &end)
@@ -227,8 +228,8 @@ bool SharedDatabase::VerifyInventory(uint32 account_id, int16 slot_id, const EQ:

 	auto& row = results.begin();

-	const uint32 id = Strings::ToUnsignedInt(row[0]);
-	const uint16 charges = Strings::ToUnsignedInt(row[1]);
+	const uint32 id = Strings::ToInt(row[0]);
+	const uint16 charges = Strings::ToInt(row[1]);

    uint16 expect_charges;

@@ -294,11 +295,11 @@ bool SharedDatabase::UpdateInventorySlot(uint32 char_id, const EQ::ItemInstance*

 	// Update/Insert item
 	const std::string query = StringFormat("REPLACE INTO inventory "
-	                                       "(charid, slotid, itemid, charges, instnodrop, custom_data, color, "
+	                                       "(guid, charid, slotid, itemid, charges, instnodrop, custom_data, color, "
 	                                       "augslot1, augslot2, augslot3, augslot4, augslot5, augslot6, ornamenticon, ornamentidfile, ornament_hero_model) "
-	                                       "VALUES( %lu, %lu, %lu, %lu, %lu, '%s', %lu, "
+	                                       "VALUES( '%s', %lu, %lu, %lu, %lu, %lu, '%s', %lu, "
 	                                       "%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu)",
-	                                       static_cast<unsigned long>(char_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
+	                                       inst->GetGuid().c_str(), static_cast<unsigned long>(char_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
 	                                       static_cast<unsigned long>(charges), static_cast<unsigned long>(inst->IsAttuned() ? 1 : 0),
 	                                       inst->GetCustomDataString().c_str(), static_cast<unsigned long>(inst->GetColor()),
 	                                       static_cast<unsigned long>(augslot[0]), static_cast<unsigned long>(augslot[1]), static_cast<unsigned long>(augslot[2]),
@@ -342,11 +343,11 @@ bool SharedDatabase::UpdateSharedBankSlot(uint32 char_id, const EQ::ItemInstance
        charges = 0x7FFF;

 	const std::string query = StringFormat("REPLACE INTO sharedbank "
-	                                       "(acctid, slotid, itemid, charges, custom_data, "
+	                                       "(guid, acctid, slotid, itemid, charges, custom_data, "
 	                                       "augslot1, augslot2, augslot3, augslot4, augslot5, augslot6) "
-	                                       "VALUES( %lu, %lu, %lu, %lu, '%s', "
+	                                       "VALUES( '%s', %lu, %lu, %lu, %lu, '%s', "
 	                                       "%lu, %lu, %lu, %lu, %lu, %lu)",
-	                                       static_cast<unsigned long>(account_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
+	                                       inst->GetGuid().c_str(), static_cast<unsigned long>(account_id), static_cast<unsigned long>(slot_id), static_cast<unsigned long>(inst->GetItem()->ID),
 	                                       static_cast<unsigned long>(charges), inst->GetCustomDataString().c_str(), static_cast<unsigned long>(augslot[0]),
 	                                       static_cast<unsigned long>(augslot[1]), static_cast<unsigned long>(augslot[2]), static_cast<unsigned long>(augslot[3]), static_cast<unsigned long>(augslot[4]),
 	                                       static_cast<unsigned long>(augslot[5]));
@@ -424,13 +425,17 @@ bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id) {

 int32 SharedDatabase::GetSharedPlatinum(uint32 account_id)
 {
-	const auto query   = fmt::format("SELECT sharedplat FROM account WHERE id = {}", account_id);
-	auto       results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
-	}
+	const std::string query = StringFormat("SELECT sharedplat FROM account WHERE id = '%i'", account_id);
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+		return false;
+    }
+
+    if (results.RowCount() != 1)
+        return 0;
+
+	auto& row = results.begin();

-	auto row = results.begin();
 	return Strings::ToInt(row[0]);
 }

@@ -476,7 +481,7 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, EQ::InventoryPro
 		if(!myitem)
 			continue;

-		const EQ::ItemInstance* myinst = CreateBaseItem(myitem, charges);
+		const EQ::ItemInstance* myinst = CreateBaseItem(myitem, "", charges);

 		if(slot < 0)
 			slot = inv->FindFreeSlot(0, 0);
@@ -494,73 +499,78 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 {
 	std::string query;

-	if (is_charid) {
-		query = fmt::format(
-			"SELECT sb.slotid, sb.itemid, sb.charges, "
-			"sb.augslot1, sb.augslot2, sb.augslot3, "
-			"sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
-			"FROM sharedbank sb INNER JOIN character_data ch "
-			"ON ch.account_id = sb.acctid WHERE ch.id = {} ORDER BY sb.slotid",
-			id
-		);
-	} else {
-		query = fmt::format(
-			"SELECT slotid, itemid, charges, "
-			"augslot1, augslot2, augslot3, "
-			"augslot4, augslot5, augslot6, custom_data "
-			"FROM sharedbank WHERE acctid = {} ORDER BY slotid",
-			id
-		);
-	}
-
+	if (is_charid)
+		query = StringFormat("SELECT sb.slotid, sb.itemid, sb.charges, "
+				     "sb.augslot1, sb.augslot2, sb.augslot3, "
+				     "sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data, sb.guid "
+				     "FROM sharedbank sb INNER JOIN character_data ch "
+				     "ON ch.account_id=sb.acctid WHERE ch.id = %i ORDER BY sb.slotid",
+				     id);
+	else
+		query = StringFormat("SELECT slotid, itemid, charges, "
+				     "augslot1, augslot2, augslot3, "
+				     "augslot4, augslot5, augslot6, custom_data, guid "
+				     "FROM sharedbank WHERE acctid=%i ORDER BY slotid",
+				     id);
 	auto results = QueryDatabase(query);
-	// If we have no results we still need to return true
 	if (!results.Success()) {
 		return false;
 	}

-	for (auto row : results) {
+	for (auto& row = results.begin(); row != results.end(); ++row) {
 		int16 slot_id = static_cast<int16>(Strings::ToInt(row[0]));
-		uint32 item_id = Strings::ToUnsignedInt(row[1]);
+		uint32 item_id = static_cast<uint32>(Strings::ToInt(row[1]));
 		const int16 charges = static_cast<int16>(Strings::ToInt(row[2]));

 		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = Strings::ToUnsignedInt(row[3]);
-		aug[1] = Strings::ToUnsignedInt(row[4]);
-		aug[2] = Strings::ToUnsignedInt(row[5]);
-		aug[3] = Strings::ToUnsignedInt(row[6]);
-		aug[4] = Strings::ToUnsignedInt(row[7]);
-		aug[5] = Strings::ToUnsignedInt(row[8]);
+		aug[0] = static_cast<uint32>(Strings::ToInt(row[3]));
+		aug[1] = static_cast<uint32>(Strings::ToInt(row[4]));
+		aug[2] = static_cast<uint32>(Strings::ToInt(row[5]));
+		aug[3] = static_cast<uint32>(Strings::ToInt(row[6]));
+		aug[4] = static_cast<uint32>(Strings::ToInt(row[7]));
+		aug[5] = static_cast<uint32>(Strings::ToInt(row[8]));

 		const EQ::ItemData *item = GetItem(item_id);

 		if (!item) {
-			LogError(
-				"Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
-				is_charid ? "charid" : "acctid",
-				id,
-				item_id,
-				slot_id
-			);
+			LogError("Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
+				((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
 			continue;
 		}

-		auto inst = CreateBaseItem(item, charges);
-		if (!inst) {
-			continue;
-		}
+		std::string guid = row[10];

+		EQ::ItemInstance *inst = CreateBaseItem(item, guid, charges);
 		if (inst && item->IsClassCommon()) {
 			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i]) {
+				if (aug[i])
 					inst->PutAugment(this, i, aug[i]);
-				}
 			}
 		}

 		if (inst && row[9]) {
 			std::string data_str(row[9]);
-			inst->SetCustomDataString(data_str);
+			std::string idAsString;
+			std::string value;
+			bool use_id = true;
+
+			for (int i = 0; i < data_str.length(); ++i) {
+				if (data_str[i] == '^') {
+					if (!use_id) {
+						inst->SetCustomData(idAsString, value);
+						idAsString.clear();
+						value.clear();
+					}
+					use_id = !use_id;
+					continue;
+				}
+
+				const char v = data_str[i];
+				if (use_id)
+					idAsString.push_back(v);
+				else
+					value.push_back(v);
+			}
 		}

 		// theoretically inst can be nullptr ... this would be very bad ...
@@ -568,21 +578,14 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 		safe_delete(inst);

 		// Save ptr to item in inventory
-		if (put_slot_id != INVALID_INDEX) {
+		if (put_slot_id != INVALID_INDEX)
 			continue;
-		}

-		LogError(
-			"Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
-			is_charid ? "charid" : "acctid",
-			id,
-			item_id,
-			slot_id
-		);
+		LogError("Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
+			((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);

-		if (is_charid) {
+		if (is_charid)
 			SaveInventory(id, nullptr, slot_id);
-		}
 	}

 	return true;
@@ -597,7 +600,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 	// Retrieve character inventory
 	const std::string query =
 	    StringFormat("SELECT slotid, itemid, charges, color, augslot1, augslot2, augslot3, augslot4, augslot5, "
-			 "augslot6, instnodrop, custom_data, ornamenticon, ornamentidfile, ornament_hero_model FROM "
+			 "augslot6, instnodrop, custom_data, ornamenticon, ornamentidfile, ornament_hero_model, guid FROM "
 			 "inventory WHERE charid = %i ORDER BY slotid",
 			 char_id);
 	auto results = QueryDatabase(query);
@@ -638,14 +641,14 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 		}
 		else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { // Titanium check
 			const auto parent_index = ((slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
-			if (parent_index >= bank_size) {
+			if (parent_index < EQ::invslot::SLOT_BEGIN || parent_index >= bank_size) {
 				cv_conflict = true;
 				continue;
 			}
 		}

-		uint32 item_id = Strings::ToUnsignedInt(row[1]);
-		const uint16 charges = Strings::ToUnsignedInt(row[2]);
+		uint32 item_id = Strings::ToInt(row[1]);
+		const uint16 charges = Strings::ToInt(row[2]);
 		const uint32 color = Strings::ToUnsignedInt(row[3]);

 		uint32 aug[EQ::invaug::SOCKET_COUNT];
@@ -657,7 +660,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 		aug[4] = Strings::ToUnsignedInt(row[8]);
 		aug[5] = Strings::ToUnsignedInt(row[9]);

-		const bool instnodrop = (row[10] && static_cast<uint16>(Strings::ToUnsignedInt(row[10])));
+		const bool instnodrop = (row[10] && static_cast<uint16>(Strings::ToInt(row[10]))) ? true : false;

 		const uint32 ornament_icon = Strings::ToUnsignedInt(row[12]);
 		const uint32 ornament_idfile = Strings::ToUnsignedInt(row[13]);
@@ -671,14 +674,36 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 			continue;
 		}

-		EQ::ItemInstance *inst = CreateBaseItem(item, charges);
+		std::string guid = row[15];
+		EQ::ItemInstance *inst = CreateBaseItem(item, guid, charges);

 		if (inst == nullptr)
 			continue;

 		if (row[11]) {
 			std::string data_str(row[11]);
-			inst->SetCustomDataString(data_str);
+			std::string idAsString;
+			std::string value;
+			bool use_id = true;
+
+			for (int i = 0; i < data_str.length(); ++i) {
+				if (data_str[i] == '^') {
+					if (!use_id) {
+						inst->SetCustomData(idAsString, value);
+						idAsString.clear();
+						value.clear();
+					}
+
+					use_id = !use_id;
+					continue;
+				}
+
+				const char v = data_str[i];
+				if (use_id)
+					idAsString.push_back(v);
+				else
+					value.push_back(v);
+			}
 		}

 		inst->SetOrnamentIcon(ornament_icon);
@@ -759,7 +784,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryPr
 	const std::string query =
 	    StringFormat("SELECT slotid, itemid, charges, color, augslot1, "
 			 "augslot2, augslot3, augslot4, augslot5, augslot6, instnodrop, custom_data, ornamenticon, "
-			 "ornamentidfile, ornament_hero_model "
+			 "ornamentidfile, ornament_hero_model, guid "
 			 "FROM inventory INNER JOIN character_data ch "
 			 "ON ch.id = charid WHERE ch.name = '%s' AND ch.account_id = %i ORDER BY slotid",
 			 name, account_id);
@@ -773,19 +798,19 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryPr

 	for (auto& row = results.begin(); row != results.end(); ++row) {
 		int16 slot_id = Strings::ToInt(row[0]);
-		uint32 item_id = Strings::ToUnsignedInt(row[1]);
+		uint32 item_id = Strings::ToInt(row[1]);
 		const int8 charges = Strings::ToInt(row[2]);
 		const uint32 color = Strings::ToUnsignedInt(row[3]);

 		uint32 aug[EQ::invaug::SOCKET_COUNT];
-		aug[0] = Strings::ToUnsignedInt(row[4]);
-		aug[1] = Strings::ToUnsignedInt(row[5]);
-		aug[2] = Strings::ToUnsignedInt(row[6]);
-		aug[3] = Strings::ToUnsignedInt(row[7]);
-		aug[4] = Strings::ToUnsignedInt(row[8]);
-		aug[5] = Strings::ToUnsignedInt(row[9]);
+		aug[0] = static_cast<uint32>(Strings::ToInt(row[4]));
+		aug[1] = static_cast<uint32>(Strings::ToInt(row[5]));
+		aug[2] = static_cast<uint32>(Strings::ToInt(row[6]));
+		aug[3] = static_cast<uint32>(Strings::ToInt(row[7]));
+		aug[4] = static_cast<uint32>(Strings::ToInt(row[8]));
+		aug[5] = static_cast<uint32>(Strings::ToInt(row[9]));

-		const bool instnodrop = (row[10] && static_cast<uint16>(Strings::ToUnsignedInt(row[10])));
+		const bool instnodrop = (row[10] && static_cast<uint16>(Strings::ToInt(row[10]))) ? true : false;
 		const uint32 ornament_icon = Strings::ToUnsignedInt(row[12]);
 		const uint32 ornament_idfile = Strings::ToUnsignedInt(row[13]);
 		uint32 ornament_hero_model = Strings::ToUnsignedInt(row[14]);
@@ -794,7 +819,9 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryPr
 		if (!item)
 			continue;

-		EQ::ItemInstance *inst = CreateBaseItem(item, charges);
+		std::string guid = row[15];
+
+		EQ::ItemInstance *inst = CreateBaseItem(item, guid, charges);

 		if (inst == nullptr)
 			continue;
@@ -803,7 +830,28 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryPr

 		if (row[11]) {
 			std::string data_str(row[11]);
-			inst->SetCustomDataString(data_str);
+			std::string idAsString;
+			std::string value;
+			bool use_id = true;
+
+			for (int i = 0; i < data_str.length(); ++i) {
+				if (data_str[i] == '^') {
+					if (!use_id) {
+						inst->SetCustomData(idAsString, value);
+						idAsString.clear();
+						value.clear();
+					}
+
+					use_id = !use_id;
+					continue;
+				}
+
+				const char v = data_str[i];
+				if (use_id)
+					idAsString.push_back(v);
+				else
+					value.push_back(v);
+			}
 		}

 		inst->SetOrnamentIcon(ornament_icon);
@@ -862,7 +910,7 @@ uint32 SharedDatabase::GetItemRecastTimestamp(uint32 char_id, uint32 recast_type
 		return 0;

 	auto& row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
 }

 void SharedDatabase::ClearOldRecastTimestamps(uint32 char_id)
@@ -890,10 +938,10 @@ void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id)
 	auto& row = results.begin();

 	if (row[0])
-		max_id = Strings::ToUnsignedInt(row[0]);
+		max_id = Strings::ToInt(row[0]);

 	if (row[1])
-		item_count = Strings::ToUnsignedInt(row[1]);
+		item_count = Strings::ToInt(row[1]);
 }

 bool SharedDatabase::LoadItems(const std::string &prefix) {
@@ -982,24 +1030,24 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		strn0cpy(item.Lore, row[ItemField::lore], sizeof(item.Lore));

 		// Flags
-		item.ArtifactFlag = Strings::ToBool(row[ItemField::artifactflag]);
-		item.Attuneable = !disable_attuneable && Strings::ToBool(row[ItemField::attuneable]);
-		item.BenefitFlag = Strings::ToBool(row[ItemField::benefitflag]);
-		item.FVNoDrop = Strings::ToBool(row[ItemField::fvnodrop]);
-		item.Magic = Strings::ToBool(row[ItemField::magic]);
+		item.ArtifactFlag = Strings::ToInt(row[ItemField::artifactflag]) ? true : false;
+		item.Attuneable = disable_attuneable ? false : Strings::ToInt(row[ItemField::attuneable]) ? true : false;
+		item.BenefitFlag = Strings::ToInt(row[ItemField::benefitflag]) ? true : false;
+		item.FVNoDrop = Strings::ToInt(row[ItemField::fvnodrop]) ? true : false;
+		item.Magic = Strings::ToInt(row[ItemField::magic]) ? true : false;
 		item.NoDrop = disable_no_drop ? static_cast<uint8>(255) : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::nodrop]));
-		item.NoPet = !disable_no_pet && Strings::ToBool(row[ItemField::nopet]);
+		item.NoPet = disable_no_pet ? false : Strings::ToInt(row[ItemField::nopet]) ? true : false;
 		item.NoRent = disable_no_rent ? static_cast<uint8>(255) : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::norent]));
-		item.NoTransfer = !disable_no_transfer && Strings::ToBool(row[ItemField::notransfer]);
-		item.PendingLoreFlag = Strings::ToBool(row[ItemField::pendingloreflag]);
-		item.QuestItemFlag = Strings::ToBool(row[ItemField::questitemflag]);
-		item.Stackable = Strings::ToBool(row[ItemField::stackable]);
-		item.Tradeskills = Strings::ToBool(row[ItemField::tradeskills]);
-		item.SummonedFlag = Strings::ToBool(row[ItemField::summonedflag]);
+		item.NoTransfer = disable_no_transfer ? false : Strings::ToInt(row[ItemField::notransfer]) ? true : false;
+		item.PendingLoreFlag = Strings::ToInt(row[ItemField::pendingloreflag]) ? true : false;
+		item.QuestItemFlag = Strings::ToInt(row[ItemField::questitemflag]) ? true : false;
+		item.Stackable = Strings::ToInt(row[ItemField::stackable]) ? true : false;
+		item.Tradeskills = Strings::ToInt(row[ItemField::tradeskills]) ? true : false;
+		item.SummonedFlag = Strings::ToInt(row[ItemField::summonedflag]) ? true : false;

 		// Lore
 		item.LoreGroup = disable_lore ? 0 : Strings::ToInt(row[ItemField::loregroup]);
-		item.LoreFlag = !disable_lore && item.LoreGroup != 0;
+		item.LoreFlag = disable_lore ? false : item.LoreGroup != 0;

 		// Type
 		item.AugType = Strings::ToUnsignedInt(row[ItemField::augtype]);
@@ -1015,7 +1063,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		item.Weight = Strings::ToInt(row[ItemField::weight]);

 		// Potion Belt
-		item.PotionBelt = !disable_potion_belt && Strings::ToBool(row[ItemField::potionbelt]);
+		item.PotionBelt = disable_potion_belt ? false : Strings::ToInt(row[ItemField::potionbelt]) ? true : false;
 		item.PotionBeltSlots = disable_potion_belt ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::potionbeltslots]));

 		// Merchant
@@ -1126,8 +1174,8 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		item.SkillModType = Strings::ToUnsignedInt(row[ItemField::skillmodtype]);

 		// Extra Damage Skill
-		item.ExtraDmgSkill = Strings::ToInt(row[ItemField::extradmgskill]);
-		item.ExtraDmgAmt = Strings::ToInt(row[ItemField::extradmgamt]);
+		item.ExtraDmgSkill = Strings::ToUnsignedInt(row[ItemField::extradmgskill]);
+		item.ExtraDmgAmt = Strings::ToUnsignedInt(row[ItemField::extradmgamt]);

 		// Bard
 		item.BardType = Strings::ToUnsignedInt(row[ItemField::bardtype]);
@@ -1326,8 +1374,8 @@ void SharedDatabase::GetFactionListInfo(uint32 &list_count, uint32 &max_lists) {

    auto& row = results.begin();

-    list_count = Strings::ToUnsignedInt(row[0]);
-    max_lists = Strings::ToUnsignedInt(row[1] ? row[1] : "0");
+    list_count = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
+    max_lists = static_cast<uint32>(Strings::ToUnsignedInt(row[1] ? row[1] : "0"));
 }

 const NPCFactionList* SharedDatabase::GetNPCFactionEntry(uint32 id) const
@@ -1360,7 +1408,7 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
    uint32 current_entry = 0;

    for(auto& row = results.begin(); row != results.end(); ++row) {
-	    const uint32 id = Strings::ToUnsignedInt(row[0]);
+	    const uint32 id = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
        if(id != current_id) {
            if(current_id != 0) {
                hash.insert(current_id, faction);
@@ -1370,7 +1418,7 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
            current_entry = 0;
            current_id = id;
            faction.id = id;
-            faction.primaryfaction = Strings::ToUnsignedInt(row[1]);
+            faction.primaryfaction = static_cast<uint32>(Strings::ToUnsignedInt(row[1]));
            faction.assistprimaryfaction = (Strings::ToInt(row[2]) == 0);
        }

@@ -1380,10 +1428,10 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
        if(current_entry >= MAX_NPC_FACTIONS)
 				continue;

-        faction.factionid[current_entry] = Strings::ToUnsignedInt(row[3]);
-        faction.factionvalue[current_entry] = Strings::ToInt(row[4]);
+        faction.factionid[current_entry] = static_cast<uint32>(Strings::ToUnsignedInt(row[3]));
+        faction.factionvalue[current_entry] = static_cast<int32>(Strings::ToInt(row[4]));
        faction.factionnpcvalue[current_entry] = static_cast<int8>(Strings::ToInt(row[5]));
-        faction.factiontemp[current_entry] = static_cast<uint8>(Strings::ToUnsignedInt(row[6]));
+        faction.factiontemp[current_entry] = static_cast<uint8>(Strings::ToInt(row[6]));
        ++current_entry;
    }

@@ -1501,17 +1549,13 @@ EQ::ItemInstance* SharedDatabase::CreateItem(
 	uint32 aug4,
 	uint32 aug5,
 	uint32 aug6,
-	bool attuned,
-	const std::string& custom_data,
-	uint32 ornamenticon,
-	uint32 ornamentidfile,
-	uint32 ornament_hero_model
+	bool attuned
 ) {
 	EQ::ItemInstance* inst = nullptr;

 	const EQ::ItemData* item = GetItem(item_id);
 	if (item) {
-		inst = CreateBaseItem(item, charges);
+		inst = CreateBaseItem(item, "", charges);

 		if (!inst) {
 			LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateItem()");
@@ -1526,10 +1570,6 @@ EQ::ItemInstance* SharedDatabase::CreateItem(
 		inst->PutAugment(this, 4, aug5);
 		inst->PutAugment(this, 5, aug6);
 		inst->SetAttuned(attuned);
-		inst->SetCustomDataString(custom_data);
-		inst->SetOrnamentIcon(ornamenticon);
-		inst->SetOrnamentationIDFile(ornamentidfile);
-		inst->SetOrnamentHeroModel(ornament_hero_model);
 	}

 	return inst;
@@ -1546,15 +1586,11 @@ EQ::ItemInstance* SharedDatabase::CreateItem(
 	uint32 aug4,
 	uint32 aug5,
 	uint32 aug6,
-	bool attuned,
-	const std::string& custom_data,
-	uint32 ornamenticon,
-	uint32 ornamentidfile,
-	uint32 ornament_hero_model
+	bool attuned
 ) {
 	EQ::ItemInstance* inst = nullptr;
 	if (item) {
-		inst = CreateBaseItem(item, charges);
+		inst = CreateBaseItem(item, "", charges);

 		if (!inst) {
 			LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateItem()");
@@ -1569,42 +1605,34 @@ EQ::ItemInstance* SharedDatabase::CreateItem(
 		inst->PutAugment(this, 4, aug5);
 		inst->PutAugment(this, 5, aug6);
 		inst->SetAttuned(attuned);
-		inst->SetCustomDataString(custom_data);
-		inst->SetOrnamentIcon(ornamenticon);
-		inst->SetOrnamentationIDFile(ornamentidfile);
-		inst->SetOrnamentHeroModel(ornament_hero_model);
 	}

 	return inst;
 }

-EQ::ItemInstance* SharedDatabase::CreateBaseItem(const EQ::ItemData* item, int16 charges) {
+EQ::ItemInstance* SharedDatabase::CreateBaseItem(const EQ::ItemData* item, const std::string& guid, int16 charges) {
 	EQ::ItemInstance* inst = nullptr;
 	if (item) {
 		// if maxcharges is -1 that means it is an unlimited use item.
 		// set it to 1 charge so that it is usable on creation
-		if (charges == 0 && item->MaxCharges == -1) {
+		if (charges == 0 && item->MaxCharges == -1)
 			charges = 1;
-		}
-
 		// Stackable items need a minimum charge of 1 to remain moveable.
-		if (charges <= 0 && item->Stackable) {
+		if(charges <= 0 && item->Stackable)
 			charges = 1;
-		}

-		inst = new EQ::ItemInstance(item, charges);
+		inst = new EQ::ItemInstance(item, guid, charges);

-		if (!inst) {
+		if (inst == nullptr) {
 			LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateBaseItem()");
 			LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
 			return nullptr;
 		}

-		if (item->CharmFileID != 0 || item->LoreGroup >= 1000) {
+		if(item->CharmFileID != 0 || (item->LoreGroup >= 1000 && item->LoreGroup != -1)) {
 			inst->Initialize(this);
 		}
 	}
-
 	return inst;
 }

@@ -1641,7 +1669,7 @@ bool SharedDatabase::GetCommandSettings(std::map<std::string, std::pair<uint8, s
 		return false;

 	for (auto& row = results.begin(); row != results.end(); ++row) {
-		command_settings[row[0]].first = Strings::ToUnsignedInt(row[1]);
+		command_settings[row[0]].first = Strings::ToInt(row[1]);
 		if (row[2][0] == 0)
 			continue;

@@ -1739,10 +1767,10 @@ void SharedDatabase::LoadSkillCaps(void *data) {
 	}

    for(auto& row = results.begin(); row != results.end(); ++row) {
-	    const uint8 skillID = Strings::ToUnsignedInt(row[0]);
-	    const uint8 class_ = Strings::ToUnsignedInt(row[1]) - 1;
-	    const uint8 level = Strings::ToUnsignedInt(row[2]);
-	    const uint16 cap = Strings::ToUnsignedInt(row[3]);
+	    const uint8 skillID = Strings::ToInt(row[0]);
+	    const uint8 class_ = Strings::ToInt(row[1]) - 1;
+	    const uint8 level = Strings::ToInt(row[2]);
+	    const uint16 cap = Strings::ToInt(row[3]);

        if(skillID >= skill_count || class_ >= class_count || level >= level_count)
            continue;
@@ -1843,7 +1871,7 @@ void SharedDatabase::LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpe
    for(auto& row = results.begin(); row != results.end(); ++row) {
 	    const int spellID = Strings::ToInt(row[0]);
        if((spellID > 0) && (spellID <= iMaxSpellID))
-            sp[spellID].damage_shield_type = Strings::ToUnsignedInt(row[1]);
+            sp[spellID].damage_shield_type = Strings::ToInt(row[1]);
    }

 }
@@ -1924,16 +1952,16 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 		strn0cpy(sp[tempid].cast_on_other, row[7], sizeof(sp[tempid].cast_on_other));
 		strn0cpy(sp[tempid].spell_fades, row[8], sizeof(sp[tempid].spell_fades));

-		sp[tempid].range = Strings::ToFloat(row[9]);
-		sp[tempid].aoe_range = Strings::ToFloat(row[10]);
-		sp[tempid].push_back = Strings::ToFloat(row[11]);
-		sp[tempid].push_up = Strings::ToFloat(row[12]);
-		sp[tempid].cast_time=Strings::ToUnsignedInt(row[13]);
-		sp[tempid].recovery_time=Strings::ToUnsignedInt(row[14]);
-		sp[tempid].recast_time=Strings::ToUnsignedInt(row[15]);
-		sp[tempid].buff_duration_formula=Strings::ToUnsignedInt(row[16]);
-		sp[tempid].buff_duration=Strings::ToUnsignedInt(row[17]);
-		sp[tempid].aoe_duration=Strings::ToUnsignedInt(row[18]);
+		sp[tempid].range=static_cast<float>(Strings::ToFloat(row[9]));
+		sp[tempid].aoe_range=static_cast<float>(Strings::ToFloat(row[10]));
+		sp[tempid].push_back=static_cast<float>(Strings::ToFloat(row[11]));
+		sp[tempid].push_up=static_cast<float>(Strings::ToFloat(row[12]));
+		sp[tempid].cast_time=Strings::ToInt(row[13]);
+		sp[tempid].recovery_time=Strings::ToInt(row[14]);
+		sp[tempid].recast_time=Strings::ToInt(row[15]);
+		sp[tempid].buff_duration_formula=Strings::ToInt(row[16]);
+		sp[tempid].buff_duration=Strings::ToInt(row[17]);
+		sp[tempid].aoe_duration=Strings::ToInt(row[18]);
 		sp[tempid].mana=Strings::ToInt(row[19]);

 		int y=0;
@@ -1956,7 +1984,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 			sp[tempid].no_expend_reagent[y]=Strings::ToInt(row[66+y]);

 		for(y=0; y< EFFECT_COUNT;y++)
-			sp[tempid].formula[y]=Strings::ToUnsignedInt(row[70+y]);
+			sp[tempid].formula[y]=Strings::ToInt(row[70+y]);

 		sp[tempid].good_effect=Strings::ToInt(row[83]);
 		sp[tempid].activated=Strings::ToInt(row[84]);
@@ -1991,51 +2019,51 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 			sp[tempid].deities[y]=Strings::ToInt(row[126+y]);

 		sp[tempid].new_icon=Strings::ToInt(row[144]);
-		sp[tempid].uninterruptable=Strings::ToBool(row[146]);
+		sp[tempid].uninterruptable=Strings::ToInt(row[146]) != 0;
 		sp[tempid].resist_difficulty=Strings::ToInt(row[147]);
-		sp[tempid].unstackable_dot = Strings::ToBool(row[148]);
-		sp[tempid].recourse_link = Strings::ToUnsignedInt(row[150]);
-		sp[tempid].no_partial_resist = Strings::ToBool(row[151]);
+		sp[tempid].unstackable_dot = Strings::ToInt(row[148]) != 0;
+		sp[tempid].recourse_link = Strings::ToInt(row[150]);
+		sp[tempid].no_partial_resist = Strings::ToInt(row[151]) != 0;

 		sp[tempid].short_buff_box = Strings::ToInt(row[154]);
 		sp[tempid].description_id = Strings::ToInt(row[155]);
 		sp[tempid].type_description_id = Strings::ToInt(row[156]);
 		sp[tempid].effect_description_id = Strings::ToInt(row[157]);

-		sp[tempid].npc_no_los = Strings::ToBool(row[159]);
-		sp[tempid].feedbackable = Strings::ToBool(row[160]);
-		sp[tempid].reflectable = Strings::ToBool(row[161]);
+		sp[tempid].npc_no_los = Strings::ToInt(row[159]) != 0;
+		sp[tempid].feedbackable = Strings::ToInt(row[160]) != 0;
+		sp[tempid].reflectable = Strings::ToInt(row[161]) != 0;
 		sp[tempid].bonus_hate=Strings::ToInt(row[162]);

-		sp[tempid].ldon_trap = Strings::ToBool(row[165]);
-		sp[tempid].endurance_cost= Strings::ToInt(row[166]);
-		sp[tempid].timer_id= Strings::ToInt(row[167]);
-		sp[tempid].is_discipline = Strings::ToBool(row[168]);
-		sp[tempid].hate_added= Strings::ToInt(row[173]);
+		sp[tempid].ldon_trap = Strings::ToInt(row[165]) != 0;
+		sp[tempid].endurance_cost=Strings::ToInt(row[166]);
+		sp[tempid].timer_id=Strings::ToInt(row[167]);
+		sp[tempid].is_discipline = Strings::ToInt(row[168]) != 0;
+		sp[tempid].hate_added=Strings::ToInt(row[173]);
 		sp[tempid].endurance_upkeep=Strings::ToInt(row[174]);
 		sp[tempid].hit_number_type = Strings::ToInt(row[175]);
 		sp[tempid].hit_number = Strings::ToInt(row[176]);
-		sp[tempid].pvp_resist_base= Strings::ToInt(row[177]);
-		sp[tempid].pvp_resist_per_level= Strings::ToInt(row[178]);
-		sp[tempid].pvp_resist_cap= Strings::ToInt(row[179]);
-		sp[tempid].spell_category= Strings::ToInt(row[180]);
+		sp[tempid].pvp_resist_base=Strings::ToInt(row[177]);
+		sp[tempid].pvp_resist_per_level=Strings::ToInt(row[178]);
+		sp[tempid].pvp_resist_cap=Strings::ToInt(row[179]);
+		sp[tempid].spell_category=Strings::ToInt(row[180]);
 		sp[tempid].pvp_duration = Strings::ToInt(row[181]);
 		sp[tempid].pvp_duration_cap = Strings::ToInt(row[182]);
-		sp[tempid].pcnpc_only_flag= Strings::ToInt(row[183]);
+		sp[tempid].pcnpc_only_flag=Strings::ToInt(row[183]);
 		sp[tempid].cast_not_standing = Strings::ToInt(row[184]) != 0;
-		sp[tempid].can_mgb= Strings::ToBool(row[185]);
+		sp[tempid].can_mgb=Strings::ToInt(row[185]);
 		sp[tempid].dispel_flag = Strings::ToInt(row[186]);
 		sp[tempid].min_resist = Strings::ToInt(row[189]);
 		sp[tempid].max_resist = Strings::ToInt(row[190]);
 		sp[tempid].viral_targets = Strings::ToInt(row[191]);
 		sp[tempid].viral_timer = Strings::ToInt(row[192]);
 		sp[tempid].nimbus_effect = Strings::ToInt(row[193]);
-		sp[tempid].directional_start = Strings::ToFloat(row[194]);
-		sp[tempid].directional_end = Strings::ToFloat(row[195]);
-		sp[tempid].sneak = Strings::ToBool(row[196]);
-		sp[tempid].not_focusable = Strings::ToBool(row[197]);
-		sp[tempid].no_detrimental_spell_aggro = Strings::ToBool(row[198]);
-		sp[tempid].suspendable = Strings::ToBool(row[200]);
+		sp[tempid].directional_start = static_cast<float>(Strings::ToInt(row[194]));
+		sp[tempid].directional_end = static_cast<float>(Strings::ToInt(row[195]));
+		sp[tempid].sneak = Strings::ToInt(row[196]) != 0;
+		sp[tempid].not_focusable = Strings::ToInt(row[197]) != 0;
+		sp[tempid].no_detrimental_spell_aggro = Strings::ToInt(row[198]) != 0;
+		sp[tempid].suspendable = Strings::ToInt(row[200]) != 0;
 		sp[tempid].viral_range = Strings::ToInt(row[201]);
 		sp[tempid].song_cap = Strings::ToInt(row[202]);
 		sp[tempid].no_block = Strings::ToInt(row[205]);
@@ -2043,22 +2071,22 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 		sp[tempid].rank = Strings::ToInt(row[208]);
 		sp[tempid].no_resist=Strings::ToInt(row[209]);
 		sp[tempid].cast_restriction = Strings::ToInt(row[211]);
-		sp[tempid].allow_rest = Strings::ToBool(row[212]);
-		sp[tempid].can_cast_in_combat = Strings::ToBool(row[213]);
-		sp[tempid].can_cast_out_of_combat = Strings::ToBool(row[214]);
+		sp[tempid].allow_rest = Strings::ToInt(row[212]) != 0;
+		sp[tempid].can_cast_in_combat = Strings::ToInt(row[213]) != 0;
+		sp[tempid].can_cast_out_of_combat = Strings::ToInt(row[214]) != 0;
 		sp[tempid].override_crit_chance = Strings::ToInt(row[217]);
 		sp[tempid].aoe_max_targets = Strings::ToInt(row[218]);
 		sp[tempid].no_heal_damage_item_mod = Strings::ToInt(row[219]);
 		sp[tempid].caster_requirement_id = Strings::ToInt(row[220]);
 		sp[tempid].spell_class = Strings::ToInt(row[221]);
 		sp[tempid].spell_subclass = Strings::ToInt(row[222]);
-		sp[tempid].persist_death = Strings::ToBool(row[224]);
-		sp[tempid].min_distance = Strings::ToFloat(row[227]);
-		sp[tempid].min_distance_mod = Strings::ToFloat(row[228]);
-		sp[tempid].max_distance = Strings::ToFloat(row[229]);
-		sp[tempid].max_distance_mod = Strings::ToFloat(row[230]);
-		sp[tempid].min_range = Strings::ToFloat(row[231]);
-		sp[tempid].no_remove = Strings::ToBool(row[232]);
+		sp[tempid].persist_death = Strings::ToInt(row[224]) != 0;
+		sp[tempid].min_distance = static_cast<float>(Strings::ToFloat(row[227]));
+		sp[tempid].min_distance_mod = static_cast<float>(Strings::ToFloat(row[228]));
+		sp[tempid].max_distance = static_cast<float>(Strings::ToFloat(row[229]));
+		sp[tempid].max_distance_mod = static_cast<float>(Strings::ToFloat(row[230]));
+		sp[tempid].min_range = static_cast<float>(Strings::ToInt(row[231]));
+		sp[tempid].no_remove = Strings::ToInt(row[232]) != 0;
 		sp[tempid].damage_shield_type = 0;
    }

@@ -2195,9 +2223,9 @@ void SharedDatabase::GetLootTableInfo(uint32 &loot_table_count, uint32 &max_loot

 	auto& row = results.begin();

-    loot_table_count = Strings::ToUnsignedInt(row[0]);
-	max_loot_table = Strings::ToUnsignedInt(row[1] ? row[1] : "0");
-	loot_table_entries = Strings::ToUnsignedInt(row[2]);
+    loot_table_count = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
+	max_loot_table = static_cast<uint32>(Strings::ToUnsignedInt(row[1] ? row[1] : "0"));
+	loot_table_entries = static_cast<uint32>(Strings::ToUnsignedInt(row[2]));
 }

 void SharedDatabase::GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_drop, uint32 &loot_drop_entries) {
@@ -2220,9 +2248,9 @@ void SharedDatabase::GetLootDropInfo(uint32 &loot_drop_count, uint32 &max_loot_d

    auto& row =results.begin();

-	loot_drop_count = Strings::ToUnsignedInt(row[0]);
-	max_loot_drop = Strings::ToUnsignedInt(row[1] ? row[1] : "0");
-	loot_drop_entries = Strings::ToUnsignedInt(row[2]);
+    loot_drop_count = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
+	max_loot_drop = static_cast<uint32>(Strings::ToUnsignedInt(row[1] ? row[1] : "0"));
+	loot_drop_entries = static_cast<uint32>(Strings::ToUnsignedInt(row[2]));
 }

 void SharedDatabase::LoadLootTables(void *data, uint32 size) {
@@ -2266,7 +2294,7 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) {
 	uint32 current_entry = 0;

 	for (auto& row = results.begin(); row != results.end(); ++row) {
-		const uint32 id = Strings::ToUnsignedInt(row[0]);
+		const uint32 id = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
 		if (id != current_id) {
 			if (current_id != 0) {
 				hash.insert(
@@ -2278,9 +2306,9 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) {
 			memset(loot_table, 0, sizeof(LootTable_Struct) + (sizeof(LootTableEntries_Struct) * 128));
 			current_entry = 0;
 			current_id    = id;
-			lt->mincash = Strings::ToUnsignedInt(row[1]);
-			lt->maxcash = Strings::ToUnsignedInt(row[2]);
-			lt->avgcoin = Strings::ToUnsignedInt(row[3]);
+			lt->mincash = static_cast<uint32>(Strings::ToUnsignedInt(row[1]));
+			lt->maxcash = static_cast<uint32>(Strings::ToUnsignedInt(row[2]));
+			lt->avgcoin = static_cast<uint32>(Strings::ToUnsignedInt(row[3]));

 			lt->content_flags.min_expansion = static_cast<int16>(Strings::ToInt(row[9]));
 			lt->content_flags.max_expansion = static_cast<int16>(Strings::ToInt(row[10]));
@@ -2297,11 +2325,11 @@ void SharedDatabase::LoadLootTables(void *data, uint32 size) {
 			continue;
 		}

-		lt->Entries[current_entry].lootdrop_id = Strings::ToUnsignedInt(row[4]);
-		lt->Entries[current_entry].multiplier  = static_cast<uint8>(Strings::ToUnsignedInt(row[5]));
-		lt->Entries[current_entry].droplimit   = static_cast<uint8>(Strings::ToUnsignedInt(row[6]));
-		lt->Entries[current_entry].mindrop     = static_cast<uint8>(Strings::ToUnsignedInt(row[7]));
-		lt->Entries[current_entry].probability = Strings::ToFloat(row[8]);
+		lt->Entries[current_entry].lootdrop_id = static_cast<uint32>(Strings::ToUnsignedInt(row[4]));
+		lt->Entries[current_entry].multiplier  = static_cast<uint8>(Strings::ToInt(row[5]));
+		lt->Entries[current_entry].droplimit   = static_cast<uint8>(Strings::ToInt(row[6]));
+		lt->Entries[current_entry].mindrop     = static_cast<uint8>(Strings::ToInt(row[7]));
+		lt->Entries[current_entry].probability = static_cast<float>(Strings::ToFloat(row[8]));

 		++(lt->NumEntries);
 		++current_entry;
@@ -2360,7 +2388,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
 	uint32 current_entry = 0;

 	for (auto& row = results.begin(); row != results.end(); ++row) {
-		const auto id = Strings::ToUnsignedInt(row[0]);
+		const auto id = static_cast<uint32>(Strings::ToUnsignedInt(row[0]));
 		if (id != current_id) {
 			if (current_id != 0) {
 				hash.insert(
@@ -2374,7 +2402,7 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
 			current_id    = id;

 			p_loot_drop_struct->content_flags.min_expansion = static_cast<int16>(Strings::ToInt(row[10]));
-			p_loot_drop_struct->content_flags.max_expansion = static_cast<int16>(Strings::ToUnsignedInt(row[11]));
+			p_loot_drop_struct->content_flags.max_expansion = static_cast<int16>(Strings::ToInt(row[11]));

 			strn0cpy(p_loot_drop_struct->content_flags.content_flags,          row[12], sizeof(p_loot_drop_struct->content_flags.content_flags));
 			strn0cpy(p_loot_drop_struct->content_flags.content_flags_disabled, row[13], sizeof(p_loot_drop_struct->content_flags.content_flags_disabled));
@@ -2384,15 +2412,15 @@ void SharedDatabase::LoadLootDrops(void *data, uint32 size) {
 			continue;
 		}

-		p_loot_drop_struct->Entries[current_entry].item_id           = Strings::ToUnsignedInt(row[1]);
-		p_loot_drop_struct->Entries[current_entry].item_charges      = static_cast<int8>(Strings::ToUnsignedInt(row[2]));
-		p_loot_drop_struct->Entries[current_entry].equip_item        = static_cast<uint8>(Strings::ToUnsignedInt(row[3]));
-		p_loot_drop_struct->Entries[current_entry].chance            = Strings::ToFloat(row[4]);
-		p_loot_drop_struct->Entries[current_entry].trivial_min_level = static_cast<uint16>(Strings::ToUnsignedInt(row[5]));
-		p_loot_drop_struct->Entries[current_entry].trivial_max_level = static_cast<uint16>(Strings::ToUnsignedInt(row[6]));
-		p_loot_drop_struct->Entries[current_entry].npc_min_level     = static_cast<uint16>(Strings::ToUnsignedInt(row[7]));
-		p_loot_drop_struct->Entries[current_entry].npc_max_level     = static_cast<uint16>(Strings::ToUnsignedInt(row[8]));
-		p_loot_drop_struct->Entries[current_entry].multiplier        = static_cast<uint8>(Strings::ToUnsignedInt(row[9]));
+		p_loot_drop_struct->Entries[current_entry].item_id           = static_cast<uint32>(Strings::ToUnsignedInt(row[1]));
+		p_loot_drop_struct->Entries[current_entry].item_charges      = static_cast<int8>(Strings::ToInt(row[2]));
+		p_loot_drop_struct->Entries[current_entry].equip_item        = static_cast<uint8>(Strings::ToInt(row[3]));
+		p_loot_drop_struct->Entries[current_entry].chance            = static_cast<float>(Strings::ToFloat(row[4]));
+		p_loot_drop_struct->Entries[current_entry].trivial_min_level = static_cast<uint16>(Strings::ToInt(row[5]));
+		p_loot_drop_struct->Entries[current_entry].trivial_max_level = static_cast<uint16>(Strings::ToInt(row[6]));
+		p_loot_drop_struct->Entries[current_entry].npc_min_level     = static_cast<uint16>(Strings::ToInt(row[7]));
+		p_loot_drop_struct->Entries[current_entry].npc_max_level     = static_cast<uint16>(Strings::ToInt(row[8]));
+		p_loot_drop_struct->Entries[current_entry].multiplier        = static_cast<uint8>(Strings::ToInt(row[9]));

 		++(p_loot_drop_struct->NumEntries);
 		++current_entry;
@@ -81,11 +81,7 @@ public:
 	bool SetGMInvul(uint32 account_id, bool gminvul);
 	bool SetGMFlymode(uint32 account_id, uint8 flymode);
 	void SetMailKey(int CharID, int IPAddress, int MailKey);
-	struct MailKeys {
-		std::string mail_key;
-		std::string mail_key_full;
-	};
-	MailKeys GetMailKey(int character_id);
+	std::string GetMailKey(int CharID, bool key_only = false);
 	bool SaveCursor(
 		uint32 char_id,
 		std::list<EQ::ItemInstance *>::const_iterator &start,
@@ -130,11 +126,7 @@ public:
 		uint32 aug4 = 0,
 		uint32 aug5 = 0,
 		uint32 aug6 = 0,
-		bool attuned = false,
-		const std::string& custom_data = "",
-		uint32 ornamenticon = 0,
-		uint32 ornamentidfile = 0,
-		uint32 ornament_hero_model = 0
+		bool attuned = 0
 	);
 	EQ::ItemInstance *CreateItem(
 		const EQ::ItemData *item,
@@ -145,13 +137,9 @@ public:
 		uint32 aug4 = 0,
 		uint32 aug5 = 0,
 		uint32 aug6 = 0,
-		bool attuned = false,
-		const std::string &custom_data = "",
-		uint32 ornamenticon = 0,
-		uint32 ornamentidfile = 0,
-		uint32 ornament_hero_model = 0
+		bool attuned = 0
 	);
-	EQ::ItemInstance *CreateBaseItem(const EQ::ItemData *item, int16 charges = 0);
+	EQ::ItemInstance *CreateBaseItem(const EQ::ItemData *item, const std::string &guid, int16 charges);

 	void GetItemsCount(int32 &item_count, uint32 &max_id);
 	void LoadItems(void *data, uint32 size, int32 items, uint32 max_item_id);
@@ -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
@@ -148,6 +148,33 @@ int32 EQ::skills::GetBaseDamage(SkillType skill)
 	}
 }

+bool EQ::skills::IsMeleeDmg(SkillType skill)
+{
+	switch (skill) {
+	case Skill1HBlunt:
+	case Skill1HSlashing:
+	case Skill2HBlunt:
+	case Skill2HSlashing:
+	case SkillBackstab:
+	case SkillBash:
+	case SkillDragonPunch:
+	case SkillEagleStrike:
+	case SkillFlyingKick:
+	case SkillHandtoHand:
+	case SkillKick:
+	case Skill1HPiercing:
+	case SkillRiposte:
+	case SkillRoundKick:
+	case SkillThrowing:
+	case SkillTigerClaw:
+	case SkillFrenzy:
+	case Skill2HPiercing:
+		return true;
+	default:
+		return false;
+	}
+}
+
 const std::map<EQ::skills::SkillType, std::string>& EQ::skills::GetSkillTypeMap()
 {
 	static const std::map<SkillType, std::string> skill_type_map = {
@@ -233,31 +260,13 @@ const std::map<EQ::skills::SkillType, std::string>& EQ::skills::GetSkillTypeMap(
 	return skill_type_map;
 }

-const std::vector<EQ::skills::SkillType>& EQ::skills::GetExtraDamageSkills()
-{
-	static const std::vector<EQ::skills::SkillType> v = {
-		EQ::skills::SkillBackstab,
-		EQ::skills::SkillBash,
-		EQ::skills::SkillDragonPunch, // Same ID as Tail Rake
-		EQ::skills::SkillEagleStrike,
-		EQ::skills::SkillFlyingKick,
-		EQ::skills::SkillKick,
-		EQ::skills::SkillRoundKick,
-		EQ::skills::SkillRoundKick,
-		EQ::skills::SkillTigerClaw,
-		EQ::skills::SkillFrenzy
-	};
-
-	return v;
-}
-
 std::string EQ::skills::GetSkillName(SkillType skill)
 {
 	if (skill >= Skill1HBlunt && skill <= Skill2HPiercing) {
 		auto skills = GetSkillTypeMap();
 		return skills[skill];
 	}
-	return {};
+	return std::string();
 }

 EQ::SkillProfile::SkillProfile()
@@ -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
@@ -24,7 +24,6 @@

 #include <string>
 #include <map>
-#include <vector>


 namespace EQ
@@ -168,9 +167,9 @@ namespace EQ
 		bool IsBardInstrumentSkill(SkillType skill);
 		bool IsCastingSkill(SkillType skill);
 		int32 GetBaseDamage(SkillType skill);
+		bool IsMeleeDmg(SkillType skill);

 		extern const std::map<SkillType, std::string>& GetSkillTypeMap();
-		extern const std::vector<SkillType>& GetExtraDamageSkills();

 		std::string GetSkillName(SkillType skill);
 	} /*skills*/
@@ -306,7 +305,7 @@ namespace EQ

 		uint32 operator[](int skill_id) const { return const_cast<SkillProfile*>(this)->GetSkill(skill_id); }
 	};
-
+	
 } /*EQEmu*/

 #endif /*COMMON_SKILLS_H*/
@@ -171,37 +171,6 @@
 #define SPELL_ILLUSION_MALE 1732
 #define SPELL_UNSUMMON_SELF 892
 #define SPELL_ANCIENT_LIFEBANE 2115
-#define SPELL_GMHP25K 6817
-#define SPELL_GMHP50K 6818
-#define SPELL_GMHP100K 6819
-#define SPELL_GMHP225K 6820
-#define SPELL_GMHP475K 6821
-#define SPELL_GMHP925K 6822
-#define SPELL_GMHP2M 6823
-#define SPELL_GMHP3M 6824
-#define SPELL_GMHP5M 39851
-#define SPELL_GUIDE_ACTING_ONE 778
-#define SPELL_GUIDE_ALLIANCE_ONE 810
-#define SPELL_GUIDE_CANCEL_MAGIC_ONE 811
-#define SPELL_GUIDE_JOURNEY_ONE 813
-#define SPELL_GUIDE_VISION_ONE 814
-#define SPELL_GUIDE_HEALTH_ONE 815
-#define SPELL_GUIDE_INVULNERABILITY_ONE 816
-#define SPELL_GUIDE_BOLT_ONE 817
-#define SPELL_GUIDE_MEMORY_BLUR_ONE 818
-#define SPELL_GUIDE_ACTING_TWO 1209
-#define SPELL_GUIDE_CANCEL_MAGIC_TWO 1211
-#define SPELL_GUIDE_JOURNEY_TWO 1212
-#define SPELL_GUIDE_VISION_TWO 1213
-#define SPELL_GUIDE_HEALTH_TWO 1214
-#define SPELL_GUIDE_INVULNERABILITY_TWO 1215
-#define SPELL_GUIDE_BOLT_TWO 1216
-#define SPELL_GUIDE_MEMORY_BLUR_TWO 1217
-#define SPELL_GUIDE_ALLIANCE_TWO 1219
-#define SPELL_GUIDE_EVACUATION 3921
-#define SPELL_GUIDE_LEVITATION 39852
-#define SPELL_GUIDE_SPELL_HASTE 39853
-#define SPELL_GUIDE_HASTE 39854

 //spellgroup ids
 #define SPELLGROUP_FRENZIED_BURNOUT 2754
@@ -232,22 +201,8 @@
 #define INSTRUMENT_LUTE 13011
 #define INSTRUMENT_HORN 13012

-//option types for the rule Spells:ResurrectionEffectBlock
-#define RES_EFFECTS_CANNOT_STACK -1
-#define NO_RES_EFFECTS_BLOCK 0
-#define RES_EFFECTS_BLOCK 1
-#define RES_EFFECTS_BLOCK_WITH_BUFFS 2
-#define MOVE_NEW_SLOT 2

-#define PARTIAL_DEATH_SAVE 1
-#define FULL_DEATH_SAVE 2
-
-#define MAX_FAST_HEAL_CASTING_TIME 2000
-#define MAX_VERY_FAST_HEAL_CASTING_TIME 1000
-
-#define DETRIMENTAL_EFFECT 0
-#define BENEFICIAL_EFFECT 1
-#define BENEFICIAL_EFFECT_GROUP_ONLY 2
+const int Z_AGGRO=10;

 const uint32 MobAISpellRange=100; // max range of buffs

@@ -549,7 +504,7 @@ enum SpellRestriction
 	HAS_NO_ILLUSIONS_OF_GRANDEUR_BUFF                                         = 12519, //
 	IS_HP_ABOVE_50_PCT                                                        = 16010, //
 	IS_HP_UNDER_50_PCT                                                        = 16031, //
-	IS_OFF_HAND_EQUIPPED                                                       = 27672, // You must be wielding a weapon or shield in your offhand to use this ability.
+	IS_OFF_HAND_EQUIPED                                                       = 27672, // You must be wielding a weapon or shield in your offhand to use this ability.
 	HAS_NO_PACT_OF_FATE_RECOURSE_BUFF                                         = 29556, // This spell will not work while Pact of Fate Recourse is active. | caster restriction |
 	HAS_NO_SHROUD_OF_PRAYER_BUFF                                              = 32339, // Your target cannot receive another Quiet Prayer this soon.
 	IS_MANA_BELOW_20_PCT                                                      = 38311, // This ability requires you to be at or below 20% of your maximum mana.
@@ -1205,7 +1160,7 @@ typedef enum {
 #define SE_LimitUseMin					422 // implemented, @Ff Minium amount of numhits for a spell to be focused, base: numhit amt
 #define SE_LimitUseType					423 // implemented,	@Ff Focus will only affect if has this numhits type, base: numhit type
 #define SE_GravityEffect				424 // implemented - Pulls/pushes you toward/away the mob at a set pace
-#define SE_Display						425 // *not implemented - Illusion: Flying Dragon(21626)
+//#define SE_Display					425 // *not implemented - Illusion: Flying Dragon(21626)
 #define SE_IncreaseExtTargetWindow		426 // *not implmented[AA] - increases the capacity of your extended target window
 #define SE_SkillProcAttempt				427 // implemented - chance to proc when using a skill(ie taunt)
 #define SE_LimitToSkill					428 // implemented, @Procs, limits what combat skills will effect a skill proc, base: skill value, limit: none, max: none
@@ -1256,7 +1211,7 @@ typedef enum {
 #define SE_Double_Backstab_Front		473 // implemented - Chance to double backstab from front
 #define SE_Pet_Crit_Melee_Damage_Pct_Owner	474 // implemenetd - Critical damage mod applied to pets from owner
 #define SE_Trigger_Spell_Non_Item		475 // implemented - Trigger spell on cast only if not from item click.
-#define SE_Weapon_Stance				476 // implemented, @Misc, Apply a specific spell buffs automatically depending 2Hander, Shield or Dual Wield is equipped, base: spellid, base: 0=2H 1=Shield 2=DW, max: none
+#define SE_Weapon_Stance				476 // implemented, @Misc, Apply a specific spell buffs automatically depending 2Hander, Shield or Duel Wield is equiped, base: spellid, base: 0=2H 1=Shield 2=DW, max: none
 #define SE_Hatelist_To_Top_Index		477 // Implemented - Chance to be set to top of rampage list
 #define SE_Hatelist_To_Tail_Index		478 // Implemented - Chance to be set to bottom of rampage list
 #define SE_Ff_Value_Min					479 // implemented, @Ff, Minimum base value of a spell that can be focused, base: spells to be focused base1 value
@@ -1488,7 +1443,7 @@ extern int32 SPDAT_RECORDS;
 bool IsTargetableAESpell(uint16 spell_id);
 bool IsSacrificeSpell(uint16 spell_id);
 bool IsLifetapSpell(uint16 spell_id);
-bool IsMesmerizeSpell(uint16 spell_id);
+bool IsMezSpell(uint16 spell_id);
 bool IsStunSpell(uint16 spell_id);
 bool IsSlowSpell(uint16 spell_id);
 bool IsHasteSpell(uint16 spell_id);
@@ -1497,23 +1452,22 @@ bool IsPercentalHealSpell(uint16 spell_id);
 bool IsGroupOnlySpell(uint16 spell_id);
 bool IsBeneficialSpell(uint16 spell_id);
 bool IsDetrimentalSpell(uint16 spell_id);
-bool IsInvisibleSpell(uint16 spell_id);
+bool IsInvisSpell(uint16 spell_id);
 bool IsInvulnerabilitySpell(uint16 spell_id);
-bool IsCompleteHealDurationSpell(uint16 spell_id);
+bool IsCHDurationSpell(uint16 spell_id);
 bool IsPoisonCounterSpell(uint16 spell_id);
 bool IsDiseaseCounterSpell(uint16 spell_id);
 bool IsSummonItemSpell(uint16 spell_id);
 bool IsSummonSkeletonSpell(uint16 spell_id);
 bool IsSummonPetSpell(uint16 spell_id);
 bool IsSummonPCSpell(uint16 spell_id);
-bool IsPetSpell(uint16 spell_id);
 bool IsCharmSpell(uint16 spell_id);
 bool IsBlindSpell(uint16 spell_id);
-bool IsHealthSpell(uint16 spell_id);
-bool IsCastTimeReductionSpell(uint16 spell_id);
+bool IsEffectHitpointsSpell(uint16 spell_id);
+bool IsReduceCastTimeSpell(uint16 spell_id);
 bool IsIncreaseDurationSpell(uint16 spell_id);
-bool IsManaCostReductionSpell(uint16 spell_id);
-bool IsIncreaseRangeSpell(uint16 spell_id);
+bool IsReduceManaSpell(uint16 spell_id);
+bool IsExtRangeSpell(uint16 spell_id);
 bool IsImprovedHealingSpell(uint16 spell_id);
 bool IsImprovedDamageSpell(uint16 spell_id);
 bool IsAEDurationSpell(uint16 spell_id);
@@ -1521,22 +1475,26 @@ bool IsPureNukeSpell(uint16 spell_id);
 bool IsAENukeSpell(uint16 spell_id);
 bool IsPBAENukeSpell(uint16 spell_id);
 bool IsAERainNukeSpell(uint16 spell_id);
-bool IsPartialResistableSpell(uint16 spell_id);
+bool IsPartialCapableSpell(uint16 spell_id);
 bool IsResistableSpell(uint16 spell_id);
 bool IsGroupSpell(uint16 spell_id);
 bool IsTGBCompatibleSpell(uint16 spell_id);
 bool IsBardSong(uint16 spell_id);
-bool IsEffectInSpell(uint16 spell_id, int effect_id);
-uint16 GetSpellTriggerSpellID(uint16 spell_id, int effect_id);
-bool IsBlankSpellEffect(uint16 spell_id, int effect_index);
-bool IsValidSpell(uint32 spell_id);
-bool IsSummonSpell(uint16 spell_id);
-bool IsDamageSpell(uint16 spell_id);
-bool IsFearSpell(uint16 spell_id);
-bool IsCureSpell(uint16 spell_id);
-int GetSpellEffectIndex(uint16 spell_id, int effect_id);
-uint8 GetSpellMinimumLevel(uint16 spell_id);
-uint8 GetSpellLevel(uint16 spell_id, uint8 class_id);
+bool IsEffectInSpell(uint16 spellid, int effect);
+uint16 GetTriggerSpellID(uint16 spell_id, uint32 effect);
+bool IsBlankSpellEffect(uint16 spellid, int effect_index);
+bool IsValidSpell(uint32 spellid);
+bool IsSummonSpell(uint16 spellid);
+bool IsEvacSpell(uint16 spellid);
+bool IsDamageSpell(uint16 spellid);
+bool IsFearSpell(uint16 spellid);
+bool IsCureSpell(uint16 spellid);
+bool BeneficialSpell(uint16 spell_id);
+bool GroupOnlySpell(uint16 spell_id);
+int GetSpellEffectIndex(uint16 spell_id, int effect);
+int CanUseSpell(uint16 spellid, int classa, int level);
+int GetMinLevel(uint16 spell_id);
+int GetSpellLevel(uint16 spell_id, int classa);
 int CalcBuffDuration_formula(int level, int formula, int duration);
 int32 CalculatePoisonCounters(uint16 spell_id);
 int32 CalculateDiseaseCounters(uint16 spell_id);
@@ -1547,11 +1505,10 @@ bool IsDisciplineBuff(uint16 spell_id);
 bool IsDiscipline(uint16 spell_id);
 bool IsCombatSkill(uint16 spell_id);
 bool IsResurrectionEffects(uint16 spell_id);
-int8 GetSpellResurrectionSicknessCheck(uint16 spell_id_one, uint16 spell_id_two);
 bool IsRuneSpell(uint16 spell_id);
 bool IsMagicRuneSpell(uint16 spell_id);
 bool IsManaTapSpell(uint16 spell_id);
-bool IsAllianceSpell(uint16 spell_id);
+bool IsAllianceSpellLine(uint16 spell_id);
 bool IsDeathSaveSpell(uint16 spell_id);
 bool IsFullDeathSaveSpell(uint16 spell_id);
 bool IsPartialDeathSaveSpell(uint16 spell_id);
@@ -1560,10 +1517,10 @@ bool IsSuccorSpell(uint16 spell_id);
 bool IsTeleportSpell(uint16 spell_id);
 bool IsTranslocateSpell(uint16 spell_id);
 bool IsGateSpell(uint16 spell_id);
-bool IsIllusionSpell(uint16 spell_id);
+bool IsPlayerIllusionSpell(uint16 spell_id); // seveian 2008-09-23
 bool IsLDoNObjectSpell(uint16 spell_id);
-int GetSpellResistType(uint16 spell_id);
-int GetSpellTargetType(uint16 spell_id);
+int32 GetSpellResistType(uint16 spell_id);
+int32 GetSpellTargetType(uint16 spell_id);
 bool IsHealOverTimeSpell(uint16 spell_id);
 bool IsCompleteHealSpell(uint16 spell_id);
 bool IsFastHealSpell(uint16 spell_id);
@@ -1578,36 +1535,38 @@ bool IsSelfConversionSpell(uint16 spell_id);
 bool IsBuffSpell(uint16 spell_id);
 bool IsPersistDeathSpell(uint16 spell_id);
 bool IsSuspendableSpell(uint16 spell_id);
-bool IsCastOnFadeDurationSpell(uint16 spell_id);
-bool IsDistanceModifierSpell(uint16 spell_id);
-int GetSpellPartialMeleeRuneReduction(uint16 spell_id);
-int GetSpellPartialMagicRuneReduction(uint16 spell_id);
-int GetSpellPartialMeleeRuneAmount(uint16 spell_id);
-int GetSpellPartialMagicRuneAmount(uint16 spell_id);
-bool IsNoDetrimentalSpellAggroSpell(uint16 spell_id);
-bool IsStackableDOT(uint16 spell_id);
-bool IsBardOnlyStackEffect(int effect_id);
-bool IsCastWhileInvisibleSpell(uint16 spell_id);
-bool IsEffectIgnoredInStacking(int effect_id);
-bool IsFocusLimit(int effect_id);
-bool IsTargetRequiredForSpell(uint16 spell_id);
-bool IsVirusSpell(uint16 spell_id);
-int GetSpellViralMinimumSpreadTime(uint16 spell_id);
-int GetSpellViralMaximumSpreadTime(uint16 spell_id);
-int GetSpellViralSpreadRange(uint16 spell_id);
-bool IsInstrumentModifierAppliedToSpellEffect(uint16 spell_id, int effect_id);
-bool IsPulsingBardSong(uint16 spell_id);
-int GetSpellProcLimitTimer(uint16 spell_id, int proc_type);
-bool IsCastNotStandingSpell(uint16 spell_id);
-int GetSpellEffectDescriptionNumber(uint16 spell_id);
-DmgShieldType GetDamageShieldType(uint16 spell_id, int damage_shield_type = 0);
-bool IsRestAllowedSpell(uint16 spell_id);
-int GetSpellNimbusEffect(uint16 spell_id);
-int GetSpellFuriousBash(uint16 spell_id);
+uint32 GetMorphTrigger(uint32 spell_id);
+bool IsCastonFadeDurationSpell(uint16 spell_id);
+bool IsPowerDistModSpell(uint16 spell_id);
+uint32 GetPartialMeleeRuneReduction(uint32 spell_id);
+uint32 GetPartialMagicRuneReduction(uint32 spell_id);
+uint32 GetPartialMeleeRuneAmount(uint32 spell_id);
+uint32 GetPartialMagicRuneAmount(uint32 spell_id);
+bool NoDetrimentalSpellAggro(uint16 spell_id);
+bool IsStackableDot(uint16 spell_id);
+bool IsBardOnlyStackEffect(int effect);
+bool IsCastWhileInvis(uint16 spell_id);
+bool IsEffectIgnoredInStacking(int spa);
+bool IsFocusLimit(int spa);
+bool SpellRequiresTarget(int target_type);
+bool IsVirusSpell(int32 spell_id);
+int GetViralMinSpreadTime(int32 spell_id);
+int GetViralMaxSpreadTime(int32 spell_id);
+int GetViralSpreadRange(int32 spell_id);
+bool IsInstrumentModAppliedToSpellEffect(int32 spell_id, int effect);
+bool IsPulsingBardSong(int32 spell_id);
+uint32 GetProcLimitTimer(int32 spell_id, int proc_type);
+bool IgnoreCastingRestriction(int32 spell_id);
+int CalcPetHp(int levelb, int classb, int STA = 75);
+int GetSpellEffectDescNum(uint16 spell_id);
+DmgShieldType GetDamageShieldType(uint16 spell_id, int32 DSType = 0);
+bool DetrimentalSpellAllowsRest(uint16 spell_id);
+uint32 GetNimbusEffect(uint16 spell_id);
+int32 GetFuriousBash(uint16 spell_id);
 bool IsShortDurationBuff(uint16 spell_id);
-bool IsSpellUsableInThisZoneType(uint16 spell_id, uint8 zone_type);
+bool IsSpellUsableThisZoneType(uint16 spell_id, uint8 zone_type);
 const char *GetSpellName(uint16 spell_id);
-int GetSpellStatValue(uint16 spell_id, const char* stat_identifier, uint8 slot = 0);
-bool IsCastRestrictedSpell(uint16 spell_id);
+int GetSpellStatValue(uint32 spell_id, const char* stat_identifier, uint8 slot = 0);
+bool CastRestrictedSpell(int spellid);

 #endif
@@ -658,11 +658,11 @@ typedef pdb_symbol current;
 			size_t next = 0;
 			size_t delimiter_size = sizeof(kBackwardPathDelimiter) - 1;
 			while ((next = s.find(kBackwardPathDelimiter, last)) != std::string::npos) {
-				out.emplace_back(s.substr(last, next - last));
+				out.push_back(s.substr(last, next - last));
 				last = next + delimiter_size;
 			}
 			if (last <= s.length()) {
-				out.emplace_back(s.substr(last));
+				out.push_back(s.substr(last));
 			}
 			return out;
 		}
@@ -3760,7 +3760,7 @@ private:
 						continue;
 					started = true;
 				}
-				lines.emplace_back(make_pair(line_idx, line));
+				lines.push_back(make_pair(line_idx, line));
 			}

 			lines.erase(
@@ -76,7 +76,7 @@ std::vector<std::string> Strings::Split(const std::string& s, const std::string&
 		res.push_back(token);
 	}

-	res.emplace_back(s.substr(pos_start));
+	res.push_back(s.substr(pos_start));
 	return res;
 }

@@ -115,7 +115,7 @@ Strings::SearchDelim(const std::string &haystack, const std::string &needle, con
 }


-std::string Strings::Implode(const std::string& glue, std::vector<std::string> src)
+std::string Strings::Implode(std::string glue, std::vector<std::string> src)
 {
 	if (src.empty()) {
 		return {};
@@ -272,7 +272,7 @@ std::string Strings::Repeat(std::string s, int n)
 	return s;
 }

-bool Strings::Contains(std::vector<std::string> container, const std::string& element)
+bool Strings::Contains(std::vector<std::string> container, std::string element)
 {
 	return std::find(container.begin(), container.end(), element) != container.end();
 }
@@ -287,12 +287,15 @@ std::string Strings::Commify(const std::string &number)
 	for (i = string_length - 3; i >= 0; i -= 3) {
 		if (i > 0) {
 			temp_string = "," + number.substr(static_cast<unsigned long>(i), 3) + temp_string;
-		} else {
+		}
+		else {
 			temp_string = number.substr(static_cast<unsigned long>(i), 3) + temp_string;
 		}
 	}

-	temp_string = number.substr(0, static_cast<unsigned long>(3 + i)) + temp_string;
+	if (i < 0) {
+		temp_string = number.substr(0, static_cast<unsigned long>(3 + i)) + temp_string;
+	}

 	return temp_string;
 }
@@ -313,7 +316,7 @@ const std::string Strings::ToUpper(std::string s)
 	);
 	return s;
 }
-const std::string Strings::UcFirst(const std::string& s)
+const std::string Strings::UcFirst(std::string s)
 {
 	std::string output = s;
 	if (!s.empty()) {
@@ -324,7 +327,7 @@ const std::string Strings::UcFirst(const std::string& s)
 }


-std::vector<std::string> Strings::Wrap(std::vector<std::string> &src, const std::string& character)
+std::vector<std::string> Strings::Wrap(std::vector<std::string> &src, std::string character)
 {
 	std::vector<std::string> new_vector;
 	new_vector.reserve(src.size());
@@ -370,8 +373,7 @@ std::string Strings::NumberToWords(unsigned long long int n)

 	return res;
 }
-
-std::string Strings::Money(uint64 platinum, uint64 gold, uint64 silver, uint64 copper)
+std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 copper)
 {
 	std::string money_string = "Unknown";
 	if (copper && silver && gold && platinum) { // CSGP
@@ -657,7 +659,7 @@ std::string Strings::SecondsToTime(int duration, bool is_milliseconds)
 	return time_string;
 }

-std::string &Strings::LTrim(std::string &str, std::string_view chars)
+std::string &Strings::LTrim(std::string &str, const std::string &chars)
 {
 	str.erase(0, str.find_first_not_of(chars));
 	return str;
@@ -668,7 +670,7 @@ std::string Strings::MillisecondsToTime(int duration)
 	return SecondsToTime(duration, true);
 }

-std::string &Strings::RTrim(std::string &str, std::string_view chars)
+std::string &Strings::RTrim(std::string &str, const std::string &chars)
 {
 	str.erase(str.find_last_not_of(chars) + 1);
 	return str;
@@ -680,7 +682,7 @@ std::string &Strings::Trim(std::string &str, const std::string &chars)
 }

 // Function to convert single digit or two digit number into words
-std::string Strings::ConvertToDigit(int n, const std::string& suffix)
+std::string Strings::ConvertToDigit(int n, std::string suffix)
 {
 	// if n is zero
 	if (n == 0) {
@@ -743,7 +745,7 @@ uint32 Strings::TimeToSeconds(std::string time_string)
 	return duration;
 }

-bool Strings::ToBool(const std::string& bool_string)
+bool Strings::ToBool(std::string bool_string)
 {
 	if (
 		Strings::Contains(bool_string, "true") ||
@@ -84,7 +84,7 @@ namespace EQ {

 class Strings {
 public:
-	static bool Contains(std::vector<std::string> container, const std::string& element);
+	static bool Contains(std::vector<std::string> container, std::string element);
 	static bool Contains(const std::string& subject, const std::string& search);
 	static int ToInt(const std::string &s, int fallback = 0);
 	static int64 ToBigInt(const std::string &s, int64 fallback = 0);
@@ -96,9 +96,9 @@ public:
 	static bool IsFloat(const std::string &s);
 	static const std::string ToLower(std::string s);
 	static const std::string ToUpper(std::string s);
-	static const std::string UcFirst(const std::string& s);
-	static std::string &LTrim(std::string &str, std::string_view chars = "\t\n\v\f\r ");
-	static std::string &RTrim(std::string &str, std::string_view chars = "\t\n\v\f\r ");
+	static const std::string UcFirst(std::string s);
+	static std::string &LTrim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
+	static std::string &RTrim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
 	static std::string &Trim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
 	static std::string Commify(const std::string &number);
 	static std::string Commify(uint16 number) { return Strings::Commify(std::to_string(number)); };
@@ -107,14 +107,14 @@ public:
 	static std::string Commify(int16 number) { return Strings::Commify(std::to_string(number)); };
 	static std::string Commify(int32 number) { return Strings::Commify(std::to_string(number)); };
 	static std::string Commify(int64 number) { return Strings::Commify(std::to_string(number)); };
-	static std::string ConvertToDigit(int n, const std::string& suffix);
+	static std::string ConvertToDigit(int n, std::string suffix);
 	static std::string Escape(const std::string &s);
 	static std::string GetBetween(const std::string &s, std::string start_delim, std::string stop_delim);
-	static std::string Implode(const std::string& glue, std::vector<std::string> src);
+	static std::string Implode(std::string glue, std::vector<std::string> src);
 	static std::string Join(const std::vector<std::string> &ar, const std::string &delim);
 	static std::string Join(const std::vector<uint32_t> &ar, const std::string &delim);
 	static std::string MillisecondsToTime(int duration);
-	static std::string Money(uint64 platinum, uint64 gold = 0, uint64 silver = 0, uint64 copper = 0);
+	static std::string Money(uint32 platinum, uint32 gold = 0, uint32 silver = 0, uint32 copper = 0);
 	static std::string NumberToWords(unsigned long long int n);
 	static std::string Repeat(std::string s, int n);
 	static std::string Replace(std::string subject, const std::string &search, const std::string &replace);
@@ -122,10 +122,10 @@ public:
 	static std::string::size_type SearchDelim(const std::string &haystack, const std::string &needle, const char deliminator = ',');
 	static std::vector<std::string> Split(const std::string &s, const char delim = ',');
 	static std::vector<std::string> Split(const std::string& s, const std::string& delimiter);
-	static std::vector<std::string> Wrap(std::vector<std::string> &src, const std::string& character);
+	static std::vector<std::string> Wrap(std::vector<std::string> &src, std::string character);
 	static void FindReplace(std::string &string_subject, const std::string &search_string, const std::string &replace_string);
 	static uint32 TimeToSeconds(std::string time_string);
-	static bool ToBool(const std::string& bool_string);
+	static bool ToBool(std::string bool_string);
 	static inline bool EqualFold(const std::string &string_one, const std::string &string_two) { return strcasecmp(string_one.c_str(), string_two.c_str()) == 0; }
 	static std::string Random(size_t length);

@@ -219,7 +219,7 @@ std::vector<std::string> join_pair(
 	std::vector<std::string> output;

 	for (const std::pair<T1, T2> &src_iter: src) {
-		output.emplace_back(
+		output.push_back(

 			fmt::format(
 				"{}{}{}{}{}{}{}",
@@ -253,7 +253,7 @@ std::vector<std::string> join_tuple(

 	for (const std::tuple<T1, T2, T3, T4> &src_iter: src) {

-		output.emplace_back(
+		output.push_back(

 			fmt::format(
 				"{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
@@ -71,6 +71,14 @@ namespace StructStrategyFactory {
 		strategies[first_opcode] = structs;
 	}

+	const StructStrategy *FindPatch(EmuOpcode first_opcode) {
+		std::map<EmuOpcode, const StructStrategy *>::const_iterator res;
+		res = strategies.find(first_opcode);
+		if(res == strategies.end())
+			return(nullptr);
+		return(res->second);
+	}
+
 };


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
KimLS	d6bdaa5c6e	Saving and loading of guids for items, still needs a lot of work, esp with corpses. No auditing yet	2023-03-06 23:59:07 -08:00
KimLS	593127fb7e	GUID interface.	2023-03-06 13:51:00 -08:00