pch

.drone.yml

@@ -15,7 +15,7 @@ volumes:
 
 steps:
   - name: Build Linux X64
-    image: akkadius/eqemu-server:v14
+    image: akkadius/eqemu-server:v13
     environment:
       GITHUB_TOKEN:
         from_secret: GH_RELEASE_GITHUB_API_TOKEN

CHANGELOG.md

@@ -1,287 +1,3 @@
-## [22.41.0] - 1/8/2024
-
-### Bug
-
-* DI Buff Fade ([#3919](https://github.com/EQEmu/Server/pull/3919)) @fryguy503 2024-01-08
-* NPCs will now only proc on hit ([#3913](https://github.com/EQEmu/Server/pull/3913)) @fryguy503 2024-01-08
-* Pets should not ignore Z axis ([#3912](https://github.com/EQEmu/Server/pull/3912)) @fryguy503 2024-01-08
-
-### Fixes
-
-* Disciplines should show when someone casts them. ([#3901](https://github.com/EQEmu/Server/pull/3901)) @fryguy503 2024-01-08
-* Fix Typo in Character Skills loading ([#3937](https://github.com/EQEmu/Server/pull/3937)) @Kinglykrab 2024-01-09
-* Fix for HasLockoutByCharacterID ([#3927](https://github.com/EQEmu/Server/pull/3927)) @fryguy503 2024-01-08
-* Harm Touch, Improved Harm Touch, and Unholy Touch ([#3904](https://github.com/EQEmu/Server/pull/3904)) @fryguy503 2024-01-08
-* Legacy Manaburn should have hard cap. ([#3905](https://github.com/EQEmu/Server/pull/3905)) @fryguy503 2024-01-08
-* TGB - Added logic to stop bard errors on group songs. ([#3906](https://github.com/EQEmu/Server/pull/3906)) @fryguy503 2024-01-08
-* World Shutdown Filter ([#3930](https://github.com/EQEmu/Server/pull/3930)) @fryguy503 2024-01-08
-
-### Info
-
-* Adding textual feedback when trying to sell alt items back to … ([#3917](https://github.com/EQEmu/Server/pull/3917)) @fryguy503 2024-01-08
-
-### Rules
-
-* Backstab Damage Modifier ([#3908](https://github.com/EQEmu/Server/pull/3908)) @fryguy503 2024-01-08
-* Classic Tradeskill Skill Clamp ([#3914](https://github.com/EQEmu/Server/pull/3914)) @fryguy503 2024-01-08
-* Classic Triple Attack ([#3903](https://github.com/EQEmu/Server/pull/3903)) @fryguy503 2024-01-08
-* Ensure mana taps only effect NPC's that have mana. ([#3907](https://github.com/EQEmu/Server/pull/3907)) @fryguy503 2024-01-08
-* Over Taunt Hate ([#3900](https://github.com/EQEmu/Server/pull/3900)) @fryguy503 2024-01-08
-* Stun Chance Percent Rule ([#3922](https://github.com/EQEmu/Server/pull/3922)) @fryguy503 2024-01-08
-
-## [22.40.0] - 1/7/2024
-
-### Account
-
-* Convert Get/Update Account Karma to Repositories ([#3858](https://github.com/EQEmu/Server/pull/3858)) @Kinglykrab 2024-01-07
-* Convert UpdateGMStatus to Repositories ([#3859](https://github.com/EQEmu/Server/pull/3859)) @Kinglykrab 2024-01-07
-
-### Bots
-
-* Resist Spell Fix ([#3840](https://github.com/EQEmu/Server/pull/3840)) @dariusuknuis 2024-01-07
-
-### Bugfix
-
-* Negative Aggro Fix ([#3866](https://github.com/EQEmu/Server/pull/3866)) @fryguy503 2024-01-07
-
-### Character
-
-* Convert Clear/Delete/Get/Update of Character Item Recast to Repositories ([#3857](https://github.com/EQEmu/Server/pull/3857)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Remove/Save of Character AA to Repositories ([#3849](https://github.com/EQEmu/Server/pull/3849)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Save of Character Bandolier to Repositories ([#3845](https://github.com/EQEmu/Server/pull/3845)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Save of Character Disciplines to Repositories ([#3850](https://github.com/EQEmu/Server/pull/3850)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Save of Character Leadership Abilities to Repositories ([#3847](https://github.com/EQEmu/Server/pull/3847)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Save of Character Material to Repositories ([#3846](https://github.com/EQEmu/Server/pull/3846)) @Kinglykrab 2024-01-07
-* Convert Delete/Load/Save of Character Spells to Repositories ([#3842](https://github.com/EQEmu/Server/pull/3842)) @Kinglykrab 2024-01-07
-* Convert Delete/Save of Character Memmed Spells to Repositories ([#3841](https://github.com/EQEmu/Server/pull/3841)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Bind to Repositories ([#3851](https://github.com/EQEmu/Server/pull/3851)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Buffs to Repositories ([#3855](https://github.com/EQEmu/Server/pull/3855)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Currency to Repositories ([#3848](https://github.com/EQEmu/Server/pull/3848)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Data to Repositories ([#3839](https://github.com/EQEmu/Server/pull/3839)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Potion Belt to Repositories ([#3844](https://github.com/EQEmu/Server/pull/3844)) @Kinglykrab 2024-01-07
-* Convert Load/Save of Character Skills to Repositories ([#3843](https://github.com/EQEmu/Server/pull/3843)) @Kinglykrab 2024-01-07
-* Convert Load/Update of Character Alternate Currencies to Repositories ([#3856](https://github.com/EQEmu/Server/pull/3856)) @Kinglykrab 2024-01-07
-* Convert NoRentExpired to Repositories ([#3860](https://github.com/EQEmu/Server/pull/3860)) @Kinglykrab 2024-01-07
-
-### Characters
-
-* Convert Load/Save of Character Auras to Repositories ([#3854](https://github.com/EQEmu/Server/pull/3854)) @Kinglykrab 2024-01-07
-
-### Code
-
-* Remove bot-based saylink method ([#3852](https://github.com/EQEmu/Server/pull/3852)) @Kinglykrab 2024-01-07
-
-### Commands
-
-* Add #clearxtargets Command ([#3833](https://github.com/EQEmu/Server/pull/3833)) @Kinglykrab 2024-01-07
-* Add scoped buckets and editing to #databuckets ([#3826](https://github.com/EQEmu/Server/pull/3826)) @Kinglykrab 2024-01-07
-* Cleanup #appearance Command ([#3827](https://github.com/EQEmu/Server/pull/3827)) @Kinglykrab 2024-01-07
-* Cleanup #fixmob  Command ([#3828](https://github.com/EQEmu/Server/pull/3828)) @Kinglykrab 2024-01-07
-* Cleanup #petname Command ([#3829](https://github.com/EQEmu/Server/pull/3829)) @Kinglykrab 2024-01-07
-* Cleanup #shutdown Command ([#3830](https://github.com/EQEmu/Server/pull/3830)) @Kinglykrab 2024-01-07
-* Remove #zopp Command ([#3831](https://github.com/EQEmu/Server/pull/3831)) @Kinglykrab 2024-01-07
-
-### Crash
-
-* Fix crash where Raid invite could be accepted after forming group with the Raid invitor. ([#3837](https://github.com/EQEmu/Server/pull/3837)) @Aeadoin 2024-01-06
-
-### Feature
-
-* Break Trader if moved ([#3862](https://github.com/EQEmu/Server/pull/3862)) @fryguy503 2024-01-07
-* Formula Addition (40+ Harm Touch) ([#3870](https://github.com/EQEmu/Server/pull/3870)) @fryguy503 2024-01-07
-* Legacy Fizzle Code ([#3868](https://github.com/EQEmu/Server/pull/3868)) @fryguy503 2024-01-07
-* Legacy Manaburn Rule ([#3872](https://github.com/EQEmu/Server/pull/3872)) @fryguy503 2024-01-07
-
-### Fixes
-
-* Add locations where melee can be bound outside of a city. ([#3887](https://github.com/EQEmu/Server/pull/3887)) @fryguy503 2024-01-07
-* Amplification should not benefit from instrument mods ([#3898](https://github.com/EQEmu/Server/pull/3898)) @fryguy503 2024-01-07
-* Bard Caster Level Fixes ([#3883](https://github.com/EQEmu/Server/pull/3883)) @fryguy503 2024-01-07
-* Buff Sync ([#3896](https://github.com/EQEmu/Server/pull/3896)) @fryguy503 2024-01-07
-* Cancel Magic SE fix ([#3890](https://github.com/EQEmu/Server/pull/3890)) @fryguy503 2024-01-07
-* Class Trainers dont steal your money! ([#3864](https://github.com/EQEmu/Server/pull/3864)) @fryguy503 2024-01-07
-* Clear Ramp when Clearing hate ([#3892](https://github.com/EQEmu/Server/pull/3892)) @fryguy503 2024-01-07
-* DI/Death Pact Fix ([#3867](https://github.com/EQEmu/Server/pull/3867)) @fryguy503 2024-01-07
-* Depop Charm Pet and Detach Debuffs on Evacuate ([#3888](https://github.com/EQEmu/Server/pull/3888)) @fryguy503 2024-01-07
-* Dire Charm Reset ([#3875](https://github.com/EQEmu/Server/pull/3875)) @fryguy503 2024-01-07
-* Disciplines Getting Focuses Fix ([#3884](https://github.com/EQEmu/Server/pull/3884)) @fryguy503 2024-01-07
-* Fix issue with 9th/10th inventory slot ([#3835](https://github.com/EQEmu/Server/pull/3835)) @Kinglykrab 2024-01-03
-* Fix typo on ZoneDatabase::LoadPetInfo ([#3871](https://github.com/EQEmu/Server/pull/3871)) @Kinglykrab 2024-01-07
-* Harm Touch Unholy Disc Type ([#3874](https://github.com/EQEmu/Server/pull/3874)) @fryguy503 2024-01-07
-* Prevent QS Crashes ([#3877](https://github.com/EQEmu/Server/pull/3877)) @fryguy503 2024-01-07
-* Rez Effects Stacking ([#3882](https://github.com/EQEmu/Server/pull/3882)) @fryguy503 2024-01-07
-* Rez in zone clear aggro ([#3895](https://github.com/EQEmu/Server/pull/3895)) @fryguy503 2024-01-07
-* Rune Invis Break ([#3893](https://github.com/EQEmu/Server/pull/3893)) @fryguy503 2024-01-07
-* Snare and DOT Stacking ([#3897](https://github.com/EQEmu/Server/pull/3897)) @fryguy503 2024-01-07
-* Swim Skillup and Underwater Fall Damage Fix ([#3885](https://github.com/EQEmu/Server/pull/3885)) @fryguy503 2024-01-07
-* Swimming Rules Adjustment and Racial ([#3889](https://github.com/EQEmu/Server/pull/3889)) @fryguy503 2024-01-07
-* Target Locked Pet Taunt ([#3894](https://github.com/EQEmu/Server/pull/3894)) @fryguy503 2024-01-07
-* Vampiric Embrace Fixes ([#3873](https://github.com/EQEmu/Server/pull/3873)) @fryguy503 2024-01-07
-
-### Languages
-
-* Cleanup language constants, use repositories ([#3838](https://github.com/EQEmu/Server/pull/3838)) @Kinglykrab 2024-01-07
-
-### Pets
-
-* Convert Load/Save of Pet Info to Repositories ([#3853](https://github.com/EQEmu/Server/pull/3853)) @Kinglykrab 2024-01-07
-
-### Rules
-
-* Casting Charm on over level = Aggro ([#3886](https://github.com/EQEmu/Server/pull/3886)) @fryguy503 2024-01-07
-* Classic Invite Requires Target ([#3878](https://github.com/EQEmu/Server/pull/3878)) @fryguy503 2024-01-07
-* Evac Aggro Wipe ([#3880](https://github.com/EQEmu/Server/pull/3880)) @fryguy503 2024-01-07
-* Mounts will wear off on zone ([#3865](https://github.com/EQEmu/Server/pull/3865)) @fryguy503 2024-01-07
-* PC Push and NPCtoNPC Push ([#3879](https://github.com/EQEmu/Server/pull/3879)) @fryguy503 2024-01-07
-* RequireMnemonicRetention for Spells 9-12 Rule ([#3876](https://github.com/EQEmu/Server/pull/3876)) @fryguy503 2024-01-07
-* Resist Softcap rules ([#3863](https://github.com/EQEmu/Server/pull/3863)) @fryguy503 2024-01-07
-* Restrict Finishing Blow to only Fleeing NPC's. ([#3869](https://github.com/EQEmu/Server/pull/3869)) @fryguy503 2024-01-07
-* Undead Aggro ([#3881](https://github.com/EQEmu/Server/pull/3881)) @fryguy503 2024-01-07
-
-### Tuning
-
-* FD and Sneak break when cast on adjustments. ([#3861](https://github.com/EQEmu/Server/pull/3861)) @fryguy503 2024-01-07
-
-### UCS
-
-* Consolidate configuration block ([#3768](https://github.com/EQEmu/Server/pull/3768)) @Akkadius 2024-01-07
-
-## [22.39.1] - 12/31/2023
-
-### Code
-
-* Appearance not appearence ([#3819](https://github.com/EQEmu/Server/pull/3819)) @Kinglykrab 2023-12-30
-* Delete errmsg.h in common and zone ([#3821](https://github.com/EQEmu/Server/pull/3821)) @Kinglykrab 2023-12-30
-* Gender constants cleanup ([#3817](https://github.com/EQEmu/Server/pull/3817)) @Kinglykrab 2023-12-30
-* Remove MakeSpawnUpdateNoDelta from mob.cpp/mob.h ([#3816](https://github.com/EQEmu/Server/pull/3816)) @Kinglykrab 2023-12-31
-* Remove SendStunAppearance from mob.cpp/mob.h ([#3818](https://github.com/EQEmu/Server/pull/3818)) @Kinglykrab 2023-12-31
-* Remove unused PlotPosition methods from mob.cpp/mob.h ([#3820](https://github.com/EQEmu/Server/pull/3820)) @Kinglykrab 2023-12-31
-
-### Database
-
-* Database update improvements, content db and terminal checks ([#3814](https://github.com/EQEmu/Server/pull/3814)) @Akkadius 2023-12-31
-
-### Fixes
-
-* Client:SetBucket Overload Incorrectly Named ([#3825](https://github.com/EQEmu/Server/pull/3825)) @fryguy503 2023-12-30
-* Fix crash in Client::Handle_OP_GMGoto ([#3832](https://github.com/EQEmu/Server/pull/3832)) @Kinglykrab 2023-12-31
-
-### Quest API
-
-* Add HasItemOnCorpse() to Perl/Lua ([#3824](https://github.com/EQEmu/Server/pull/3824)) @Kinglykrab 2023-12-31
-* Fix issue with death events. ([#3823](https://github.com/EQEmu/Server/pull/3823)) @Kinglykrab 2023-12-31
-
-### Repositories
-
-* Protected extended repositories from being overwritten if exists ([#3815](https://github.com/EQEmu/Server/pull/3815)) @Akkadius 2023-12-31
-
-## [22.39.0] - 12/27/2023
-
-### Character
-
-* Fix character copier due to schema change ([#3805](https://github.com/EQEmu/Server/pull/3805)) @Akkadius 2023-12-28
-
-### Combat
-
-* Disarm was not dropping item to ground due to bug ([#3811](https://github.com/EQEmu/Server/pull/3811)) @noudess 2023-12-27
-
-### Logs
-
-* Bulk insert new log settings ([#3810](https://github.com/EQEmu/Server/pull/3810)) @Akkadius 2023-12-28
-* Reclassify unhelpful Info message ([#3809](https://github.com/EQEmu/Server/pull/3809)) @Akkadius 2023-12-28
-
-### MySQL
-
-* Fix MySQL Query error formatting ([#3808](https://github.com/EQEmu/Server/pull/3808)) @Akkadius 2023-12-28
-
-### Objects
-
-* Remove "No objects to load for zone" error message ([#3807](https://github.com/EQEmu/Server/pull/3807)) @Akkadius 2023-12-28
-
-### Player Events
-
-* Bulk replace settings on boot ([#3806](https://github.com/EQEmu/Server/pull/3806)) @Akkadius 2023-12-28
-
-### Tasks
-
-* Add enabled column ([#3804](https://github.com/EQEmu/Server/pull/3804)) @Akkadius 2023-12-28
-
-## [22.38.0] - 12/26/2023
-
-### Bots
-
-* Remove unnecessary error on SetItemReuse ([#3795](https://github.com/EQEmu/Server/pull/3795)) @nytmyr 2023-12-20
-
-### Code
-
-* Consolidate GetHateRandom(), GetHateRandomBot(), GetHateRandomClient(), and GetHateRandomNPC() ([#3794](https://github.com/EQEmu/Server/pull/3794)) @Kinglykrab 2023-12-25
-* Race constants refactor ([#3782](https://github.com/EQEmu/Server/pull/3782)) @Akkadius 2023-12-23
-
-### Database
-
-* Fix issue with saylinks query in MySQL 8.0+ ([#3800](https://github.com/EQEmu/Server/pull/3800)) @Akkadius 2023-12-24
-* Update faction mods with Live data ([#3799](https://github.com/EQEmu/Server/pull/3799)) @joligario 2023-12-23
-
-### Fixes
-
-* Disable Hide/Improved Hide on Trap damage ([#3791](https://github.com/EQEmu/Server/pull/3791)) @Kinglykrab 2023-12-19
-* Fix Bard Invisibility Songs breaking every 4 ticks ([#3783](https://github.com/EQEmu/Server/pull/3783)) @Kinglykrab 2023-12-19
-* Fix can_riposte parameter in DoMeleeSkillAttackDmg ([#3792](https://github.com/EQEmu/Server/pull/3792)) @Kinglykrab 2023-12-19
-
-### Forage
-
-* Add a rule to disabled using common_food_ids from the list in forage.cpp.  currently set to enabled. ([#3796](https://github.com/EQEmu/Server/pull/3796)) @regneq 2023-12-22
-
-### NPC
-
-* Support for multiple emotes per type, emote variables ([#3801](https://github.com/EQEmu/Server/pull/3801)) @regneq 2023-12-25
-
-### Quest API
-
-* Add GetHateTopBot(), GetHateTopClient(), and GetHateTopNPC() to Perl/Lua ([#3793](https://github.com/EQEmu/Server/pull/3793)) @Kinglykrab 2023-12-22
-* Add SummonItemIntoInventory() to Perl/Lua ([#3797](https://github.com/EQEmu/Server/pull/3797)) @Kinglykrab 2023-12-22
-
-### Repositories
-
-* Add ReplaceOne and ReplaceMany ([#3802](https://github.com/EQEmu/Server/pull/3802)) @Akkadius 2023-12-26
-
-## [22.37.0] - 12/18/2023
-
-### Bots
-
-* Add ScanCloseMobs support to fix AEs ([#3786](https://github.com/EQEmu/Server/pull/3786)) @nytmyr 2023-12-18
-* Expand ^itemuse options ([#3756](https://github.com/EQEmu/Server/pull/3756)) @nytmyr 2023-12-17
-* Fix ^defensive from checking aggressive disciplines. ([#3787](https://github.com/EQEmu/Server/pull/3787)) @nytmyr 2023-12-18
-* Fix ^oo autodefend from sending bots/pets to invalid haters ([#3772](https://github.com/EQEmu/Server/pull/3772)) @nytmyr 2023-12-16
-* Fix unnecessary failed to save timer error ([#3788](https://github.com/EQEmu/Server/pull/3788)) @nytmyr 2023-12-18
-* [Quest API] Add ^clickitem, ^timer, fix GetBestBotSpellForCure ([#3755](https://github.com/EQEmu/Server/pull/3755)) @nytmyr 2023-12-17
-
-### CI
-
-* Switch to use clang for Linux builds (speed) ([#3777](https://github.com/EQEmu/Server/pull/3777)) @Akkadius 2023-12-17
-
-### Compilation
-
-* Use pre-compiled headers for Windows (speed) ([#3778](https://github.com/EQEmu/Server/pull/3778)) @Akkadius 2023-12-18
-
-### Fixes
-
-* Drop Invisibility when hit by traps ([#3785](https://github.com/EQEmu/Server/pull/3785)) @Kinglykrab 2023-12-18
-* Fix NPCs routing to 0.0, 0.0 on #summon ([#3780](https://github.com/EQEmu/Server/pull/3780)) @Kinglykrab 2023-12-18
-* Fix bad merge  @Akkadius 2023-12-17
-* Fix issue with HOTBonusHealingSplitOverDuration Rule ([#3776](https://github.com/EQEmu/Server/pull/3776)) @Kinglykrab 2023-12-17
-* Fixed the discrepacy with time using command #time and in quests. ([#3767](https://github.com/EQEmu/Server/pull/3767)) @regneq 2023-12-17
-* Send Entity ID in Death Events to resolve #3721 ([#3779](https://github.com/EQEmu/Server/pull/3779)) @Kinglykrab 2023-12-18
-
-### Quest API
-
-* Add EVENT_ALT_CURRENCY_GAIN and EVENT_ALT_CURRENCY_LOSS to Perl/Lua ([#3734](https://github.com/EQEmu/Server/pull/3734)) @Kinglykrab 2023-12-17
-* Add EVENT_CRYSTAL_GAIN and EVENT_CRYSTAL_LOSS to Perl/Lua ([#3735](https://github.com/EQEmu/Server/pull/3735)) @Kinglykrab 2023-12-17
-* Add EVENT_LDON_POINTS_GAIN and EVENT_LDON_POINTS_LOSS to Perl/Lua ([#3742](https://github.com/EQEmu/Server/pull/3742)) @Kinglykrab 2023-12-17
-* Add EVENT_LEVEL_UP and EVENT_LEVEL_DOWN to Bots ([#3750](https://github.com/EQEmu/Server/pull/3750)) @Kinglykrab 2023-12-17
-* Add EVENT_LOOT_ADDED to Perl/Lua ([#3739](https://github.com/EQEmu/Server/pull/3739)) @Kinglykrab 2023-12-17
-* Add GetNPCAggro() and SetNPCAggro() to Perl/Lua ([#3781](https://github.com/EQEmu/Server/pull/3781)) @Kinglykrab 2023-12-18
-
 ## [22.36.0] - 12/16/2023
 
 ### Bots

CMakeLists.txt

@@ -17,7 +17,6 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
 OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
 
 IF (EQEMU_BUILD_STATIC)
 	SET(BUILD_SHARED_LIBS OFF)

common/CMakeLists.txt

@@ -13,6 +13,7 @@ SET(common_sources
     crc32.cpp
     database/database_dump_service.cpp
     database.cpp
+    database_conversions.cpp
     database_instances.cpp
     database/database_update_manifest.cpp
     database/database_update_manifest_bots.cpp
@@ -540,6 +541,7 @@ SET(common_headers
     events/player_event_logs.h
     events/player_event_discord_formatter.h
     events/player_events.h
+    errmsg.h
     event_sub.h
     expedition_lockout_timer.h
     extprofile.h
@@ -561,6 +563,7 @@ SET(common_headers
     item_fieldlist.h
     item_instance.h
     json_config.h
+    languages.h
     light_source.h
     linked_list.h
     loottable.h
@@ -784,13 +787,14 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
 ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
 
+IF(WIN32)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
+ENDIF(WIN32)
+
 IF (UNIX)
     SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
     SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
 ENDIF (UNIX)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/classes.cpp

@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 	*/
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "../common/global_define.h"
 #include "../common/classes.h"
 #include "data_verification.h"

common/cli/eqemu_command_handler.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "eqemu_command_handler.h"
 #include "terminal_color.hpp"
 #include "../platform.h"

common/database.cpp

@@ -2246,11 +2246,6 @@ bool Database::CopyCharacter(
 	row     = results.begin();
 	std::string new_character_id = row[0];
 
-	std::vector<std::string> tables_to_zero_id = {
-		"keyring",
-		"data_buckets",
-	};
-
 	TransactionBegin();
 	for (const auto &iter : DatabaseSchema::GetCharacterTables()) {
 		std::string table_name               = iter.first;
@@ -2284,10 +2279,6 @@ bool Database::CopyCharacter(
 				std::string column = columns[column_index];
 				std::string value  = row[column_index] ? row[column_index] : "null";
 
-				if (column == "id" && Strings::Contains(tables_to_zero_id, table_name)) {
-					value = "0";
-				}
-
 				if (column == character_id_column_name) {
 					value = new_character_id;
 				}
@@ -2335,6 +2326,7 @@ bool Database::CopyCharacter(
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
+				break;
 			}
 		}
 	}

common/database.h

@@ -226,6 +226,11 @@ public:
 
 	void    PurgeAllDeletedDataBuckets();
 
+	/* Database Conversions 'database_conversions.cpp' */
+
+	bool	CheckDatabaseConversions();
+	bool	CheckDatabaseConvertCorpseDeblob();
+	bool	CheckDatabaseConvertPPDeblob();
 
 	/* Database Variables */
 

common/database/database_update.cpp

@@ -76,9 +76,9 @@ void DatabaseUpdate::CheckDbUpdates()
 	}
 }
 
-std::string DatabaseUpdate::GetQueryResult(const ManifestEntry& e)
+std::string DatabaseUpdate::GetQueryResult(std::string query)
 {
-	auto results = (e.content_schema_update ? m_content_database : m_database)->QueryDatabase(e.check);
+	auto results = m_database->QueryDatabase(query);
 
 	std::vector<std::string> result_lines = {};
 
@@ -121,16 +121,6 @@ bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_resu
 	return false;
 }
 
-// check if we are running in a terminal
-bool is_atty()
-{
-#ifdef _WINDOWS
-	return ::_isatty(_fileno(stdin));
-#else
-	return isatty(fileno(stdin));
-#endif
-}
-
 // return true if we ran updates
 bool DatabaseUpdate::UpdateManifest(
 	std::vector<ManifestEntry> entries,
@@ -146,7 +136,7 @@ bool DatabaseUpdate::UpdateManifest(
 			for (auto &e: entries) {
 				if (e.version == version) {
 					bool        has_migration = true;
-					std::string r             = GetQueryResult(e);
+					std::string r             = GetQueryResult(e.check);
 					if (ShouldRunMigration(e, r)) {
 						has_migration = false;
 						missing_migrations.emplace_back(e.version);
@@ -189,7 +179,7 @@ bool DatabaseUpdate::UpdateManifest(
 				if (e.version == m) {
 					bool errored_migration = false;
 
-					auto r = (e.content_schema_update ? m_content_database : m_database)->QueryDatabaseMulti(e.sql);
+					auto r = m_database->QueryDatabaseMulti(e.sql);
 
 					// ignore empty query result "errors"
 					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
@@ -197,38 +187,31 @@ bool DatabaseUpdate::UpdateManifest(
 						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)");
 
-						// if terminal attached then prompt for skip
-						if (is_atty()) {
-							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;
 
-							// 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));
+						// spawn a concurrent thread that waits for input from std::cin
+						std::thread t1(
+							[&]() {
+								std::cin >> input;
+								gave_input = true;
 							}
+						);
+						t1.detach();
 
-							// prompt for user skip
-							if (Strings::Trim(input) == "y") {
-								errored_migration = false;
-								LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-							}
-						} else {
-							errored_migration = true;
+						// 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);
 						}
 					}
@@ -264,13 +247,6 @@ DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
 	return this;
 }
 
-DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
-{
-	m_content_database = db;
-
-	return this;
-}
-
 bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 {
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));

common/database/database_update.h

@@ -10,7 +10,6 @@ struct ManifestEntry {
 	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
-	bool        content_schema_update{}; // if true, this migration is a content schema update and should be ran against the content database
 };
 
 struct DatabaseVersion {
@@ -23,16 +22,14 @@ public:
 	DatabaseVersion GetDatabaseVersions();
 	DatabaseVersion GetBinaryDatabaseVersions();
 	void CheckDbUpdates();
-	std::string GetQueryResult(const ManifestEntry& e);
+	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);
-	DatabaseUpdate *SetContentDatabase(Database *db);
 	bool HasPendingUpdates();
 private:
 	Database *m_database;
-	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
 };

common/database/database_update_manifest.cpp

@@ -5016,7 +5016,7 @@ CREATE TABLE `spawn2_disabled` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 INSERT INTO spawn2_disabled (spawn2_id, disabled) SELECT id, 1 FROM spawn2 WHERE enabled = 0;
 ALTER TABLE `spawn2` DROP COLUMN `enabled`;
-)",
+)"
 	},
 	ManifestEntry{
 		.version = 9242,
@@ -5028,8 +5028,7 @@ ALTER TABLE `spawn2` DROP COLUMN `enabled`;
 ALTER TABLE `spawnentry`
 ADD COLUMN `min_time` smallint(4) NOT NULL DEFAULT 0 AFTER `condition_value_filter`,
 ADD COLUMN `max_time` smallint(4) NOT NULL DEFAULT 0 AFTER `min_time`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9243,
@@ -5083,8 +5082,7 @@ INSERT INTO
 
 DROP TABLE `starting_items`;
 RENAME TABLE `starting_items_new` TO `starting_items`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9244,
@@ -5094,8 +5092,7 @@ RENAME TABLE `starting_items_new` TO `starting_items`;
 		.match = "0000-00-00 00:00:00",
 		.sql = R"(
 ALTER TABLE `items` MODIFY COLUMN `updated` datetime NULL DEFAULT NULL;
-		)",
-		.content_schema_update = true
+		)"
 	},
 	ManifestEntry{
 		.version = 9245,
@@ -5107,8 +5104,7 @@ ALTER TABLE `items` MODIFY COLUMN `updated` datetime NULL DEFAULT NULL;
 ALTER TABLE `object` CHANGE COLUMN `unknown08` `size_percentage` float NOT NULL DEFAULT 0 AFTER `icon`;
 ALTER TABLE `object` CHANGE COLUMN `unknown10` `solid_type` mediumint(5) NOT NULL DEFAULT 0 AFTER `size`;
 ALTER TABLE `object` CHANGE COLUMN `unknown20` `incline` int(11) NOT NULL DEFAULT 0 AFTER `solid_type`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9246,
@@ -5137,31 +5133,7 @@ CHANGE COLUMN `slot` `inventory_slot` mediumint(9) NOT NULL DEFAULT -1 AFTER `st
 
 ALTER TABLE `starting_items`
 CHANGE COLUMN `temporary` `class_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `id`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9248,
-		.description = "2023_12_22_drop_npc_emotes_index.sql",
-		.check = "show index from npc_emotes where key_name = 'emoteid'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `npc_emotes` DROP INDEX `emoteid`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9249,
-		.description = "2023_12_26_add_tasks_enabled_column.sql",
-		.check = "SHOW COLUMNS FROM `tasks` LIKE 'enabled'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `tasks`
-ADD COLUMN `enabled` smallint NULL DEFAULT 1 AFTER `faction_amount`
-)",
-		.content_schema_update = true
+)"
 	}
 
 // -- template; copy/paste this when you need to create a new entry

common/database/database_update_manifest_bots.cpp

@@ -82,28 +82,6 @@ CREATE TABLE `bot_starting_items`  (
 `content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
 PRIMARY KEY (`id`)
 ) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci;
-)",
-	},
-	ManifestEntry{
-		.version = 9041,
-		.description = "2023_12_04_bot_timers.sql",
-		.check = "SHOW COLUMNS FROM `bot_timers` LIKE 'recast_time'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_timers`
-	ADD COLUMN `recast_time` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `timer_value`,
-	ADD COLUMN `is_spell` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `recast_time`,
-	ADD COLUMN `is_disc` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `is_spell`,
-	ADD COLUMN `spell_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_disc`,
-	ADD COLUMN `is_item` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `spell_id`,
-	ADD COLUMN `item_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_item`;
-ALTER TABLE `bot_timers`
-	DROP FOREIGN KEY `FK_bot_timers_1`;
-ALTER TABLE `bot_timers`
-	DROP PRIMARY KEY;
-ALTER TABLE `bot_timers`
-	ADD PRIMARY KEY (`bot_id`, `timer_id`, `spell_id`, `item_id`);
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry

common/database_conversions.cpp

@@ -0,0 +1,39 @@
+#include "../common/global_define.h"
+#include "../common/rulesys.h"
+#include "../common/strings.h"
+
+#include "database.h"
+#include "database/database_update.h"
+
+
+// Disgrace: for windows compile
+#ifdef _WINDOWS
+#include <windows.h>
+#define snprintf	_snprintf
+#define strncasecmp	_strnicmp
+#define strcasecmp	_stricmp
+#else
+
+#include "unix.h"
+#include <netinet/in.h>
+#include <sys/time.h>
+
+#endif
+
+#pragma pack(1)
+
+DatabaseUpdate database_update;
+
+bool Database::CheckDatabaseConversions()
+{
+	auto *r = RuleManager::Instance();
+	r->LoadRules(this, "default", false);
+	if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) {
+		LogInfo("Bot tables found but rule not enabled, enabling");
+		r->SetRule("Bots:Enabled", "true", this, true, true);
+	}
+
+	database_update.SetDatabase(this)->CheckDbUpdates();
+
+	return true;
+}

common/database_schema.h

@@ -71,7 +71,7 @@ namespace DatabaseSchema {
 			{"character_tasks",                "charid"},
 			{"character_tribute",              "character_id"},
 			{"completed_tasks",                "charid"},
-			{"data_buckets",                   "character_id"},
+			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
 			{"friends",                        "charid"},
 			{"guild_members",                  "char_id"},

common/dbcore.cpp

@@ -8,6 +8,7 @@
 
 #include "dbcore.h"
 
+#include <errmsg.h>
 #include <fstream>
 #include <iostream>
 #include <mysqld_error.h>
@@ -137,7 +138,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		 * Error logging
 		 */
 		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
-			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
+			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}
 
 		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);

common/dbcore.h

@@ -14,9 +14,6 @@
 #include <string.h>
 #include <mutex>
 
-#define CR_SERVER_GONE_ERROR    2006
-#define CR_SERVER_LOST          2013
-
 class DBcore {
 public:
 	enum eStatus {

common/emu_constants.cpp

@@ -22,6 +22,7 @@
 #include "data_verification.h"
 #include "eqemu_logsys.h"
 #include "eqemu_logsys_log_aliases.h"
+#include "languages.h"
 #include "rulesys.h"
 
 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
@@ -158,45 +159,45 @@ int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
 	return 0;
 }
 
-const std::map<uint8, std::string>& EQ::constants::GetLanguageMap()
+const std::map<int, std::string>& EQ::constants::GetLanguageMap()
 {
-	static const std::map<uint8, std::string> language_map = {
-		{ Language::CommonTongue,  "Common Tongue" },
-		{ Language::Barbarian,     "Barbarian" },
-		{ Language::Erudian,       "Erudian" },
-		{ Language::Elvish,        "Elvish" },
-		{ Language::DarkElvish,    "Dark Elvish" },
-		{ Language::Dwarvish,      "Dwarvish" },
-		{ Language::Troll,         "Troll" },
-		{ Language::Ogre,          "Ogre" },
-		{ Language::Gnomish,       "Gnomish" },
-		{ Language::Halfling,      "Halfling" },
-		{ Language::ThievesCant,   "Thieves Cant" },
-		{ Language::OldErudian,    "Old Erudian" },
-		{ Language::ElderElvish,   "Elder Elvish" },
-		{ Language::Froglok,       "Froglok" },
-		{ Language::Goblin,        "Goblin" },
-		{ Language::Gnoll,         "Gnoll" },
-		{ Language::CombineTongue, "Combine Tongue" },
-		{ Language::ElderTeirDal,  "Elder Teir'Dal" },
-		{ Language::Lizardman,     "Lizardman" },
-		{ Language::Orcish,        "Orcish" },
-		{ Language::Faerie,        "Faerie" },
-		{ Language::Dragon,        "Dragon" },
-		{ Language::ElderDragon,   "Elder Dragon" },
-		{ Language::DarkSpeech,    "Dark Speech" },
-		{ Language::VahShir,       "Vah Shir" },
-		{ Language::Alaran,        "Alaran" },
-		{ Language::Hadal,         "Hadal" },
-		{ Language::Unknown27,     "Unknown" }
+	static const std::map<int, std::string> language_map = {
+		{ LANG_COMMON_TONGUE, "Common Tongue" },
+		{ LANG_BARBARIAN, "Barbarian" },
+		{ LANG_ERUDIAN, "Erudian" },
+		{ LANG_ELVISH, "Elvish" },
+		{ LANG_DARK_ELVISH, "Dark Elvish" },
+		{ LANG_DWARVISH, "Dwarvish" },
+		{ LANG_TROLL, "Troll" },
+		{ LANG_OGRE, "Ogre" },
+		{ LANG_GNOMISH, "Gnomish" },
+		{ LANG_HALFLING, "Halfling" },
+		{ LANG_THIEVES_CANT, "Thieves Cant" },
+		{ LANG_OLD_ERUDIAN, "Old Erudian" },
+		{ LANG_ELDER_ELVISH, "Elder Elvish" },
+		{ LANG_FROGLOK, "Froglok" },
+		{ LANG_GOBLIN, "Goblin" },
+		{ LANG_GNOLL, "Gnoll" },
+		{ LANG_COMBINE_TONGUE, "Combine Tongue" },
+		{ LANG_ELDER_TEIRDAL, "Elder Teirdal" },
+		{ LANG_LIZARDMAN, "Lizardman" },
+		{ LANG_ORCISH, "Orcish" },
+		{ LANG_FAERIE, "Faerie" },
+		{ LANG_DRAGON, "Dragon" },
+		{ LANG_ELDER_DRAGON, "Elder Dragon" },
+		{ LANG_DARK_SPEECH, "Dark Speech" },
+		{ LANG_VAH_SHIR, "Vah Shir" },
+		{ LANG_ALARAN, "Alaran" },
+		{ LANG_HADAL, "Hadal" },
+		{ LANG_UNKNOWN, "Unknown" }
 	};
 
 	return language_map;
 }
 
-std::string EQ::constants::GetLanguageName(uint8 language_id)
+std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
+	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
 		return std::string();
 	}
 
@@ -508,6 +509,7 @@ std::string EQ::constants::GetObjectTypeName(int object_type)
 {
 	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
 		return std::string();
+
 	}
 
 	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
@@ -578,63 +580,3 @@ std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 
 	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 }
-
-const std::map<uint32, std::string>& EQ::constants::GetAppearanceTypeMap()
-{
-	static const std::map<uint32, std::string> appearance_type_map = {
-		{ AppearanceType::Die, "Die" },
-		{ AppearanceType::WhoLevel, "Who Level" },
-		{ AppearanceType::MaxHealth, "Max Health" },
-		{ AppearanceType::Invisibility, "Invisibility" },
-		{ AppearanceType::PVP, "PVP" },
-		{ AppearanceType::Light, "Light" },
-		{ AppearanceType::Animation, "Animation" },
-		{ AppearanceType::Sneak, "Sneak" },
-		{ AppearanceType::SpawnID, "Spawn ID" },
-		{ AppearanceType::Health, "Health" },
-		{ AppearanceType::Linkdead, "Linkdead" },
-		{ AppearanceType::FlyMode, "Fly Mode" },
-		{ AppearanceType::GM, "GM" },
-		{ AppearanceType::Anonymous, "Anonymous" },
-		{ AppearanceType::GuildID, "Guild ID" },
-		{ AppearanceType::GuildRank, "Guild Rank" },
-		{ AppearanceType::AFK, "AFK" },
-		{ AppearanceType::Pet, "Pet" },
-		{ AppearanceType::Summoned, "Summoned" },
-		{ AppearanceType::Split, "Split" },
-		{ AppearanceType::Size, "Size" },
-		{ AppearanceType::SetType, "Set Type" },
-		{ AppearanceType::NPCName, "NPCName" },
-		{ AppearanceType::AARank, "AARank" },
-		{ AppearanceType::CancelSneakHide, "Cancel Sneak Hide" },
-		{ AppearanceType::AreaHealthRegen, "Area Health Regeneration" },
-		{ AppearanceType::AreaManaRegen, "Area Mana Regeneration" },
-		{ AppearanceType::AreaEnduranceRegen, "Area Endurance Regeneration" },
-		{ AppearanceType::FreezeBeneficialBuffs, "Freeze Beneficial Buffs" },
-		{ AppearanceType::NPCTintIndex, "NPC Tint Index" },
-		{ AppearanceType::GroupAutoConsent, "Group Auto Consent" },
-		{ AppearanceType::RaidAutoConsent, "Raid Auto Consent" },
-		{ AppearanceType::GuildAutoConsent, "Guild Auto Consent" },
-		{ AppearanceType::ShowHelm, "Show Helm" },
-		{ AppearanceType::DamageState, "Damage State" },
-		{ AppearanceType::EQPlayers, "EQ Players" },
-		{ AppearanceType::FindBits, "Find Bits" },
-		{ AppearanceType::TextureType, "Texture Type" },
-		{ AppearanceType::FacePick, "Face Pick" },
-		{ AppearanceType::AntiCheat, "Anti Cheat" },
-		{ AppearanceType::GuildShow, "Guild Show" },
-		{ AppearanceType::OfflineMode, "Offline Mode" }
-	};
-
-	return appearance_type_map;
-}
-
-std::string EQ::constants::GetAppearanceTypeName(uint32 appearance_type)
-{
-	const auto& a = EQ::constants::GetAppearanceTypeMap().find(appearance_type);
-	if (a != EQ::constants::GetAppearanceTypeMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}

common/emu_constants.h

@@ -358,8 +358,8 @@ namespace EQ
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);
 
-		extern const std::map<uint8, std::string>& GetLanguageMap();
-		std::string GetLanguageName(uint8 language_id);
+		extern const std::map<int, std::string>& GetLanguageMap();
+		std::string GetLanguageName(int language_id);
 
 		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
 		std::string GetLDoNThemeName(uint32 theme_id);
@@ -397,9 +397,6 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetEmoteTypeMap();
 		std::string GetEmoteTypeName(uint8 emote_type);
 
-		extern const std::map<uint32, std::string>& GetAppearanceTypeMap();
-		std::string GetAppearanceTypeName(uint32 animation_type);
-
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;

common/eq_constants.h

@@ -23,59 +23,61 @@
 #include "skills.h"
 #include "types.h"
 
-namespace AppearanceType {
-	constexpr uint32 Die                   = 0; // Causes the client to keel over and zone to bind point (default action)
-	constexpr uint32 WhoLevel              = 1; // Level that shows up on /who
-	constexpr uint32 MaxHealth             = 2;
-	constexpr uint32 Invisibility          = 3; // 0 = Visible, 1 = Invisible
-	constexpr uint32 PVP                   = 4; // 0 = Non-PVP, 1 = PVP
-	constexpr uint32 Light                 = 5; // Light type emitted by player (lightstone, shiny shield)
-	constexpr uint32 Animation             = 14; // 100 = Standing, 102 = Freeze, 105 = Looting, 110 = Sitting, 111 = Crouching, 115 = Lying
-	constexpr uint32 Sneak                 = 15; // 0 = Normal, 1 = Sneaking
-	constexpr uint32 SpawnID               = 16; // Server -> Client, sets player spawn ID
-	constexpr uint32 Health                = 17; // Client->Server, my HP has changed (like regen tic)
-	constexpr uint32 Linkdead              = 18; // 0 = Normal, 1 = Linkdead
-	constexpr uint32 FlyMode               = 19; // 0 = Off, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating while Running
-	constexpr uint32 GM                    = 20; // 0 = Non-GM, 1 = GM
-	constexpr uint32 Anonymous             = 21; // 0 = Non-Anonymous, 1 = Anonymous, 2 = Roleplaying
-	constexpr uint32 GuildID               = 22;
-	constexpr uint32 GuildRank             = 23;
-	constexpr uint32 AFK                   = 24; // 0 = Non-AFK, 1 = AFK
-	constexpr uint32 Pet                   = 25; // Parameter is Entity ID of owner, or 0 for when charm breaks
-	constexpr uint32 Summoned              = 27;
-	constexpr uint32 Split                 = 28; // 0 = No Split, 1 = Auto Split
-	constexpr uint32 Size                  = 29; // Spawn's Size
-	constexpr uint32 SetType               = 30; // 0 = PC, 1 = NPC, 2 = Corpse
-	constexpr uint32 NPCName               = 31; // Change PC name color to NPC name color
-	constexpr uint32 AARank                = 32; // AA Rank Title ID, title in /who?
-	constexpr uint32 CancelSneakHide       = 33; // Turns off Hide and Sneak
-	constexpr uint32 AreaHealthRegen       = 35; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaManaRegen         = 36; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaEnduranceRegen    = 37; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 FreezeBeneficialBuffs = 38; // Freezes beneficial buff timers for PCs
-	constexpr uint32 NPCTintIndex          = 39;
-	constexpr uint32 GroupAutoConsent      = 40; // Auto Consent Group
-	constexpr uint32 RaidAutoConsent       = 41; // Auto Consent Raid
-	constexpr uint32 GuildAutoConsent      = 42; // Auto Consent Guild
-	constexpr uint32 ShowHelm              = 43; // 0 = Hide, 1 = Show
-	constexpr uint32 DamageState           = 44; // The damage state of a destructible object (0 through 10) plays sound IDs, most only have 2 or 4 states though
-	constexpr uint32 EQPlayers             = 45; // EQ Players Update
-	constexpr uint32 FindBits              = 46; // Set Find Bits?
-	constexpr uint32 TextureType           = 48; // Texture Type?
-	constexpr uint32 FacePick              = 49; // Turns off face pick window?
-	constexpr uint32 AntiCheat             = 51; // Sent by the client randomly telling the server how long since last action has occurred
-	constexpr uint32 GuildShow             = 52;
-	constexpr uint32 OfflineMode           = 53; // Offline Mode
-}
 
-namespace Animation {
-	constexpr uint32 Standing  = 100;
-	constexpr uint32 Freeze    = 102;
-	constexpr uint32 Looting   = 105;
-	constexpr uint32 Sitting   = 110;
-	constexpr uint32 Crouching = 111;
-	constexpr uint32 Lying     = 115;
-}
+//SpawnAppearance types: (compared two clients for server-originating types: SoF & RoF2)
+#define AT_Die 0			// this causes the client to keel over and zone to bind point (default action)
+#define AT_WhoLevel 1		// the level that shows up on /who
+#define AT_HPMax 2			// idk
+#define AT_Invis 3			// 0 = visible, 1 = invisible
+#define AT_PVP 4			// 0 = blue, 1 = pvp (red)
+#define AT_Light 5			// light type emitted by player (lightstone, shiny shield)
+#define AT_Anim 14			// 100=standing, 110=sitting, 111=ducking, 115=feigned, 105=looting
+#define AT_Sneak 15			// 0 = normal, 1 = sneaking
+#define AT_SpawnID 16		// server to client, sets player spawn id
+#define AT_HP 17			// Client->Server, my HP has changed (like regen tic)
+#define AT_Linkdead 18		// 0 = normal, 1 = linkdead
+#define AT_Levitate 19		// 0=off, 1=flymode, 2=levitate max 5, see GravityBehavior enum
+#define AT_GM 20			// 0 = normal, 1 = GM - all odd numbers seem to make it GM
+#define AT_Anon 21			// 0 = normal, 1 = anon, 2 = roleplay
+#define AT_GuildID 22
+#define AT_GuildRank 23		// 0=member, 1=officer, 2=leader
+#define AT_AFK 24			// 0 = normal, 1 = afk
+#define AT_Pet 25			// Param is EntityID of owner, or 0 for when charm breaks
+#define AT_Summoned 27		// Unsure
+#define AT_Split 28			// 0 = normal, 1 = autosplit on (not showing in SoF+) (client-to-server only)
+#define AT_Size 29			// spawn's size (present: SoF, absent: RoF2)
+#define AT_SetType 30		// 0 = PC, 1 = NPC, 2 <= = corpse
+#define AT_NPCName 31		// change PC's name's color to NPC color 0 = normal, 1 = npc name, Trader on RoF2?
+#define AT_AARank 32		// AA Rank Title ID thingy, does is this the title in /who?
+#define AT_CancelSneakHide 33	// Turns off Hide and Sneak
+//#define AT_34 34			// unknown (present: SoF, absent: RoF2)
+#define AT_AreaHPRegen 35	// guild hall regen pool sets to value * 0.001
+#define AT_AreaManaRegen 36	// guild hall regen pool sets to value * 0.001
+#define AT_AreaEndRegen 37	// guild hall regen pool sets to value * 0.001
+#define AT_FreezeBuffs 38	// Freezes beneficial buff timers
+#define AT_NpcTintIndex 39	// not 100% sure
+#define AT_GroupConsent 40	// auto consent group
+#define AT_RaidConsent 41	// auto consent raid
+#define AT_GuildConsent 42	// auto consent guild
+#define AT_ShowHelm 43		// 0 = hide graphic, 1 = show graphic
+#define AT_DamageState 44	// The damage state of a destructible object (0 through 10) plays soundids most only have 2 or 4 states though
+#define AT_EQPlayers 45		// /eqplayersupdate
+#define AT_FindBits 46		// set FindBits, whatever those are!
+#define AT_TextureType 48	// TextureType
+#define AT_FacePick 49		// Turns off face pick window? maybe ...
+#define AT_AntiCheat 51		// sent by the client randomly telling the server how long since last action has occured
+#define AT_GuildShow 52		// this is what MQ2 call sit, not sure
+#define AT_Offline 53		// Offline mode
+
+//#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
+
+// animations for AT_Anim
+#define ANIM_FREEZE	    102
+#define	ANIM_STAND		0x64
+#define	ANIM_SIT		0x6e
+#define	ANIM_CROUCH		0x6f
+#define	ANIM_DEATH		0x73
+#define ANIM_LOOT		0x69
 
 constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;
 
@@ -684,53 +686,6 @@ namespace Zones {
 	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
 }
 
-namespace Language {
-	constexpr uint8 CommonTongue  = 0;
-	constexpr uint8 Barbarian     = 1;
-	constexpr uint8 Erudian       = 2;
-	constexpr uint8 Elvish        = 3;
-	constexpr uint8 DarkElvish    = 4;
-	constexpr uint8 Dwarvish      = 5;
-	constexpr uint8 Troll         = 6;
-	constexpr uint8 Ogre          = 7;
-	constexpr uint8 Gnomish       = 8;
-	constexpr uint8 Halfling      = 9;
-	constexpr uint8 ThievesCant   = 10;
-	constexpr uint8 OldErudian    = 11;
-	constexpr uint8 ElderElvish   = 12;
-	constexpr uint8 Froglok       = 13;
-	constexpr uint8 Goblin        = 14;
-	constexpr uint8 Gnoll         = 15;
-	constexpr uint8 CombineTongue = 16;
-	constexpr uint8 ElderTeirDal  = 17;
-	constexpr uint8 Lizardman     = 18;
-	constexpr uint8 Orcish        = 19;
-	constexpr uint8 Faerie        = 20;
-	constexpr uint8 Dragon        = 21;
-	constexpr uint8 ElderDragon   = 22;
-	constexpr uint8 DarkSpeech    = 23;
-	constexpr uint8 VahShir       = 24;
-	constexpr uint8 Alaran        = 25;
-	constexpr uint8 Hadal         = 26;
-	constexpr uint8 Unknown27     = 27;
-
-	constexpr uint8 MaxValue = 100;
-}
-namespace PetInfoType {
-	constexpr int Current   = 0;
-	constexpr int Suspended = 1;
-}
-
-namespace BuffEffectType {
-	constexpr uint8 None        = 0;
-	constexpr uint8 Buff        = 2;
-	constexpr uint8 InverseBuff = 4;
-}
-
-namespace AlternateCurrencyMode {
-	constexpr uint32 Update   = 7;
-	constexpr uint32 Populate = 8;
-}
 
 typedef enum {
 	FilterNone = 0,

common/eq_packet_structs.h

@@ -124,12 +124,6 @@ struct LDoNTrapTemplate
 	uint8 locked;
 };
 
-enum CrystalReclaimTypes
-{
-	Ebon = 5,
-	Radiant = 4,
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 
@@ -5134,6 +5128,8 @@ struct GroupMakeLeader_Struct
 //ex for a blank crowns window you would send:
 //999999|1|999999|0
 //any items come after in much the same way adventure merchant items do except there is no theme included
+#define ALT_CURRENCY_OP_POPULATE 8
+#define ALT_CURRENCY_OP_UPDATE 7
 
 //Server -> Client
 //Populates the initial Alternate Currency Window

common/eqemu_config.cpp

@@ -20,12 +20,9 @@
 #include "eqemu_config.h"
 #include "misc_functions.h"
 #include "strings.h"
-#include "eqemu_logsys.h"
-#include "json/json.hpp"
 
 #include <iostream>
 #include <sstream>
-#include <filesystem>
 
 std::string EQEmuConfig::ConfigFile = "eqemu_config.json";
 EQEmuConfig *EQEmuConfig::_config = nullptr;
@@ -114,12 +111,13 @@ void EQEmuConfig::parse_config()
 		DisableConfigChecks = true;
 	}
 
-
-
-	CheckUcsConfigConversion();
-
-	m_ucs_host = _root["server"]["ucs"].get("host", "eqchat.eqemulator.net").asString();
-	m_ucs_port = Strings::ToUnsignedInt(_root["server"]["ucs"].get("port", "7778").asString());
+	/**
+	 * UCS
+	 */
+	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
+	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
+	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
+	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());
 
 	/**
 	 * Database
@@ -248,16 +246,16 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 		return (WorldHTTPEnabled ? "true" : "false");
 	}
 	if (var_name == "ChatHost") {
-		return (m_ucs_host);
+		return (ChatHost);
 	}
 	if (var_name == "ChatPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(ChatPort));
 	}
 	if (var_name == "MailHost") {
-		return (m_ucs_host);
+		return (MailHost);
 	}
 	if (var_name == "MailPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(MailPort));
 	}
 	if (var_name == "DatabaseHost") {
 		return (DatabaseHost);
@@ -364,8 +362,10 @@ void EQEmuConfig::Dump() const
 	std::cout << "WorldHTTPPort = " << WorldHTTPPort << std::endl;
 	std::cout << "WorldHTTPMimeFile = " << WorldHTTPMimeFile << std::endl;
 	std::cout << "WorldHTTPEnabled = " << WorldHTTPEnabled << std::endl;
-	std::cout << "UCSHost = " << m_ucs_host << std::endl;
-	std::cout << "UCSPort = " << m_ucs_port << std::endl;
+	std::cout << "ChatHost = " << ChatHost << std::endl;
+	std::cout << "ChatPort = " << ChatPort << std::endl;
+	std::cout << "MailHost = " << MailHost << std::endl;
+	std::cout << "MailPort = " << MailPort << std::endl;
 	std::cout << "DatabaseHost = " << DatabaseHost << std::endl;
 	std::cout << "DatabaseUsername = " << DatabaseUsername << std::endl;
 	std::cout << "DatabasePassword = " << DatabasePassword << std::endl;
@@ -392,98 +392,3 @@ void EQEmuConfig::Dump() const
 	std::cout << "DefaultStatus = " << (int) DefaultStatus << std::endl;
 //	std::cout << "DynamicCount = " << DynamicCount << std::endl;
 }
-
-const std::string &EQEmuConfig::GetUCSHost() const
-{
-	return m_ucs_host;
-}
-
-uint16 EQEmuConfig::GetUCSPort() const
-{
-	return m_ucs_port;
-}
-
-void EQEmuConfig::CheckUcsConfigConversion()
-{
-	std::string chat_host = _root["server"]["chatserver"].get("host", "").asString();
-	uint32      chat_port = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "0").asString());
-	std::string mail_host = _root["server"]["mailserver"].get("host", "").asString();
-	uint32      mail_port = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "0").asString());
-	std::string ucs_host  = _root["server"]["ucs"].get("host", "").asString();
-
-	// automatic ucs legacy configuration migration
-	// if old configuration values are set, let's backup the existing configuration
-	// and migrate to to use the new fields and write the new config
-	if ((!chat_host.empty() || !mail_host.empty()) && ucs_host.empty()) {
-		LogInfo("Migrating old [eqemu_config] UCS configuration to new configuration");
-
-		std::string config_file_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.json"
-		}.string();
-
-		std::string config_file_bak_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
-		}.string();
-
-		// copy eqemu_config.json to eqemu_config.json.bak
-		std::ifstream src(config_file_path, std::ios::binary);
-		std::ofstream dst(config_file_bak_path, std::ios::binary);
-		dst << src.rdbuf();
-		src.close();
-
-		LogInfo("Old configuration backed up to [{}]", config_file_bak_path);
-
-		// read eqemu_config.json, transplant new fields and write to eqemu_config.json
-		Json::Value   root;
-		Json::Reader  reader;
-		std::ifstream file(config_file_path);
-		if (!reader.parse(file, root)) {
-			LogError("Failed to parse configuration file");
-			return;
-		}
-		file.close();
-
-		// get old fields
-		std::string host = !chat_host.empty() ? chat_host : mail_host;
-		if (host.empty()) {
-			host = "eqchat.eqemulator.net";
-		}
-		std::string port = chat_port > 0 ? std::to_string(chat_port) : std::to_string(mail_port);
-		if (port.empty()) {
-			port = "7778";
-		}
-
-		// set new fields
-		root["server"]["ucs"]["host"] = host;
-		root["server"]["ucs"]["port"] = port;
-
-		// unset old fields
-		root["server"].removeMember("chatserver");
-		root["server"].removeMember("mailserver");
-
-		// get Json::Value raw string
-		std::string config = root.toStyledString();
-
-		// format using more modern json library
-		nlohmann::json data = nlohmann::json::parse(config);
-
-		// write to file
-		std::ofstream o(config_file_path);
-		o << std::setw(1) << data << std::endl;
-		o.close();
-
-		// write new config
-		LogInfo("New configuration written to [{}]", config_file_path);
-		LogInfo("Migration complete, please review the new configuration file");
-
-		// reload config internally
-		try {
-			std::ifstream fconfig(config_file_path, std::ifstream::binary);
-			fconfig >> _config->_root;
-			_config->parse_config();
-		}
-		catch (std::exception &) {
-			return;
-		}
-	}
-}

common/eqemu_config.h

@@ -22,7 +22,7 @@
 #include "linked_list.h"
 #include "path_manager.h"
 #include <fstream>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 struct LoginConfig {
 	std::string LoginHost;
@@ -62,6 +62,14 @@ class EQEmuConfig
 		std::string SharedKey;
 		bool DisableConfigChecks;
 
+		// From <chatserver/>
+		std::string ChatHost;
+		uint16 ChatPort;
+
+		// From <mailserver/>
+		std::string MailHost;
+		uint16 MailPort;
+
 		// From <database/>
 		std::string DatabaseHost;
 		std::string DatabaseUsername;
@@ -114,18 +122,12 @@ class EQEmuConfig
 
 		bool auto_database_updates;
 
-		const std::string &GetUCSHost() const;
-		uint16 GetUCSPort() const;
-
 //	uint16 DynamicCount;
 
 //	map<string,uint16> StaticZones;
 
 	protected:
 
-		std::string m_ucs_host;
-		uint16      m_ucs_port;
-
 		static EQEmuConfig *_config;
 		Json::Value _root;
 		static std::string ConfigFile;
@@ -184,7 +186,6 @@ class EQEmuConfig
 		}
 
 		void Dump() const;
-		void CheckUcsConfigConversion();
 };
 
 #endif

common/eqemu_logsys.cpp

@@ -651,9 +651,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 	}
 
 	// Auto inject categories that don't exist in the database...
-
-	std::vector<LogsysCategoriesRepository::LogsysCategories> db_categories_to_add{};
-
 	for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) {
 
 		bool is_missing_in_database = std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end();
@@ -668,7 +665,11 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 		}
 
 		if (is_missing_in_database && !is_deprecated_category) {
-			LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i);
+			LogInfo(
+				"Automatically adding new log category [{}] ({})",
+				Logs::LogCategoryName[i],
+				i
+			);
 
 			auto new_category = LogsysCategoriesRepository::NewEntity();
 			new_category.log_category_id          = i;
@@ -677,14 +678,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
 			new_category.log_to_file              = log_settings[i].log_to_file;
 			new_category.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(new_category);
-		}
-	}
 
-	if (!db_categories_to_add.empty()) {
-		LogsysCategoriesRepository::ReplaceMany(*m_database, db_categories_to_add);
-		LoadLogDatabaseSettings();
-		return this;
+			LogsysCategoriesRepository::InsertOne(*m_database, new_category);
+		}
 	}
 
 	LogInfo("Loaded [{}] log categories", categories.size());

common/eqemu_logsys.h

@@ -33,9 +33,10 @@
 #endif
 #endif
 
-#include <fmt/format.h>
+#undef FMT_HEADER_ONLY
+#include <fmt/core.h>
 #include "types.h"
-
+ 
 namespace Logs {
 	enum DebugLevel {
 		General = 1,    // 1 - Low-Level general debugging, useful info on single line

common/errmsg.h

@@ -0,0 +1,59 @@
+/*	Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Library General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+	Library General Public License for more details.
+
+	You should have received a copy of the GNU Library General Public
+	License along with this library; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+	MA 02111-1307, USA */
+
+/*	Error messages for mysql clients */
+/*	error messages for the demon is in share/language/errmsg.sys */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+void	init_client_errs(void);
+extern const char *client_errors[];	/* Error messages */
+#ifdef	__cplusplus
+}
+#endif
+
+#define CR_MIN_ERROR		2000	/* For easier client code */
+#define CR_MAX_ERROR		2999
+#if defined(OS2) && defined( MYSQL_SERVER)
+#define CER(X) client_errors[(X)-CR_MIN_ERROR]
+#else
+#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#endif
+#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
+
+#define CR_UNKNOWN_ERROR	2000
+#define CR_SOCKET_CREATE_ERROR	2001
+#define CR_CONNECTION_ERROR	2002
+#define CR_CONN_HOST_ERROR	2003
+#define CR_IPSOCK_ERROR		2004
+#define CR_UNKNOWN_HOST		2005
+#define CR_SERVER_GONE_ERROR	2006
+#define CR_VERSION_ERROR	2007
+#define CR_OUT_OF_MEMORY	2008
+#define CR_WRONG_HOST_INFO	2009
+#define CR_LOCALHOST_CONNECTION 2010
+#define CR_TCP_CONNECTION	2011
+#define CR_SERVER_HANDSHAKE_ERR 2012
+#define CR_SERVER_LOST		2013
+#define CR_COMMANDS_OUT_OF_SYNC 2014
+#define CR_NAMEDPIPE_CONNECTION 2015
+#define CR_NAMEDPIPEWAIT_ERROR 2016
+#define CR_NAMEDPIPEOPEN_ERROR 2017
+#define CR_NAMEDPIPESETSTATE_ERROR 2018
+#define CR_CANT_READ_CHARSET	2019
+#define CR_NET_PACKET_TOO_LARGE 2020

common/events/player_event_discord_formatter.cpp

@@ -2,7 +2,7 @@
 #include "../repositories/character_data_repository.h"
 #include "../json/json_archive_single_line.h"
 #include <vector>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 

common/events/player_event_logs.cpp

@@ -37,8 +37,6 @@ void PlayerEventLogs::Init()
 		db.emplace_back(e.id);
 	}
 
-	std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings_to_insert{};
-
 	// insert entries that don't exist in database
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		bool is_in_database = std::find(db.begin(), db.end(), i) != db.end();
@@ -58,21 +56,21 @@ void PlayerEventLogs::Init()
 
 		bool is_missing_in_database = std::find(db.begin(), db.end(), i) == db.end();
 		if (is_missing_in_database && is_implemented && !is_deprecated) {
-			LogInfo("[New] PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
+			LogInfo(
+				"[New] PlayerEvent [{}] ({})",
+				PlayerEvent::EventName[i],
+				i
+			);
 
 			auto c = PlayerEventLogSettingsRepository::NewEntity();
 			c.id             = i;
 			c.event_name     = PlayerEvent::EventName[i];
 			c.event_enabled  = m_settings[i].event_enabled;
 			c.retention_days = m_settings[i].retention_days;
-			settings_to_insert.emplace_back(c);
+			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
 		}
 	}
 
-	if (!settings_to_insert.empty()) {
-		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
-	}
-
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();
 
@@ -613,7 +611,7 @@ void PlayerEventLogs::Process()
 
 void PlayerEventLogs::ProcessRetentionTruncation()
 {
-	LogPlayerEvents("Running truncation");
+	LogInfo("Running truncation");
 
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		if (m_settings[i].retention_days > 0) {

common/expedition_lockout_timer.cpp

@@ -22,6 +22,7 @@
 #include "../common/strings.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
+#include <fmt/core.h>
 #include <fmt/format.h>
 
 const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes

common/faction.cpp

@@ -96,12 +96,12 @@ bool IsOfEqualRace(int r1, int r2)
 	// TODO: add more values
 	switch (r1) {
 		case DARK_ELF:
-			if (r2 == Race::NeriakCitizen) {
+			if (r2 == RACE_NERIAK_CITIZEN_77) {
 				return true;
 			}
 			break;
 		case BARBARIAN:
-			if (r2 == Race::HalasCitizen) {
+			if (r2 == RACE_HALAS_CITIZEN_90) {
 				return true;
 			}
 	}

common/file.cpp

@@ -35,7 +35,7 @@
 
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <filesystem>
 #include <iostream>
 

common/inventory_profile.cpp

@@ -801,35 +801,34 @@ int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 // Returns slot_id when there's one available, else SLOT_INVALID
 int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
 {
-	const int16 last_bag_slot = (RuleI(World, ExpansionSettings) == -1 || RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) ? EQ::invslot::slotGeneral10 : EQ::invslot::slotGeneral8;
-
-	for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) { // Check basic inventory
-		if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+	// Check basic inventory
+	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+		if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 			continue;
-		}
 
-		if (!GetItem(i)) {
-			return i; // Found available slot in personal inventory
-		}
+		if (!GetItem(i))
+			// Found available slot in personal inventory
+			return i;
 	}
 
 	if (!for_bag) {
-		for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) {
-			if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+		for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+			if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 				continue;
-			}
 
-			const auto *inst = GetItem(i);
-			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size) {
-				if (inst->GetItem()->BagType == item::BagTypeQuiver &&
-					inst->GetItem()->ItemType != item::ItemTypeArrow) {
+			const ItemInstance* inst = GetItem(i);
+			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size)
+			{
+				if (inst->GetItem()->BagType == item::BagTypeQuiver && inst->GetItem()->ItemType != item::ItemTypeArrow)
+				{
 					continue;
 				}
 
-				const int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
+				int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
 
-				const uint8 slots = inst->GetItem()->BagSlots;
-				for (uint8 j = invbag::SLOT_BEGIN; j < slots; j++) {
+				uint8 slots = inst->GetItem()->BagSlots;
+				uint8 j;
+				for (j = invbag::SLOT_BEGIN; j<slots; j++) {
 					if (!GetItem(base_slot_id + j)) {
 						// Found available slot within bag
 						return (base_slot_id + j);

common/inventory_profile.h

@@ -132,7 +132,7 @@ namespace EQ
 
 		// Swap items in inventory
 		enum SwapItemFailState : int8 { swapInvalid = -1, swapPass = 0, swapNotAllowed, swapNullData, swapRaceClass, swapDeity, swapLevel };
-		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = Race::Doug, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
+		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = RACE_DOUG_0, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
 
 		// Remove item from inventory
 		bool DeleteItem(int16 slot_id, int16 quantity = 0);

common/ip_util.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <csignal>
 #include <vector>
 #include "ip_util.h"

common/item_instance.cpp

@@ -1273,7 +1273,7 @@ int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const
 
 int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
-	int race = Race::Doug;
+	int race = RACE_DOUG_0;
 	const auto item = GetItem();
 	if (item) {
 		race = item->BaneDmgRace;

common/languages.h

@@ -0,0 +1,54 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#ifndef LANGUAGES_H
+#define LANGUAGES_H
+#include "../common/types.h"
+
+#define LANG_COMMON_TONGUE	0
+#define LANG_BARBARIAN		1
+#define LANG_ERUDIAN		2
+#define LANG_ELVISH			3
+#define LANG_DARK_ELVISH	4
+#define LANG_DWARVISH		5
+#define LANG_TROLL			6
+#define LANG_OGRE			7
+#define LANG_GNOMISH		8
+#define LANG_HALFLING		9
+#define LANG_THIEVES_CANT	10
+#define LANG_OLD_ERUDIAN	11
+#define LANG_ELDER_ELVISH	12
+#define LANG_FROGLOK		13
+#define LANG_GOBLIN			14
+#define LANG_GNOLL			15
+#define LANG_COMBINE_TONGUE	16
+#define LANG_ELDER_TEIRDAL	17
+#define LANG_LIZARDMAN		18
+#define LANG_ORCISH			19
+#define LANG_FAERIE			20
+#define LANG_DRAGON			21
+#define LANG_ELDER_DRAGON	22
+#define LANG_DARK_SPEECH	23
+#define LANG_VAH_SHIR		24
+#define LANG_ALARAN			25
+#define LANG_HADAL			26
+#define LANG_UNKNOWN	27
+
+#define MAX_LANGUAGE_SKILL 100
+
+#endif
+

common/net/console_server.cpp

@@ -1,6 +1,6 @@
 #include "console_server.h"
 #include "../strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 {

common/net/console_server_connection.cpp

@@ -4,7 +4,7 @@
 #include "../eqemu_logsys.h"
 #include "../servertalk.h"
 #include "../rulesys.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
 {
@@ -21,7 +21,7 @@ EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent,
 	m_connection->OnDisconnect(std::bind(&ConsoleServerConnection::OnDisconnect, this, std::placeholders::_1));
 	m_connection->Start();
 	ClearBuffer();
-	
+
 	auto addr = m_connection->RemoteIP();
 
 	SendLine(fmt::format("Establishing connection from: {0}:{1}", addr, m_connection->RemotePort()));
@@ -85,12 +85,12 @@ void EQ::Net::ConsoleServerConnection::QueueMessage(const std::string &msg)
 	}
 	else {
 		std::string cmd(m_line, m_line + m_cursor);
-		
+
 		size_t len = m_user.length() + 2 + cmd.length();
 		for (size_t i = 0; i < len; ++i) {
 			Send("\x08");
 		}
-		
+
 		if (msg.length() < cmd.length()) {
 			Send(msg);
 			size_t blank_spaces = 2 + cmd.length() - msg.length();

common/net/daybreak_connection.cpp

@@ -5,7 +5,7 @@
 #include "crc32.h"
 #include "../eqemu_logsys.h"
 #include <zlib.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <sstream>
 
 EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager()

common/net/packet.cpp

@@ -1,7 +1,7 @@
 #include "packet.h"
 #include "endian.h"
 #include <cctype>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
 {

common/net/websocket_server.cpp

@@ -1,7 +1,7 @@
 #include "websocket_server.h"
 #include "../event/event_loop.h"
 #include "../event/timer.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <map>
 #include <unordered_set>
 #include <array>
@@ -50,7 +50,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 		if (iter != _impl->connections.end()) {
 			iter->second->GetTCPConnection()->Write(data, size);
 		}
-		
+
 		return websocketpp::lib::error_code();
 	});
 
@@ -76,7 +76,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 	_impl->login_handler = [](const WebsocketServerConnection* connection, const std::string& user, const std::string& pass) {
 		WebsocketLoginStatus ret;
 		ret.account_name = "admin";
-		
+
 		if (connection->RemoteIP() == "127.0.0.1" || connection->RemoteIP() == "::") {
 			ret.logged_in = true;
 			return ret;
@@ -125,8 +125,8 @@ Json::Value EQ::Net::WebsocketServer::HandleRequest(WebsocketServerConnection *c
 void EQ::Net::WebsocketServer::SetMethodHandler(const std::string &method, MethodHandler handler, int required_status)
 {
 	//Reserved method names
-	if (method == "subscribe" || 
-		method == "unsubscribe" || 
+	if (method == "subscribe" ||
+		method == "unsubscribe" ||
 		method == "login") {
 		return;
 	}
@@ -171,7 +171,7 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio
 
 		auto user = params[0].asString();
 		auto pass = params[1].asString();
-		
+
 		auto r = _impl->login_handler(connection, user, pass);
 
 		if (r.logged_in) {

common/net/websocket_server_connection.cpp

@@ -3,7 +3,7 @@
 #include "../timer.h"
 #include "../util/uuid.h"
 #include <sstream>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 struct EQ::Net::WebsocketServerConnection::Impl {
 	WebsocketServer *parent;
@@ -16,7 +16,7 @@ struct EQ::Net::WebsocketServerConnection::Impl {
 	int status;
 };
 
-EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *parent, 
+EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *parent,
 	std::shared_ptr<TCPConnection> connection,
 	std::shared_ptr<websocket_connection> ws_connection)
 {
@@ -34,7 +34,7 @@ EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *p
 	connection->OnDisconnect([this](EQ::Net::TCPConnection *connection) {
 		_impl->parent->ReleaseConnection(this);
 	});
-	
+
 	connection->OnRead([this](EQ::Net::TCPConnection *c, const unsigned char *buffer, size_t buffer_size) {
 		_impl->ws_connection->read_all((const char*)buffer, buffer_size);
 	});

common/patches/rof.cpp

@@ -202,7 +202,7 @@ namespace RoF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);
 
-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;
 
 			auto outapp = new EQApplicationPacket(
@@ -2621,7 +2621,7 @@ namespace RoF
 		general->parameter = RaidCommandAcceptInvite;
 		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
 		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
+		
 		dest->FastQueuePacket(&outapp);
 
 		safe_delete(inapp);
@@ -3165,7 +3165,7 @@ namespace RoF
 
 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
 
-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -3868,8 +3868,8 @@ namespace RoF
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -4002,8 +4002,8 @@ namespace RoF
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown18
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown19
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)

common/patches/rof2.cpp

@@ -274,7 +274,7 @@ namespace RoF2
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);
 
-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;
 
 			auto outapp = new EQApplicationPacket(
@@ -3218,7 +3218,7 @@ namespace RoF2
 
 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
 
-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -4007,8 +4007,8 @@ namespace RoF2
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -4212,8 +4212,8 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)

common/patches/sod.cpp

@@ -2507,8 +2507,8 @@ namespace SoD
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2706,8 +2706,8 @@ namespace SoD
 
 			Buffer += sizeof(structs::Spawn_Struct_Position);
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -2733,8 +2733,8 @@ namespace SoD
 			}
 
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;

common/patches/uf.cpp

@@ -195,7 +195,7 @@ namespace UF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);
 
-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;
 
 			auto outapp = new EQApplicationPacket(
@@ -2339,7 +2339,7 @@ namespace UF
 
 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
 
-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -2779,8 +2779,8 @@ namespace UF
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2982,8 +2982,8 @@ namespace UF
 
 			Buffer += sizeof(structs::Spawn_Struct_Position);
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -3018,8 +3018,8 @@ namespace UF
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);
 			}
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;

common/pch/pch.h

@@ -27,8 +27,3 @@
 
 // fmt
 #include <fmt/format.h>
-
-// lua
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-#include <luabind/object.hpp>

common/profanity_manager.h

@@ -1,17 +1,17 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2019 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation; version 2 of the License.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY except by those people which sell it, which
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <list>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 
 class DBcore;
@@ -37,7 +37,7 @@ namespace EQ
 
 		static bool AddProfanity(DBcore *db, std::string profanity);
 		static bool RemoveProfanity(DBcore *db, std::string profanity);
-		
+
 		static void RedactMessage(char *message);
 		static void RedactMessage(std::string &message);
 
@@ -54,7 +54,7 @@ namespace EQ
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
 		static bool check_for_existing_entry(const std::string& profanity);
-		
+
 	};
 
 } /*EQEmu*/

common/ptimer.h

@@ -44,10 +44,9 @@ enum : int {	//values for pTimerType
 	pTimerBeggingPickPocket = 27,
 	pTimerLinkedSpellReuseStart = 28,
 	pTimerLinkedSpellReuseEnd = 48,
-	pTimerClearXTarget = 50,
-
-	pTimerShieldAbility = 86,
 
+	pTimerShieldAbility = 86,	
+	
 	pTimerLayHands = 87,		//these IDs are used by client too
 	pTimerHarmTouch = 89,		//so dont change them
 

common/repositories/base/base_account_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_ACCOUNT_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseAccountRepository {
 public:
 	struct Account {
@@ -197,9 +196,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				account_id
 			)
 		);
@@ -549,108 +547,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const Account &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back("'" + Strings::Escape(e.charname) + "'");
-		v.push_back(std::to_string(e.sharedplat));
-		v.push_back("'" + Strings::Escape(e.password) + "'");
-		v.push_back(std::to_string(e.status));
-		v.push_back("'" + Strings::Escape(e.ls_id) + "'");
-		v.push_back(std::to_string(e.lsaccount_id));
-		v.push_back(std::to_string(e.gmspeed));
-		v.push_back(std::to_string(e.invulnerable));
-		v.push_back(std::to_string(e.flymode));
-		v.push_back(std::to_string(e.ignore_tells));
-		v.push_back(std::to_string(e.revoked));
-		v.push_back(std::to_string(e.karma));
-		v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
-		v.push_back(std::to_string(e.hideme));
-		v.push_back(std::to_string(e.rulesflag));
-		v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
-		v.push_back(std::to_string(e.time_creation));
-		v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
-		v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
-		v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
-		v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
-		v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<Account> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back("'" + Strings::Escape(e.charname) + "'");
-			v.push_back(std::to_string(e.sharedplat));
-			v.push_back("'" + Strings::Escape(e.password) + "'");
-			v.push_back(std::to_string(e.status));
-			v.push_back("'" + Strings::Escape(e.ls_id) + "'");
-			v.push_back(std::to_string(e.lsaccount_id));
-			v.push_back(std::to_string(e.gmspeed));
-			v.push_back(std::to_string(e.invulnerable));
-			v.push_back(std::to_string(e.flymode));
-			v.push_back(std::to_string(e.ignore_tells));
-			v.push_back(std::to_string(e.revoked));
-			v.push_back(std::to_string(e.karma));
-			v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
-			v.push_back(std::to_string(e.hideme));
-			v.push_back(std::to_string(e.rulesflag));
-			v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
-			v.push_back(std::to_string(e.time_creation));
-			v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
-			v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
-			v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
-			v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
-			v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_ACCOUNT_REPOSITORY_H

common/repositories/base/base_bot_timers_repository.h

@@ -16,19 +16,12 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseBotTimersRepository {
 public:
 	struct BotTimers {
 		uint32_t bot_id;
 		uint32_t timer_id;
 		uint32_t timer_value;
-		uint32_t recast_time;
-		uint8_t  is_spell;
-		uint8_t  is_disc;
-		uint32_t spell_id;
-		uint8_t  is_item;
-		uint32_t item_id;
 	};
 
 	static std::string PrimaryKey()
@@ -42,12 +35,6 @@ public:
 			"bot_id",
 			"timer_id",
 			"timer_value",
-			"recast_time",
-			"is_spell",
-			"is_disc",
-			"spell_id",
-			"is_item",
-			"item_id",
 		};
 	}
 
@@ -57,12 +44,6 @@ public:
 			"bot_id",
 			"timer_id",
 			"timer_value",
-			"recast_time",
-			"is_spell",
-			"is_disc",
-			"spell_id",
-			"is_item",
-			"item_id",
 		};
 	}
 
@@ -106,12 +87,6 @@ public:
 		e.bot_id      = 0;
 		e.timer_id    = 0;
 		e.timer_value = 0;
-		e.recast_time = 0;
-		e.is_spell    = 0;
-		e.is_disc     = 0;
-		e.spell_id    = 0;
-		e.is_item     = 0;
-		e.item_id     = 0;
 
 		return e;
 	}
@@ -137,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				bot_timers_id
 			)
 		);
@@ -151,12 +125,6 @@ public:
 			e.bot_id      = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
 			e.timer_id    = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 			e.timer_value = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.recast_time = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.is_spell    = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.is_disc     = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.spell_id    = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.is_item     = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.item_id     = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
 			return e;
 		}
@@ -193,12 +161,6 @@ public:
 		v.push_back(columns[0] + " = " + std::to_string(e.bot_id));
 		v.push_back(columns[1] + " = " + std::to_string(e.timer_id));
 		v.push_back(columns[2] + " = " + std::to_string(e.timer_value));
-		v.push_back(columns[3] + " = " + std::to_string(e.recast_time));
-		v.push_back(columns[4] + " = " + std::to_string(e.is_spell));
-		v.push_back(columns[5] + " = " + std::to_string(e.is_disc));
-		v.push_back(columns[6] + " = " + std::to_string(e.spell_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.is_item));
-		v.push_back(columns[8] + " = " + std::to_string(e.item_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -223,12 +185,6 @@ public:
 		v.push_back(std::to_string(e.bot_id));
 		v.push_back(std::to_string(e.timer_id));
 		v.push_back(std::to_string(e.timer_value));
-		v.push_back(std::to_string(e.recast_time));
-		v.push_back(std::to_string(e.is_spell));
-		v.push_back(std::to_string(e.is_disc));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.is_item));
-		v.push_back(std::to_string(e.item_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -261,12 +217,6 @@ public:
 			v.push_back(std::to_string(e.bot_id));
 			v.push_back(std::to_string(e.timer_id));
 			v.push_back(std::to_string(e.timer_value));
-			v.push_back(std::to_string(e.recast_time));
-			v.push_back(std::to_string(e.is_spell));
-			v.push_back(std::to_string(e.is_disc));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.is_item));
-			v.push_back(std::to_string(e.item_id));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -303,12 +253,6 @@ public:
 			e.bot_id      = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
 			e.timer_id    = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 			e.timer_value = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.recast_time = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.is_spell    = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.is_disc     = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.spell_id    = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.is_item     = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.item_id     = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
 			all_entries.push_back(e);
 		}
@@ -336,12 +280,6 @@ public:
 			e.bot_id      = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
 			e.timer_id    = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 			e.timer_value = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.recast_time = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.is_spell    = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.is_disc     = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.spell_id    = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.is_item     = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.item_id     = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
 			all_entries.push_back(e);
 		}

common/repositories/base/base_character_alt_currency_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_ALT_CURRENCY_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterAltCurrencyRepository {
 public:
 	struct CharacterAltCurrency {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_alt_currency_id
 			)
 		);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterAltCurrency &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.currency_id));
-		v.push_back(std::to_string(e.amount));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterAltCurrency> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.currency_id));
-			v.push_back(std::to_string(e.amount));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_ALT_CURRENCY_REPOSITORY_H

common/repositories/base/base_character_alternate_abilities_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_ALTERNATE_ABILITIES_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterAlternateAbilitiesRepository {
 public:
 	struct CharacterAlternateAbilities {
@@ -117,9 +116,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_alternate_abilities_id
 			)
 		);
@@ -350,68 +348,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterAlternateAbilities &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.aa_id));
-		v.push_back(std::to_string(e.aa_value));
-		v.push_back(std::to_string(e.charges));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterAlternateAbilities> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.aa_id));
-			v.push_back(std::to_string(e.aa_value));
-			v.push_back(std::to_string(e.charges));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_ALTERNATE_ABILITIES_REPOSITORY_H

common/repositories/base/base_character_auras_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_AURAS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterAurasRepository {
 public:
 	struct CharacterAuras {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_auras_id
 			)
 		);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterAuras &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.spell_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterAuras> &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.slot));
-			v.push_back(std::to_string(e.spell_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_AURAS_REPOSITORY_H

common/repositories/base/base_character_bandolier_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_BANDOLIER_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterBandolierRepository {
 public:
 	struct CharacterBandolier {
@@ -125,9 +124,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_bandolier_id
 			)
 		);
@@ -370,72 +368,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterBandolier &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.bandolier_id));
-		v.push_back(std::to_string(e.bandolier_slot));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.icon));
-		v.push_back("'" + Strings::Escape(e.bandolier_name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterBandolier> &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.bandolier_id));
-			v.push_back(std::to_string(e.bandolier_slot));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.icon));
-			v.push_back("'" + Strings::Escape(e.bandolier_name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_BANDOLIER_REPOSITORY_H

common/repositories/base/base_character_bind_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_BIND_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterBindRepository {
 public:
 	struct CharacterBind {
@@ -133,9 +132,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_bind_id
 			)
 		);
@@ -389,76 +387,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterBind &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.instance_id));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-		v.push_back(std::to_string(e.heading));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterBind> &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.slot));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.instance_id));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-			v.push_back(std::to_string(e.heading));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_BIND_REPOSITORY_H

common/repositories/base/base_character_buffs_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_BUFFS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterBuffsRepository {
 public:
 	struct CharacterBuffs {
@@ -169,9 +168,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_buffs_id
 			)
 		);
@@ -480,94 +478,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterBuffs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.slot_id));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.caster_level));
-		v.push_back("'" + Strings::Escape(e.caster_name) + "'");
-		v.push_back(std::to_string(e.ticsremaining));
-		v.push_back(std::to_string(e.counters));
-		v.push_back(std::to_string(e.numhits));
-		v.push_back(std::to_string(e.melee_rune));
-		v.push_back(std::to_string(e.magic_rune));
-		v.push_back(std::to_string(e.persistent));
-		v.push_back(std::to_string(e.dot_rune));
-		v.push_back(std::to_string(e.caston_x));
-		v.push_back(std::to_string(e.caston_y));
-		v.push_back(std::to_string(e.caston_z));
-		v.push_back(std::to_string(e.ExtraDIChance));
-		v.push_back(std::to_string(e.instrument_mod));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterBuffs> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.slot_id));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.caster_level));
-			v.push_back("'" + Strings::Escape(e.caster_name) + "'");
-			v.push_back(std::to_string(e.ticsremaining));
-			v.push_back(std::to_string(e.counters));
-			v.push_back(std::to_string(e.numhits));
-			v.push_back(std::to_string(e.melee_rune));
-			v.push_back(std::to_string(e.magic_rune));
-			v.push_back(std::to_string(e.persistent));
-			v.push_back(std::to_string(e.dot_rune));
-			v.push_back(std::to_string(e.caston_x));
-			v.push_back(std::to_string(e.caston_y));
-			v.push_back(std::to_string(e.caston_z));
-			v.push_back(std::to_string(e.ExtraDIChance));
-			v.push_back(std::to_string(e.instrument_mod));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_BUFFS_REPOSITORY_H

common/repositories/base/base_character_currency_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_CURRENCY_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterCurrencyRepository {
 public:
 	struct CharacterCurrency {
@@ -169,9 +168,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_currency_id
 			)
 		);
@@ -480,94 +478,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterCurrency &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.platinum));
-		v.push_back(std::to_string(e.gold));
-		v.push_back(std::to_string(e.silver));
-		v.push_back(std::to_string(e.copper));
-		v.push_back(std::to_string(e.platinum_bank));
-		v.push_back(std::to_string(e.gold_bank));
-		v.push_back(std::to_string(e.silver_bank));
-		v.push_back(std::to_string(e.copper_bank));
-		v.push_back(std::to_string(e.platinum_cursor));
-		v.push_back(std::to_string(e.gold_cursor));
-		v.push_back(std::to_string(e.silver_cursor));
-		v.push_back(std::to_string(e.copper_cursor));
-		v.push_back(std::to_string(e.radiant_crystals));
-		v.push_back(std::to_string(e.career_radiant_crystals));
-		v.push_back(std::to_string(e.ebon_crystals));
-		v.push_back(std::to_string(e.career_ebon_crystals));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterCurrency> &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.platinum));
-			v.push_back(std::to_string(e.gold));
-			v.push_back(std::to_string(e.silver));
-			v.push_back(std::to_string(e.copper));
-			v.push_back(std::to_string(e.platinum_bank));
-			v.push_back(std::to_string(e.gold_bank));
-			v.push_back(std::to_string(e.silver_bank));
-			v.push_back(std::to_string(e.copper_bank));
-			v.push_back(std::to_string(e.platinum_cursor));
-			v.push_back(std::to_string(e.gold_cursor));
-			v.push_back(std::to_string(e.silver_cursor));
-			v.push_back(std::to_string(e.copper_cursor));
-			v.push_back(std::to_string(e.radiant_crystals));
-			v.push_back(std::to_string(e.career_radiant_crystals));
-			v.push_back(std::to_string(e.ebon_crystals));
-			v.push_back(std::to_string(e.career_ebon_crystals));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_CURRENCY_REPOSITORY_H

common/repositories/base/base_character_data_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_DATA_REPOSITORY_H
@@ -1339,266 +1339,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterData &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.account_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back("'" + Strings::Escape(e.last_name) + "'");
-		v.push_back("'" + Strings::Escape(e.title) + "'");
-		v.push_back("'" + Strings::Escape(e.suffix) + "'");
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.zone_instance));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.z));
-		v.push_back(std::to_string(e.heading));
-		v.push_back(std::to_string(e.gender));
-		v.push_back(std::to_string(e.race));
-		v.push_back(std::to_string(e.class_));
-		v.push_back(std::to_string(e.level));
-		v.push_back(std::to_string(e.deity));
-		v.push_back(std::to_string(e.birthday));
-		v.push_back(std::to_string(e.last_login));
-		v.push_back(std::to_string(e.time_played));
-		v.push_back(std::to_string(e.level2));
-		v.push_back(std::to_string(e.anon));
-		v.push_back(std::to_string(e.gm));
-		v.push_back(std::to_string(e.face));
-		v.push_back(std::to_string(e.hair_color));
-		v.push_back(std::to_string(e.hair_style));
-		v.push_back(std::to_string(e.beard));
-		v.push_back(std::to_string(e.beard_color));
-		v.push_back(std::to_string(e.eye_color_1));
-		v.push_back(std::to_string(e.eye_color_2));
-		v.push_back(std::to_string(e.drakkin_heritage));
-		v.push_back(std::to_string(e.drakkin_tattoo));
-		v.push_back(std::to_string(e.drakkin_details));
-		v.push_back(std::to_string(e.ability_time_seconds));
-		v.push_back(std::to_string(e.ability_number));
-		v.push_back(std::to_string(e.ability_time_minutes));
-		v.push_back(std::to_string(e.ability_time_hours));
-		v.push_back(std::to_string(e.exp));
-		v.push_back(std::to_string(e.exp_enabled));
-		v.push_back(std::to_string(e.aa_points_spent));
-		v.push_back(std::to_string(e.aa_exp));
-		v.push_back(std::to_string(e.aa_points));
-		v.push_back(std::to_string(e.group_leadership_exp));
-		v.push_back(std::to_string(e.raid_leadership_exp));
-		v.push_back(std::to_string(e.group_leadership_points));
-		v.push_back(std::to_string(e.raid_leadership_points));
-		v.push_back(std::to_string(e.points));
-		v.push_back(std::to_string(e.cur_hp));
-		v.push_back(std::to_string(e.mana));
-		v.push_back(std::to_string(e.endurance));
-		v.push_back(std::to_string(e.intoxication));
-		v.push_back(std::to_string(e.str));
-		v.push_back(std::to_string(e.sta));
-		v.push_back(std::to_string(e.cha));
-		v.push_back(std::to_string(e.dex));
-		v.push_back(std::to_string(e.int_));
-		v.push_back(std::to_string(e.agi));
-		v.push_back(std::to_string(e.wis));
-		v.push_back(std::to_string(e.zone_change_count));
-		v.push_back(std::to_string(e.toxicity));
-		v.push_back(std::to_string(e.hunger_level));
-		v.push_back(std::to_string(e.thirst_level));
-		v.push_back(std::to_string(e.ability_up));
-		v.push_back(std::to_string(e.ldon_points_guk));
-		v.push_back(std::to_string(e.ldon_points_mir));
-		v.push_back(std::to_string(e.ldon_points_mmc));
-		v.push_back(std::to_string(e.ldon_points_ruj));
-		v.push_back(std::to_string(e.ldon_points_tak));
-		v.push_back(std::to_string(e.ldon_points_available));
-		v.push_back(std::to_string(e.tribute_time_remaining));
-		v.push_back(std::to_string(e.career_tribute_points));
-		v.push_back(std::to_string(e.tribute_points));
-		v.push_back(std::to_string(e.tribute_active));
-		v.push_back(std::to_string(e.pvp_status));
-		v.push_back(std::to_string(e.pvp_kills));
-		v.push_back(std::to_string(e.pvp_deaths));
-		v.push_back(std::to_string(e.pvp_current_points));
-		v.push_back(std::to_string(e.pvp_career_points));
-		v.push_back(std::to_string(e.pvp_best_kill_streak));
-		v.push_back(std::to_string(e.pvp_worst_death_streak));
-		v.push_back(std::to_string(e.pvp_current_kill_streak));
-		v.push_back(std::to_string(e.pvp2));
-		v.push_back(std::to_string(e.pvp_type));
-		v.push_back(std::to_string(e.show_helm));
-		v.push_back(std::to_string(e.group_auto_consent));
-		v.push_back(std::to_string(e.raid_auto_consent));
-		v.push_back(std::to_string(e.guild_auto_consent));
-		v.push_back(std::to_string(e.leadership_exp_on));
-		v.push_back(std::to_string(e.RestTimer));
-		v.push_back(std::to_string(e.air_remaining));
-		v.push_back(std::to_string(e.autosplit_enabled));
-		v.push_back(std::to_string(e.lfp));
-		v.push_back(std::to_string(e.lfg));
-		v.push_back("'" + Strings::Escape(e.mailkey) + "'");
-		v.push_back(std::to_string(e.xtargets));
-		v.push_back(std::to_string(e.firstlogon));
-		v.push_back(std::to_string(e.e_aa_effects));
-		v.push_back(std::to_string(e.e_percent_to_aa));
-		v.push_back(std::to_string(e.e_expended_aa_spent));
-		v.push_back(std::to_string(e.aa_points_spent_old));
-		v.push_back(std::to_string(e.aa_points_old));
-		v.push_back(std::to_string(e.e_last_invsnapshot));
-		v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterData> &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.account_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back("'" + Strings::Escape(e.last_name) + "'");
-			v.push_back("'" + Strings::Escape(e.title) + "'");
-			v.push_back("'" + Strings::Escape(e.suffix) + "'");
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.zone_instance));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.z));
-			v.push_back(std::to_string(e.heading));
-			v.push_back(std::to_string(e.gender));
-			v.push_back(std::to_string(e.race));
-			v.push_back(std::to_string(e.class_));
-			v.push_back(std::to_string(e.level));
-			v.push_back(std::to_string(e.deity));
-			v.push_back(std::to_string(e.birthday));
-			v.push_back(std::to_string(e.last_login));
-			v.push_back(std::to_string(e.time_played));
-			v.push_back(std::to_string(e.level2));
-			v.push_back(std::to_string(e.anon));
-			v.push_back(std::to_string(e.gm));
-			v.push_back(std::to_string(e.face));
-			v.push_back(std::to_string(e.hair_color));
-			v.push_back(std::to_string(e.hair_style));
-			v.push_back(std::to_string(e.beard));
-			v.push_back(std::to_string(e.beard_color));
-			v.push_back(std::to_string(e.eye_color_1));
-			v.push_back(std::to_string(e.eye_color_2));
-			v.push_back(std::to_string(e.drakkin_heritage));
-			v.push_back(std::to_string(e.drakkin_tattoo));
-			v.push_back(std::to_string(e.drakkin_details));
-			v.push_back(std::to_string(e.ability_time_seconds));
-			v.push_back(std::to_string(e.ability_number));
-			v.push_back(std::to_string(e.ability_time_minutes));
-			v.push_back(std::to_string(e.ability_time_hours));
-			v.push_back(std::to_string(e.exp));
-			v.push_back(std::to_string(e.exp_enabled));
-			v.push_back(std::to_string(e.aa_points_spent));
-			v.push_back(std::to_string(e.aa_exp));
-			v.push_back(std::to_string(e.aa_points));
-			v.push_back(std::to_string(e.group_leadership_exp));
-			v.push_back(std::to_string(e.raid_leadership_exp));
-			v.push_back(std::to_string(e.group_leadership_points));
-			v.push_back(std::to_string(e.raid_leadership_points));
-			v.push_back(std::to_string(e.points));
-			v.push_back(std::to_string(e.cur_hp));
-			v.push_back(std::to_string(e.mana));
-			v.push_back(std::to_string(e.endurance));
-			v.push_back(std::to_string(e.intoxication));
-			v.push_back(std::to_string(e.str));
-			v.push_back(std::to_string(e.sta));
-			v.push_back(std::to_string(e.cha));
-			v.push_back(std::to_string(e.dex));
-			v.push_back(std::to_string(e.int_));
-			v.push_back(std::to_string(e.agi));
-			v.push_back(std::to_string(e.wis));
-			v.push_back(std::to_string(e.zone_change_count));
-			v.push_back(std::to_string(e.toxicity));
-			v.push_back(std::to_string(e.hunger_level));
-			v.push_back(std::to_string(e.thirst_level));
-			v.push_back(std::to_string(e.ability_up));
-			v.push_back(std::to_string(e.ldon_points_guk));
-			v.push_back(std::to_string(e.ldon_points_mir));
-			v.push_back(std::to_string(e.ldon_points_mmc));
-			v.push_back(std::to_string(e.ldon_points_ruj));
-			v.push_back(std::to_string(e.ldon_points_tak));
-			v.push_back(std::to_string(e.ldon_points_available));
-			v.push_back(std::to_string(e.tribute_time_remaining));
-			v.push_back(std::to_string(e.career_tribute_points));
-			v.push_back(std::to_string(e.tribute_points));
-			v.push_back(std::to_string(e.tribute_active));
-			v.push_back(std::to_string(e.pvp_status));
-			v.push_back(std::to_string(e.pvp_kills));
-			v.push_back(std::to_string(e.pvp_deaths));
-			v.push_back(std::to_string(e.pvp_current_points));
-			v.push_back(std::to_string(e.pvp_career_points));
-			v.push_back(std::to_string(e.pvp_best_kill_streak));
-			v.push_back(std::to_string(e.pvp_worst_death_streak));
-			v.push_back(std::to_string(e.pvp_current_kill_streak));
-			v.push_back(std::to_string(e.pvp2));
-			v.push_back(std::to_string(e.pvp_type));
-			v.push_back(std::to_string(e.show_helm));
-			v.push_back(std::to_string(e.group_auto_consent));
-			v.push_back(std::to_string(e.raid_auto_consent));
-			v.push_back(std::to_string(e.guild_auto_consent));
-			v.push_back(std::to_string(e.leadership_exp_on));
-			v.push_back(std::to_string(e.RestTimer));
-			v.push_back(std::to_string(e.air_remaining));
-			v.push_back(std::to_string(e.autosplit_enabled));
-			v.push_back(std::to_string(e.lfp));
-			v.push_back(std::to_string(e.lfg));
-			v.push_back("'" + Strings::Escape(e.mailkey) + "'");
-			v.push_back(std::to_string(e.xtargets));
-			v.push_back(std::to_string(e.firstlogon));
-			v.push_back(std::to_string(e.e_aa_effects));
-			v.push_back(std::to_string(e.e_percent_to_aa));
-			v.push_back(std::to_string(e.e_expended_aa_spent));
-			v.push_back(std::to_string(e.aa_points_spent_old));
-			v.push_back(std::to_string(e.aa_points_old));
-			v.push_back(std::to_string(e.e_last_invsnapshot));
-			v.push_back("FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_DATA_REPOSITORY_H

common/repositories/base/base_character_disciplines_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_DISCIPLINES_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterDisciplinesRepository {
 public:
 	struct CharacterDisciplines {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_disciplines_id
 			)
 		);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterDisciplines &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot_id));
-		v.push_back(std::to_string(e.disc_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterDisciplines> &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.slot_id));
-			v.push_back(std::to_string(e.disc_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_DISCIPLINES_REPOSITORY_H

common/repositories/base/base_character_expedition_lockouts_repository.h

@@ -15,6 +15,7 @@
 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>
+#include <fmt/format.h>
 
 class BaseCharacterExpeditionLockoutsRepository {
 public:

common/repositories/base/base_character_item_recast_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_ITEM_RECAST_REPOSITORY_H
@@ -16,12 +16,11 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterItemRecastRepository {
 public:
 	struct CharacterItemRecast {
 		uint32_t id;
-		uint32_t recast_type;
+		uint16_t recast_type;
 		uint32_t timestamp;
 	};
 
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_item_recast_id
 			)
 		);
@@ -125,7 +123,7 @@ public:
 			CharacterItemRecast e{};
 
 			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.recast_type = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.recast_type = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
 			e.timestamp   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
 			return e;
@@ -253,7 +251,7 @@ public:
 			CharacterItemRecast e{};
 
 			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.recast_type = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.recast_type = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
 			e.timestamp   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
 			all_entries.push_back(e);
@@ -280,7 +278,7 @@ public:
 			CharacterItemRecast e{};
 
 			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.recast_type = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.recast_type = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
 			e.timestamp   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
 			all_entries.push_back(e);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterItemRecast &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.recast_type));
-		v.push_back(std::to_string(e.timestamp));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterItemRecast> &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.recast_type));
-			v.push_back(std::to_string(e.timestamp));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_ITEM_RECAST_REPOSITORY_H

common/repositories/base/base_character_leadership_abilities_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_LEADERSHIP_ABILITIES_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterLeadershipAbilitiesRepository {
 public:
 	struct CharacterLeadershipAbilities {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_leadership_abilities_id
 			)
 		);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterLeadershipAbilities &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.rank));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterLeadershipAbilities> &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.slot));
-			v.push_back(std::to_string(e.rank));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_LEADERSHIP_ABILITIES_REPOSITORY_H

common/repositories/base/base_character_material_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_MATERIAL_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterMaterialRepository {
 public:
 	struct CharacterMaterial {
@@ -129,9 +128,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_material_id
 			)
 		);
@@ -379,74 +377,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterMaterial &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.blue));
-		v.push_back(std::to_string(e.green));
-		v.push_back(std::to_string(e.red));
-		v.push_back(std::to_string(e.use_tint));
-		v.push_back(std::to_string(e.color));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterMaterial> &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.slot));
-			v.push_back(std::to_string(e.blue));
-			v.push_back(std::to_string(e.green));
-			v.push_back(std::to_string(e.red));
-			v.push_back(std::to_string(e.use_tint));
-			v.push_back(std::to_string(e.color));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_MATERIAL_REPOSITORY_H

common/repositories/base/base_character_memmed_spells_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_MEMMED_SPELLS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterMemmedSpellsRepository {
 public:
 	struct CharacterMemmedSpells {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_memmed_spells_id
 			)
 		);
@@ -340,66 +338,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterMemmedSpells &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot_id));
-		v.push_back(std::to_string(e.spell_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterMemmedSpells> &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.slot_id));
-			v.push_back(std::to_string(e.spell_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_MEMMED_SPELLS_REPOSITORY_H

common/repositories/base/base_character_pet_buffs_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_PET_BUFFS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterPetBuffsRepository {
 public:
 	struct CharacterPetBuffs {
@@ -145,9 +144,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_pet_buffs_id
 			)
 		);
@@ -420,82 +418,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterPetBuffs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.pet));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.caster_level));
-		v.push_back("'" + Strings::Escape(e.castername) + "'");
-		v.push_back(std::to_string(e.ticsremaining));
-		v.push_back(std::to_string(e.counters));
-		v.push_back(std::to_string(e.numhits));
-		v.push_back(std::to_string(e.rune));
-		v.push_back(std::to_string(e.instrument_mod));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterPetBuffs> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.pet));
-			v.push_back(std::to_string(e.slot));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.caster_level));
-			v.push_back("'" + Strings::Escape(e.castername) + "'");
-			v.push_back(std::to_string(e.ticsremaining));
-			v.push_back(std::to_string(e.counters));
-			v.push_back(std::to_string(e.numhits));
-			v.push_back(std::to_string(e.rune));
-			v.push_back(std::to_string(e.instrument_mod));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_PET_BUFFS_REPOSITORY_H

common/repositories/base/base_character_pet_info_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_PET_INFO_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterPetInfoRepository {
 public:
 	struct CharacterPetInfo {
@@ -137,9 +136,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_pet_info_id
 			)
 		);
@@ -400,78 +398,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterPetInfo &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.pet));
-		v.push_back("'" + Strings::Escape(e.petname) + "'");
-		v.push_back(std::to_string(e.petpower));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.hp));
-		v.push_back(std::to_string(e.mana));
-		v.push_back(std::to_string(e.size));
-		v.push_back(std::to_string(e.taunting));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterPetInfo> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.pet));
-			v.push_back("'" + Strings::Escape(e.petname) + "'");
-			v.push_back(std::to_string(e.petpower));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.hp));
-			v.push_back(std::to_string(e.mana));
-			v.push_back(std::to_string(e.size));
-			v.push_back(std::to_string(e.taunting));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_PET_INFO_REPOSITORY_H

common/repositories/base/base_character_pet_inventory_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_PET_INVENTORY_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterPetInventoryRepository {
 public:
 	struct CharacterPetInventory {
@@ -117,9 +116,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_pet_inventory_id
 			)
 		);
@@ -350,68 +348,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterPetInventory &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.char_id));
-		v.push_back(std::to_string(e.pet));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.item_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterPetInventory> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.char_id));
-			v.push_back(std::to_string(e.pet));
-			v.push_back(std::to_string(e.slot));
-			v.push_back(std::to_string(e.item_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_PET_INVENTORY_REPOSITORY_H

common/repositories/base/base_character_potionbelt_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_POTIONBELT_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterPotionbeltRepository {
 public:
 	struct CharacterPotionbelt {
@@ -117,9 +116,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_potionbelt_id
 			)
 		);
@@ -350,68 +348,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterPotionbelt &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.potion_id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.icon));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterPotionbelt> &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.potion_id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.icon));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_POTIONBELT_REPOSITORY_H

common/repositories/base/base_character_skills_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_SKILLS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterSkillsRepository {
 public:
 	struct CharacterSkills {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_skills_id
 			)
 		);
@@ -339,66 +337,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterSkills &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.skill_id));
-		v.push_back(std::to_string(e.value));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterSkills> &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.skill_id));
-			v.push_back(std::to_string(e.value));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_SKILLS_REPOSITORY_H

common/repositories/base/base_character_spells_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_CHARACTER_SPELLS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseCharacterSpellsRepository {
 public:
 	struct CharacterSpells {
@@ -113,9 +112,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				character_spells_id
 			)
 		);
@@ -339,66 +337,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const CharacterSpells &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.slot_id));
-		v.push_back(std::to_string(e.spell_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<CharacterSpells> &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.slot_id));
-			v.push_back(std::to_string(e.spell_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_CHARACTER_SPELLS_REPOSITORY_H

common/repositories/base/base_logsys_categories_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_LOGSYS_CATEGORIES_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseLogsysCategoriesRepository {
 public:
 	struct LogsysCategories {
@@ -129,9 +128,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				logsys_categories_id
 			)
 		);
@@ -380,74 +378,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const LogsysCategories &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.log_category_id));
-		v.push_back("'" + Strings::Escape(e.log_category_description) + "'");
-		v.push_back(std::to_string(e.log_to_console));
-		v.push_back(std::to_string(e.log_to_file));
-		v.push_back(std::to_string(e.log_to_gmsay));
-		v.push_back(std::to_string(e.log_to_discord));
-		v.push_back(std::to_string(e.discord_webhook_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<LogsysCategories> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.log_category_id));
-			v.push_back("'" + Strings::Escape(e.log_category_description) + "'");
-			v.push_back(std::to_string(e.log_to_console));
-			v.push_back(std::to_string(e.log_to_file));
-			v.push_back(std::to_string(e.log_to_gmsay));
-			v.push_back(std::to_string(e.log_to_discord));
-			v.push_back(std::to_string(e.discord_webhook_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_LOGSYS_CATEGORIES_REPOSITORY_H

common/repositories/base/base_npc_emotes_repository.h

@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseNpcEmotesRepository {
 public:
 	struct NpcEmotes {
@@ -121,9 +120,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				npc_emotes_id
 			)
 		);

common/repositories/base/base_player_event_log_settings_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_PLAYER_EVENT_LOG_SETTINGS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BasePlayerEventLogSettingsRepository {
 public:
 	struct PlayerEventLogSettings {
@@ -360,70 +359,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventLogSettings &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.event_name) + "'");
-		v.push_back(std::to_string(e.event_enabled));
-		v.push_back(std::to_string(e.retention_days));
-		v.push_back(std::to_string(e.discord_webhook_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventLogSettings> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.event_name) + "'");
-			v.push_back(std::to_string(e.event_enabled));
-			v.push_back(std::to_string(e.retention_days));
-			v.push_back(std::to_string(e.discord_webhook_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_PLAYER_EVENT_LOG_SETTINGS_REPOSITORY_H

common/repositories/base/base_player_event_logs_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_PLAYER_EVENT_LOGS_REPOSITORY_H
@@ -240,8 +240,8 @@ public:
 		v.push_back(columns[7] + " = " + std::to_string(e.z));
 		v.push_back(columns[8] + " = " + std::to_string(e.heading));
 		v.push_back(columns[9] + " = " + std::to_string(e.event_type_id));
-		v.push_back(columns[10] + " = '" + Strings::Escape(e.event_type_name) + "'");
-		v.push_back(columns[11] + " = '" + Strings::Escape(e.event_data) + "'");
+		v.push_back(columns[10] + " = '" + db.Escape(e.event_type_name) + "'");
+		v.push_back(columns[11] + " = '" + db.Escape(e.event_data) + "'");
 		v.push_back(columns[12] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
 
 		auto results = db.QueryDatabase(
@@ -274,8 +274,8 @@ public:
 		v.push_back(std::to_string(e.z));
 		v.push_back(std::to_string(e.heading));
 		v.push_back(std::to_string(e.event_type_id));
-		v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
-		v.push_back("'" + Strings::Escape(e.event_data) + "'");
+		v.push_back("'" + db.Escape(e.event_type_name) + "'");
+		v.push_back("'" + db.Escape(e.event_data) + "'");
 		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
 
 		auto results = db.QueryDatabase(
@@ -316,8 +316,8 @@ public:
 			v.push_back(std::to_string(e.z));
 			v.push_back(std::to_string(e.heading));
 			v.push_back(std::to_string(e.event_type_id));
-			v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
-			v.push_back("'" + Strings::Escape(e.event_data) + "'");
+			v.push_back("'" + db.Escape(e.event_type_name) + "'");
+			v.push_back("'" + db.Escape(e.event_data) + "'");
 			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -460,86 +460,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const PlayerEventLogs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.account_id));
-		v.push_back(std::to_string(e.character_id));
-		v.push_back(std::to_string(e.zone_id));
-		v.push_back(std::to_string(e.instance_id));
-		v.push_back(std::to_string(e.x));
-		v.push_back(std::to_string(e.y));
-		v.push_back(std::to_string(e.z));
-		v.push_back(std::to_string(e.heading));
-		v.push_back(std::to_string(e.event_type_id));
-		v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
-		v.push_back("'" + Strings::Escape(e.event_data) + "'");
-		v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<PlayerEventLogs> &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.account_id));
-			v.push_back(std::to_string(e.character_id));
-			v.push_back(std::to_string(e.zone_id));
-			v.push_back(std::to_string(e.instance_id));
-			v.push_back(std::to_string(e.x));
-			v.push_back(std::to_string(e.y));
-			v.push_back(std::to_string(e.z));
-			v.push_back(std::to_string(e.heading));
-			v.push_back(std::to_string(e.event_type_id));
-			v.push_back("'" + Strings::Escape(e.event_type_name) + "'");
-			v.push_back("'" + Strings::Escape(e.event_data) + "'");
-			v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_PLAYER_EVENT_LOGS_REPOSITORY_H

common/repositories/base/base_tasks_repository.h

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_TASKS_REPOSITORY_H
@@ -16,7 +16,6 @@
 #include "../../strings.h"
 #include <ctime>
 
-
 class BaseTasksRepository {
 public:
 	struct Tasks {
@@ -48,7 +47,6 @@ public:
 		uint32_t    dz_template_id;
 		int32_t     lock_activity_id;
 		int32_t     faction_amount;
-		int16_t     enabled;
 	};
 
 	static std::string PrimaryKey()
@@ -87,7 +85,6 @@ public:
 			"dz_template_id",
 			"lock_activity_id",
 			"faction_amount",
-			"enabled",
 		};
 	}
 
@@ -122,7 +119,6 @@ public:
 			"dz_template_id",
 			"lock_activity_id",
 			"faction_amount",
-			"enabled",
 		};
 	}
 
@@ -191,7 +187,6 @@ public:
 		e.dz_template_id        = 0;
 		e.lock_activity_id      = -1;
 		e.faction_amount        = 0;
-		e.enabled               = 1;
 
 		return e;
 	}
@@ -217,9 +212,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				tasks_id
 			)
 		);
@@ -256,7 +250,6 @@ public:
 			e.dz_template_id        = static_cast<uint32_t>(strtoul(row[25], nullptr, 10));
 			e.lock_activity_id      = static_cast<int32_t>(atoi(row[26]));
 			e.faction_amount        = static_cast<int32_t>(atoi(row[27]));
-			e.enabled               = static_cast<int16_t>(atoi(row[28]));
 
 			return e;
 		}
@@ -318,7 +311,6 @@ public:
 		v.push_back(columns[25] + " = " + std::to_string(e.dz_template_id));
 		v.push_back(columns[26] + " = " + std::to_string(e.lock_activity_id));
 		v.push_back(columns[27] + " = " + std::to_string(e.faction_amount));
-		v.push_back(columns[28] + " = " + std::to_string(e.enabled));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -368,7 +360,6 @@ public:
 		v.push_back(std::to_string(e.dz_template_id));
 		v.push_back(std::to_string(e.lock_activity_id));
 		v.push_back(std::to_string(e.faction_amount));
-		v.push_back(std::to_string(e.enabled));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -426,7 +417,6 @@ public:
 			v.push_back(std::to_string(e.dz_template_id));
 			v.push_back(std::to_string(e.lock_activity_id));
 			v.push_back(std::to_string(e.faction_amount));
-			v.push_back(std::to_string(e.enabled));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -488,7 +478,6 @@ public:
 			e.dz_template_id        = static_cast<uint32_t>(strtoul(row[25], nullptr, 10));
 			e.lock_activity_id      = static_cast<int32_t>(atoi(row[26]));
 			e.faction_amount        = static_cast<int32_t>(atoi(row[27]));
-			e.enabled               = static_cast<int16_t>(atoi(row[28]));
 
 			all_entries.push_back(e);
 		}
@@ -541,7 +530,6 @@ public:
 			e.dz_template_id        = static_cast<uint32_t>(strtoul(row[25], nullptr, 10));
 			e.lock_activity_id      = static_cast<int32_t>(atoi(row[26]));
 			e.faction_amount        = static_cast<int32_t>(atoi(row[27]));
-			e.enabled               = static_cast<int16_t>(atoi(row[28]));
 
 			all_entries.push_back(e);
 		}
@@ -600,118 +588,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const Tasks &e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.type));
-		v.push_back(std::to_string(e.duration));
-		v.push_back(std::to_string(e.duration_code));
-		v.push_back("'" + Strings::Escape(e.title) + "'");
-		v.push_back("'" + Strings::Escape(e.description) + "'");
-		v.push_back("'" + Strings::Escape(e.reward_text) + "'");
-		v.push_back("'" + Strings::Escape(e.reward_id_list) + "'");
-		v.push_back(std::to_string(e.cash_reward));
-		v.push_back(std::to_string(e.exp_reward));
-		v.push_back(std::to_string(e.reward_method));
-		v.push_back(std::to_string(e.reward_points));
-		v.push_back(std::to_string(e.reward_point_type));
-		v.push_back(std::to_string(e.min_level));
-		v.push_back(std::to_string(e.max_level));
-		v.push_back(std::to_string(e.level_spread));
-		v.push_back(std::to_string(e.min_players));
-		v.push_back(std::to_string(e.max_players));
-		v.push_back(std::to_string(e.repeatable));
-		v.push_back(std::to_string(e.faction_reward));
-		v.push_back("'" + Strings::Escape(e.completion_emote) + "'");
-		v.push_back(std::to_string(e.replay_timer_group));
-		v.push_back(std::to_string(e.replay_timer_seconds));
-		v.push_back(std::to_string(e.request_timer_group));
-		v.push_back(std::to_string(e.request_timer_seconds));
-		v.push_back(std::to_string(e.dz_template_id));
-		v.push_back(std::to_string(e.lock_activity_id));
-		v.push_back(std::to_string(e.faction_amount));
-		v.push_back(std::to_string(e.enabled));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<Tasks> &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.type));
-			v.push_back(std::to_string(e.duration));
-			v.push_back(std::to_string(e.duration_code));
-			v.push_back("'" + Strings::Escape(e.title) + "'");
-			v.push_back("'" + Strings::Escape(e.description) + "'");
-			v.push_back("'" + Strings::Escape(e.reward_text) + "'");
-			v.push_back("'" + Strings::Escape(e.reward_id_list) + "'");
-			v.push_back(std::to_string(e.cash_reward));
-			v.push_back(std::to_string(e.exp_reward));
-			v.push_back(std::to_string(e.reward_method));
-			v.push_back(std::to_string(e.reward_points));
-			v.push_back(std::to_string(e.reward_point_type));
-			v.push_back(std::to_string(e.min_level));
-			v.push_back(std::to_string(e.max_level));
-			v.push_back(std::to_string(e.level_spread));
-			v.push_back(std::to_string(e.min_players));
-			v.push_back(std::to_string(e.max_players));
-			v.push_back(std::to_string(e.repeatable));
-			v.push_back(std::to_string(e.faction_reward));
-			v.push_back("'" + Strings::Escape(e.completion_emote) + "'");
-			v.push_back(std::to_string(e.replay_timer_group));
-			v.push_back(std::to_string(e.replay_timer_seconds));
-			v.push_back(std::to_string(e.request_timer_group));
-			v.push_back(std::to_string(e.request_timer_seconds));
-			v.push_back(std::to_string(e.dz_template_id));
-			v.push_back(std::to_string(e.lock_activity_id));
-			v.push_back(std::to_string(e.faction_amount));
-			v.push_back(std::to_string(e.enabled));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_TASKS_REPOSITORY_H

common/repositories/character_data_repository.h

@@ -46,24 +46,6 @@ public:
      */
 
 	// Custom extended repository methods here
-	static uint32 GetSecondsSinceLastLogin(Database &db, const std::string& name)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT (UNIX_TIMESTAMP(NOW()) - last_login) FROM {} WHERE name = '{}'",
-				TableName(),
-				Strings::Escape(name)
-			)
-		);
-
-		if (!results.RowCount() || !results.Success()) {
-			return 0;
-		}
-
-		auto row = results.begin();
-
-		return Strings::ToUnsignedInt(row[0]);
-	}
 };
 
 #endif //EQEMU_CHARACTER_DATA_REPOSITORY_H

common/repositories/template/base_repository.template

@@ -6,7 +6,7 @@
  * Any modifications to base repositories are to be made by the generator only
  *
  * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://docs.eqemu.io/developer/repositories
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
 #ifndef EQEMU_BASE_{{TABLE_NAME_UPPER}}_REPOSITORY_H
@@ -319,62 +319,6 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}
 
-	static std::string BaseReplace()
-	{
-		return fmt::format(
-			"REPLACE INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static int ReplaceOne(
-		Database& db,
-		const {{TABLE_NAME_STRUCT}} &e
-	)
-	{
-		std::vector<std::string> v;
-
-{{INSERT_ONE_ENTRIES}}
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseReplace(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int ReplaceMany(
-		Database& db,
-		const std::vector<{{TABLE_NAME_STRUCT}}> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-{{INSERT_MANY_ENTRIES}}
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseReplace(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
 };
 
 #endif //EQEMU_BASE_{{TABLE_NAME_UPPER}}_REPOSITORY_H

common/rulesys.cpp

@@ -22,7 +22,7 @@
 #include "strings.h"
 #include <cstdlib>
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "../common/repositories/rule_sets_repository.h"
 #include "../common/repositories/rule_values_repository.h"

common/ruletypes.h

@@ -215,10 +215,6 @@ RULE_BOOL(Character, EnableRaidEXPModifier, true, "Enable or disable the raid ex
 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_BOOL(Character, UseForageCommonFood, true, "If enabled, use the common foods specified in the code.")
-RULE_INT(Character, ClearXTargetDelay, 10, "Seconds between uses of the #clearxtargets command (Set to 0 to disable)")
-RULE_BOOL(Character, PreventMountsFromZoning, false, "Enable to prevent mounts from zoning - Prior to December 15, 2004 this is enabled.")
-RULE_BOOL(Character, GroupInvitesRequireTarget, false, "Enable to require players to have invitee on target (Disables /invite name) - Classic Style")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mercs)
@@ -254,7 +250,6 @@ RULE_BOOL(Skills, TrainSenseHeading, false, "Switch whether SenseHeading is trai
 RULE_INT(Skills, SenseHeadingStartValue, 200, "Start value of sense heading skill")
 RULE_BOOL(Skills, SelfLanguageLearning, true, "Enabling self-learning of languages")
 RULE_BOOL(Skills, RequireTomeHandin, false, "Disable click-to-learn and force hand in to Guild Master")
-RULE_INT(Skills, TradeSkillClamp, 0, "Legacy tradeskills would clamp at 252 regardless of item modifiers and skill combination. DEFAULT: 0 will bypass clamp. Legacy value 252")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Pets)
@@ -434,10 +429,6 @@ RULE_BOOL(Spells, AlwaysSendTargetsBuffs, false, "Ignore Leadership Alternate Ab
 RULE_BOOL(Spells, FlatItemExtraSpellAmt, false, "Allow SpellDmg stat to affect all spells, regardless of cast time/cooldown/etc")
 RULE_BOOL(Spells, IgnoreSpellDmgLvlRestriction, false, "Ignore the 5 level spread on applying SpellDmg")
 RULE_BOOL(Spells, ItemExtraSpellAmtCalcAsPercent, false, "Apply the Item stats Spell Dmg and Heal Amount as Percentage-based modifiers instead of flat additions")
-RULE_REAL(Spells, BreakFeignDeathWhenCastOn, 2.0, "Percentage that Feign Death will break when you resist a spell")
-RULE_REAL(Spells, BreakSneakWhenCastOn, 2.0, "Percentage that Sneak will break when you resist a spell")
-RULE_BOOL(Spells, EnableResistSoftCap, false, "Enabled resist softcap and can be adjusted by rule, SpellResistSoftCap")
-RULE_INT(Spells, SpellResistSoftCap, 255, "Softcap for spell resists.")
 RULE_BOOL(Spells, AllowItemTGB, false, "Target group buff (/tgb) doesn't work with items on live, custom servers want it though")
 RULE_BOOL(Spells, NPCInnateProcOverride, true, "NPC innate procs override the target type to single target")
 RULE_BOOL(Spells, OldRainTargets, false, "Use old incorrectly implemented maximum targets for rains")
@@ -470,14 +461,6 @@ RULE_INT(Spells, DefensiveProcPenaltyLevelGap, 6, "Defensive Proc Penalty Level
 RULE_REAL(Spells, DefensiveProcPenaltyLevelGapModifier, 10.0f, "Defensive Proc Penalty Level Gap Modifier where procs start losing their proc rate at defined % after RuleI(Spells, DefensiveProcLevelGap) level difference")
 RULE_BOOL(Spells, DOTBonusDamageSplitOverDuration, true, "Disable to have Damage Over Time total bonus damage added to each tick instead of divided across duration")
 RULE_BOOL(Spells, HOTBonusHealingSplitOverDuration, true, "Disable to have Heal Over Time total bonus healing added to each tick instead of divided across duration")
-RULE_BOOL(Spells, UseLegacyFizzleCode, false, "Enable will turn on the legacy fizzle code which is far stricter and more accurate to 2001/2002 testing.")
-RULE_BOOL(Spells, LegacyManaburn, false, "Enable to have the legacy manaburn system from 2003 and earlier.")
-RULE_INT(Spells, LegacyManaburnCap, 9492, "Adjusted the hard cap (Normal or Crit) for the Legacy Manaburn system. DEFAULT: 9492")
-RULE_BOOL(Spells, EvacClearAggroInSameZone, false, "Enable to clear aggro on clients when evacing in same zone.")
-RULE_BOOL(Spells, CharmAggroOverLevel, false, "Enabling this rule will cause Charm casts over level to show resisted and cause aggro. Early EQ style.")
-RULE_BOOL(Spells, RequireMnemonicRetention, true, "Enabling will require spell slots 9-12 to have the appropriate Mnemonic Retention AA learned.")
-RULE_BOOL(Spells, EvacClearCharmPet, false, "Enable to have evac in zone clear charm from charm pets and detach buffs.")
-RULE_BOOL(Spells, ManaTapsRequireNPCMana, false, "Enabling will require target to have mana to tap. Default off as many npc's are caster class with 0 mana and need fixed.")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Combat)
@@ -515,7 +498,6 @@ RULE_REAL(Combat, AvgDefProcsPerMinute, 2.0, "Average defense procs per minute")
 RULE_REAL(Combat, DefProcPerMinAgiContrib, 0.075, "How much agility contributes to defensive proc rate")
 RULE_INT(Combat, NPCFlurryChance, 20, "Chance for NPC to flurry")
 RULE_BOOL(Combat, TauntOverLevel, 1, "Allows you to taunt NPC's over warriors level")
-RULE_INT(Combat, TauntOverAggro, 0, "+ amount over hate_top it will add before any bonus hate.")
 RULE_REAL(Combat, TauntSkillFalloff, 0.33, "For every taunt skill point that's not maxed you lose this percentage chance to taunt")
 RULE_BOOL(Combat, EXPFromDmgShield, false, "Determine if damage from a damage shield counts for experience gain")
 RULE_INT(Combat, QuiverHasteCap, 1000, "Quiver haste cap 1000 on live for a while, currently 700 on live")
@@ -525,9 +507,6 @@ RULE_BOOL(Combat, OneProcPerWeapon, true, "If enabled, One proc per weapon per r
 RULE_BOOL(Combat, ProjectileDmgOnImpact, true, "If enabled, projectiles (i.e. arrows) will hit on impact, instead of instantly")
 RULE_BOOL(Combat, MeleePush, true, "Enable melee push")
 RULE_INT(Combat, MeleePushChance, 50, "NPC chance the target will be pushed. Made up, 100 actually isn't that bad")
-RULE_REAL(Combat, MeleePushForceClientPercent, 0.00, "Percent to add or remove from push for players")
-RULE_REAL(Combat, MeleePushForcePetPercent, 0.00, "Percent to add or remove from push for pets")
-RULE_BOOL(Combat, NPCtoNPCPush, false, "Disabled prevents NPC to NPC pushing per the 2013+ patch.")
 RULE_BOOL(Combat, UseLiveCombatRounds, true, "Turn this false if you don't want to worry about fixing up combat rounds for NPCs")
 RULE_INT(Combat, NPCAssistCap, 5, "Maximum number of NPC that will assist another NPC at once")
 RULE_INT(Combat, NPCAssistCapTimer, 6000, "Time a NPC will take to clear assist aggro cap space (milliseconds)")
@@ -558,13 +537,6 @@ RULE_BOOL(Combat, SummonMeleeRange, true, "Enable or disable summoning of a play
 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_INT(Combat, ExtraAllowedKickClassesBitmask, 0, "Bitmask for allowing extra classes beyond Warrior, Ranger, Beastlord, and Berserker to kick, No Extra Classes (0) by default")
 RULE_INT(Combat, MaxProcs, 4, "Adjustable maximum number of procs per round, the hard cap is MAX_PROCS (11). Requires mob repop or client zone when changed")
-RULE_BOOL(Combat, FinishingBlowOnlyWhenFleeing, false, "Enable to only allow Finishing Blow when fleeing (Original Style Finishing Blow)")
-RULE_BOOL(Combat, ClassicTripleAttack, false, "enable to use non-skill based classic triple attack. Originally it was Warrior Only but was expanded, can use the TripleAttackChance to tune the classes out.")
-RULE_INT(Combat, ClassicTripleAttackChanceWarrior, 100, "Innate Chance for Warrior to Triple Attack after a Double Attack (125 = 12.5%). DEFAULT: 100")
-RULE_INT(Combat, ClassicTripleAttackChanceMonk, 100, "Innate Chance for Monk to Triple Attack after a Double Attack (200 = 20%). DEFAULT: 100")
-RULE_INT(Combat, ClassicTripleAttackChanceBerserker, 100, "Innate Chance for Berserker to Triple Attack after a Double Attack (200 = 20%). DEFAULT: 100")
-RULE_INT(Combat, ClassicTripleAttackChanceRanger, 100, "Innate Chance for Ranger to Triple Attack after a Double Attack (200 = 20%). DEFAULT: 100")
-RULE_INT(Combat, StunChance, 12, "Percent chance that client will be stunned when mob is behind player. DEFAULT: 12")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(NPC)
@@ -590,7 +562,6 @@ RULE_INT(NPC, NPCToNPCAggroTimerMin, 500, "Minimum time span after which one NPC
 RULE_INT(NPC, NPCToNPCAggroTimerMax, 6000, "Maximum time span after which one NPC aggro another NPC (milliseconds)")
 RULE_BOOL(NPC, UseClassAsLastName, true, "Uses class archetype as LastName for NPC with none")
 RULE_BOOL(NPC, NewLevelScaling, true, "Better level scaling, use old if new formulas would break your server")
-RULE_REAL(NPC,NPCBackstabMod, 1.9, "Multiplier for NPC Backstab, Higher = Lower backstab amount")
 RULE_INT(NPC, NPCGatePercent, 20, " Percentage at which the NPC Will attempt to gate at")
 RULE_BOOL(NPC, NPCGateNearBind, false, "Will NPC attempt to gate when near bind location?")
 RULE_INT(NPC, NPCGateDistanceBind, 75, "Distance from bind before NPC will attempt to gate")
@@ -621,7 +592,6 @@ RULE_INT(Aggro, ClientAggroCheckIdleInterval, 6000, "Interval in which clients a
 RULE_REAL(Aggro, PetAttackRange, 40000.0, "Maximum squared range /pet attack works at default is 200")
 RULE_BOOL(Aggro, NPCAggroMaxDistanceEnabled, true, "If enabled, NPC's will drop aggro beyond 600 units or what is defined at the zone level")
 RULE_BOOL(Aggro, AggroPlayerPets, false, "If enabled, NPCs will aggro player pets")
-RULE_BOOL(Aggro, UndeadAlwaysAggro, true, "should undead always aggro?")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(TaskSystem)
@@ -686,9 +656,6 @@ RULE_BOOL(Bots, AllowPickpocketCommand, true, "Allows the use of the bot command
 RULE_BOOL(Bots, BotHealOnLevel, false, "Setting whether a bot should heal completely when leveling. Default FALSE.")
 RULE_INT(Bots, AutosaveIntervalSeconds, 300, "Number of seconds after which a timer is triggered which stores the bot data. The value 0 means no periodic automatic saving.")
 RULE_BOOL(Bots, CazicTouchBotsOwner, true, "Default True. Cazic Touch/DT will hit bot owner rather than bot.")
-RULE_INT(Bots, BotsClickItemsMinLvl, 1, "Minimum level for bots to be able to use ^clickitem. Default 1.")
-RULE_BOOL(Bots, BotsCanClickItems, true, "Enabled the ability for bots to click items they have equipped. Default TRUE")
-RULE_BOOL(Bots, CanClickMageEpicV1, true, "Whether or not bots are allowed to click Mage Epic 1.0. Default TRUE")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Chat)

common/say_link.cpp

@@ -376,7 +376,7 @@ std::string EQ::SayLinkEngine::InjectSaylinksIfNotExist(const char *message)
 
 void EQ::SayLinkEngine::LoadCachedSaylinks()
 {
-	auto saylinks = SaylinkRepository::GetWhere(database, "phrase not REGEXP '[A-Z]' and phrase not REGEXP '[0-9]'");
+	auto saylinks = SaylinkRepository::GetWhere(database, "phrase not REGEXP BINARY '[A-Z]' and phrase not REGEXP '[0-9]'");
 	LogSaylink("Loaded [{}] saylinks into cache", saylinks.size());
 	g_cached_saylinks = saylinks;
 }

common/shareddb.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 	#include <algorithm>
@@ -44,7 +44,6 @@
 #include "repositories/starting_items_repository.h"
 #include "path_manager.h"
 #include "repositories/loottable_repository.h"
-#include "repositories/character_item_recast_repository.h"
 
 namespace ItemField
 {
@@ -883,49 +882,34 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQ::InventoryPr
 std::map<uint32, uint32> SharedDatabase::GetItemRecastTimestamps(uint32 char_id)
 {
 	std::map<uint32, uint32> timers;
-
-	const auto& l = CharacterItemRecastRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`id` = {}",
-			char_id
-		)
-	);
-
-	if (l.empty()) {
+	const std::string query = StringFormat("SELECT recast_type,timestamp FROM character_item_recast WHERE id=%u", char_id);
+	auto results = QueryDatabase(query);
+	if (!results.Success() || results.RowCount() == 0)
 		return timers;
-	}
 
-	for (const auto& e : l) {
-		timers[e.recast_type] = e.timestamp;
-	}
-
-	return timers;
+	for (auto& row = results.begin(); row != results.end(); ++row)
+		timers[Strings::ToUnsignedInt(row[0])] = Strings::ToUnsignedInt(row[1]);
+	return timers; // RVO or move assigned
 }
 
 uint32 SharedDatabase::GetItemRecastTimestamp(uint32 char_id, uint32 recast_type)
 {
-	const auto& l = CharacterItemRecastRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`id` = {} AND `recast_type` = {}",
-			char_id,
-			recast_type
-		)
-	);
+	const std::string query = StringFormat("SELECT timestamp FROM character_item_recast WHERE id=%u AND recast_type=%u",
+	                                       char_id, recast_type);
+	auto results = QueryDatabase(query);
+	if (!results.Success() || results.RowCount() == 0)
+		return 0;
 
-	return l.empty() ? 0 : l[0].timestamp;
+	auto& row = results.begin();
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 void SharedDatabase::ClearOldRecastTimestamps(uint32 char_id)
 {
-	CharacterItemRecastRepository::DeleteWhere(
-		*this,
-		fmt::format(
-			"`id` = {} AND `timestamp` < UNIX_TIMESTAMP()",
-			char_id
-		)
-	);
+	// This actually isn't strictly live-like. Live your recast timestamps are forever
+	const std::string query =
+	    StringFormat("DELETE FROM character_item_recast WHERE id = %u and timestamp < UNIX_TIMESTAMP()", char_id);
+	QueryDatabase(query);
 }
 
 void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id)

common/spdat.h

@@ -202,19 +202,6 @@
 #define SPELL_GUIDE_LEVITATION 39852
 #define SPELL_GUIDE_SPELL_HASTE 39853
 #define SPELL_GUIDE_HASTE 39854
-#define SPELL_VAMPIRIC_EMBRACE 821
-#define SPELL_VAMPIRIC_EMBRACE_OF_SHADOW 822
-#define SPELL_BATTLE_CRY 5027
-#define SPELL_WAR_CRY 5028
-#define SPELL_BATTLE_CRY_OF_DRAVEL 5029
-#define SPELL_WAR_CRY_OF_DRAVEL 5030
-#define SPELL_BATTLE_CRY_OF_THE_MASTRUQ 5031
-#define SPELL_ANCIENT_CRY_OF_CHAOS 5032
-#define SPELL_BLOODTHIRST 8476
-#define SPELL_AMPLIFICATION 2603
-
-// discipline IDs.
-#define DISC_UNHOLY_AURA 4520
 
 //spellgroup ids
 #define SPELLGROUP_FRENZIED_BURNOUT 2754

common/strings.cpp

@@ -34,7 +34,7 @@
 */
 
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 

common/strings.h

@@ -44,7 +44,7 @@
 #include <tuple>
 #include <type_traits>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #ifndef _WIN32
 // this doesn't appear to affect linux-based systems..need feedback for _WIN64
@@ -206,7 +206,7 @@ const std::string NUM_TO_ENGLISH_Y[] = {
 	"Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety "
 };
 
-// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+// _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
 template<typename T1, typename T2>
 std::vector<std::string> join_pair(
 	const std::string &glue,
@@ -239,7 +239,7 @@ std::vector<std::string> join_pair(
 	return output;
 }
 
-// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+// _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
 template<typename T1, typename T2, typename T3, typename T4>
 std::vector<std::string> join_tuple(
 	const std::string &glue,

common/strings_legacy.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 #include <cinttypes>

common/strings_misc.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 

common/tasks.h

@@ -359,11 +359,9 @@ namespace Tasks {
 			if (activity_states[i].activity_state != ActivityCompleted)
 			{
 				completed_ids[i] = false;
-
-				// step system advances to next step if only optionals active
+				current_step = std::min(current_step, el.step);
 				if (!el.optional)
 				{
-					current_step = std::min(current_step, el.step);
 					result.is_task_complete = false;
 				}
 			}

common/util/uuid.cpp

@@ -1,7 +1,7 @@
 #include "uuid.h"
 
 #include <ios>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #ifdef _WIN32
 #include <objbase.h>

common/version.h

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

package.json

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

queryserv/database.cpp

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errmsg.h>
 #include <mysqld_error.h>
 #include <limits.h>
 #include <ctype.h>
@@ -398,6 +399,5 @@ void QSDatabase::GeneralQueryReceive(ServerPacket *pack)
 		LogInfo("[{}]", query.c_str());
 	}
 
-	safe_delete(pack);
 	safe_delete_array(queryBuffer);
 }

tests/task_state_test.h

@@ -463,17 +463,15 @@ void TaskStateTest::TestOptionalSteps()
 		// activity_id | step | state
 		// 0 | 0 | complete
 		// 1 | 1 | hidden | optional (active)
-		// 2 | 2 | hidden | optional (active)
-		// 3 | 2 | hidden (active)
+		// 2 | 2 | hidden | optional
+		// 3 | 2 | hidden
 
 		auto res = Tasks::GetActiveElements(data, state, activity_count);
 
-		// steps that only contain optionals should not need to be completed to open next step
+		// since optional is on its own step it's effectively non-optional to open next step
 		TEST_ASSERT(res.is_task_complete == false);
-		TEST_ASSERT(res.active.size() == 3);
+		TEST_ASSERT(res.active.size() == 1);
 		TEST_ASSERT(std::find(res.active.begin(), res.active.end(), 1) != res.active.end());
-		TEST_ASSERT(std::find(res.active.begin(), res.active.end(), 2) != res.active.end());
-		TEST_ASSERT(std::find(res.active.begin(), res.active.end(), 3) != res.active.end());
 	}
 
 	{
@@ -532,9 +530,9 @@ void TaskStateTest::TestOptionalLastSteps()
 	auto state = GetMockWorldState(activity_count);
 	data[0].step = 0;
 	data[1].optional = true;
-	data[1].step = 1;
+	data[1].step = 2;
 	data[2].optional = true;
-	data[2].step = 2;
+	data[2].step = 3;
 
 	{
 		// activity_id | step | state
@@ -555,15 +553,13 @@ void TaskStateTest::TestOptionalLastSteps()
 		// activity_id | step | state
 		// 0 | 0 | complete
 		// 1 | 1 | hidden | optional (active)
-		// 2 | 2 | hidden | optional (active)
+		// 2 | 2 | hidden | optional
 
-		// step with only an optional should not prevent next step being active
 		auto res = Tasks::GetActiveElements(data, state, activity_count);
 
 		TEST_ASSERT(res.is_task_complete == true);
-		TEST_ASSERT(res.active.size() == 2);
+		TEST_ASSERT(res.active.size() == 1);
 		TEST_ASSERT(std::find(res.active.begin(), res.active.end(), 1) != res.active.end());
-		TEST_ASSERT(std::find(res.active.begin(), res.active.end(), 2) != res.active.end());
 	}
 
 	{

ucs/database.cpp

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errmsg.h>
 #include <mysqld_error.h>
 #include <limits.h>
 #include <ctype.h>
@@ -159,7 +160,7 @@ bool UCSDatabase::VerifyMailKey(const std::string& characterName, int IPAddress,
 		LogInfo("No mailkeys found for [{}].", characterName.c_str());
 		return false;
 	}
-
+	
 	auto row = results.begin();
 
 	// The key is the client's IP address (expressed as 8 hex digits) and an 8 hex digit random string generated

ucs/ucs.cpp

@@ -164,7 +164,13 @@ int main() {
 
 	database.ExpireMail();
 
-	g_Clientlist = new Clientlist(Config->GetUCSPort());
+	if(Config->ChatPort != Config->MailPort)
+	{
+		LogInfo("MailPort and CharPort must be the same in eqemu_config.json for UCS");
+		exit(1);
+	}
+
+	g_Clientlist = new Clientlist(Config->ChatPort);
 
 	ChannelList = new ChatChannelList();
 

utils/raceconstantrename/go.mod

@@ -1,8 +0,0 @@
-module constantconvert
-
-go 1.18
-
-require (
-	github.com/gammazero/deque v0.2.0 // indirect
-	github.com/gammazero/workerpool v1.1.3 // indirect
-)

utils/raceconstantrename/go.sum

@@ -1,4 +0,0 @@
-github.com/gammazero/deque v0.2.0 h1:SkieyNB4bg2/uZZLxvya0Pq6diUlwx7m2TeT7GAIWaA=
-github.com/gammazero/deque v0.2.0/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU=
-github.com/gammazero/workerpool v1.1.3 h1:WixN4xzukFoN0XSeXF6puqEqFTl2mECI9S6W44HWy9Q=
-github.com/gammazero/workerpool v1.1.3/go.mod h1:wPjyBLDbyKnUn2XwwyD3EEwo9dHutia9/fwNmSHWACc=

utils/raceconstantrename/main.go

@@ -1,313 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gammazero/workerpool"
-	"io/fs"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-func main() {
-	loadDefinitions()
-
-	// get processor count
-	wp := workerpool.New(runtime.NumCPU())
-
-	// loop through all files in current dir that are cpp files or h files
-	err := filepath.WalkDir("../../", func(path string, d fs.DirEntry, err error) error {
-		if d.IsDir() {
-			return nil
-		}
-
-		if !strings.Contains(path, ".cpp") && !strings.Contains(path, ".h") {
-			return nil
-		}
-
-		// if file ends with ".o" skip it
-		if strings.HasSuffix(path, ".o") {
-			return nil
-		}
-
-		var ignoreFiles = []string{
-			"submodules", "/libs", "utils/", "races.h", "backward", "database_update_manifest.cpp", "zonedb.h",
-		}
-
-		ignore := false
-		for _, ignoreString := range ignoreFiles {
-			if strings.Contains(path, ignoreString) {
-				ignore = true
-				break
-			}
-		}
-		if ignore {
-			return nil
-		}
-
-		wp.Submit(func() {
-
-			// open file for reading
-			// get file contents
-			contents, err := os.ReadFile(path)
-			if err != nil {
-				log.Fatalf("impossible to read file: %s", err)
-			}
-
-			content := string(contents)
-
-			wroteChanges := false
-
-			var newLines []string
-			for _, line := range strings.Split(content, "\n") {
-				newLine := line
-
-				// loop through oldDefs and see if any of them are in contents
-				for key, value := range oldDefs {
-					// combine all of the above contains into a slice
-					// loop through slice and if any of them are in line, continue
-					var ignoreMatches = []string{
-						"#define ", "MALE", "FEMALE", "_BIT", "LANG_",
-					}
-
-					ignore := false
-					for _, ignoreString := range ignoreMatches {
-						if strings.Contains(newLine, ignoreString) && !strings.Contains(newLine, "NPC_") {
-							ignore = true
-							break
-						}
-					}
-					if ignore {
-						continue
-					}
-
-					// below we hackishly use a series of specific string contains to avoid
-					// making blind and wrong replacements
-					// but hey - at least its 100% accurate :)
-					if strings.Contains(line, "case "+key+":") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, " "+key+":", " "+key2+":")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, "\t"+key) {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, "\t"+key, "\t"+key2)
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, key+",") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, key+",", key2+",")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, ", "+key) {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, ", "+key, ", "+key2)
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, "= "+key+" ") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, "= "+key+" ", "= "+key2+" ")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, "= "+key+")") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, "= "+key+")", "= "+key2+")")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, "= "+key+";") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, "= "+key+";", "= "+key2+";")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-					if strings.Contains(line, "= "+key+" ||") {
-						for key2, value2 := range newDefs {
-							if value == value2 {
-								newLine = strings.ReplaceAll(newLine, "= "+key+" ||", "= "+key2+" ||")
-								wroteChanges = true
-								break
-							}
-						}
-					}
-
-					// match cases where our match is on the last line and last column
-					// we need to be exact in the last column and not do a partial because we can
-					// accidentally rename say OGRE to OGRE2 mistakenly
-					if strings.Contains(line, key) {
-						columns := strings.Split(line, " ")
-						// get the last column
-						lastColumn := strings.TrimSpace(columns[len(columns)-1])
-						if lastColumn == key {
-							for key2, value2 := range newDefs {
-								if value == value2 {
-									newLine = strings.ReplaceAll(newLine, lastColumn, key2)
-									wroteChanges = true
-									break
-								}
-							}
-						}
-					}
-
-					//if strings.Contains(line, "race == "+key) {
-					//	for key2, value2 := range newDefs {
-					//		if value == value2 {
-					//			newLine = strings.ReplaceAll(newLine, "race == "+key, "race == "+key2)
-					//			wroteChanges = true
-					//			break
-					//		}
-					//	}
-					//}
-				}
-
-				newLines = append(newLines, newLine)
-			}
-
-			// write contents back to file
-			if wroteChanges {
-				fmt.Printf("wrote changes to file [%v]\n", path)
-				err = os.WriteFile(path, []byte(strings.Join(newLines, "\n")), 0644)
-				if err != nil {
-					log.Fatalf("impossible to write file: %s", err)
-				}
-			}
-
-			return
-		})
-		return nil
-	})
-	if err != nil {
-		log.Fatalf("impossible to walk directories: %s", err)
-	}
-
-	wp.StopWait()
-}
-
-var newDefs = make(map[string]int)
-var oldDefs = make(map[string]int)
-
-func loadDefinitions() {
-	// git show master:common/races.h
-	cmd := exec.Command("git", "show", "master:common/races.h")
-	out, err := cmd.Output()
-	if err != nil {
-		println(err.Error())
-		return
-	}
-
-	// load into a string -> int map
-	for _, line := range strings.Split(string(out), "\n") {
-		if strings.Contains(line, "#define ") {
-			if len(strings.Split(line, " ")) <= 2 {
-				continue
-			}
-
-			// ignore
-			// #define MALE 0
-			// #define FEMALE 1
-			// #define NEUTER 2
-			if strings.Contains(line, "#define MALE") {
-				continue
-			}
-			if strings.Contains(line, "#define FEMALE") {
-				continue
-			}
-			if strings.Contains(line, "#define NEUTER") {
-				continue
-			}
-
-			// load "#define RACE_FLYING_CARPET_720 720" into map
-
-			key := strings.Split(line, " ")[1]
-			value := strings.Split(line, " ")[2]
-			value = strings.ReplaceAll(value, "//", "")
-			value = strings.TrimSpace(value)
-			//fmt.Printf("key [%v] value [%v]\n", key, value)
-
-			if !strings.HasPrefix(key, "RACE_") && !strings.HasPrefix(key, "RT_") {
-				continue
-			}
-
-			// convert value to int
-			intValue, err := strconv.Atoi(value)
-			if err != nil {
-				println(err.Error())
-				return
-			}
-
-			oldDefs[key] = intValue
-
-			fmt.Printf("oldDefs key [%v] value [%v]\n", key, intValue)
-		}
-	}
-
-	// cleanup/races_cpp_h
-	cmd = exec.Command("git", "show", "cleanup/races_cpp_h:common/races.h")
-	out, err = cmd.Output()
-	if err != nil {
-		println(err.Error())
-		return
-	}
-
-	// load into a string -> int map
-	for _, line := range strings.Split(string(out), "\n") {
-		if strings.Contains(line, "constexpr uint16") {
-			if len(strings.Split(line, " ")) <= 2 {
-				continue
-			}
-
-			// remove all extra spaces in between characters in line
-			line = strings.Join(strings.Fields(line), " ")
-
-			// load "	constexpr uint16 Doug = 0;" into map
-			key := strings.Split(line, " ")[2]
-			value := strings.Split(line, " ")[4]
-			value = strings.ReplaceAll(value, "//", "")
-			value = strings.ReplaceAll(value, ";", "")
-			value = strings.TrimSpace(value)
-
-			// convert value to int
-			intValue, err := strconv.Atoi(value)
-			if err != nil {
-				println(err.Error())
-				return
-			}
-
-			mapKey := "Race::" + key
-
-			newDefs[mapKey] = intValue
-
-			fmt.Printf("newDefs key [%v] value [%v]\n", mapKey, value)
-		}
-	}
-}

utils/scripts/build/linux-build.sh

@@ -15,8 +15,8 @@ mkdir -p build && cd build && \
       -DEQEMU_BUILD_LOGIN=ON \
       -DEQEMU_BUILD_LUA=ON \
       -DEQEMU_BUILD_PERL=ON \
-      -DCMAKE_CXX_FLAGS:STRING="-O1 -g -Wno-everything" \
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O1 -g -Wno-everything" \
+      -DCMAKE_CXX_FLAGS:STRING="-O1 -g" \
+      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O1 -g" \
       -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
       -G 'Unix Makefiles' \
       .. && make -j$((`nproc`-4))