Add uuid to unix builds

common/CMakeLists.txt

@@ -1293,6 +1293,7 @@ if(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
 endif()
 
 if(UNIX)
+	target_link_libraries(common PUBLIC uuid)
     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()

zone/CMakeLists.txt

@@ -354,6 +354,31 @@ set(gm_command_sources
     gm_commands/evolving_items.cpp
     gm_commands/feature.cpp
     gm_commands/find.cpp
+	gm_commands/find/find_aa.cpp
+	gm_commands/find/find_account.cpp
+	gm_commands/find/find_body_type.cpp
+	gm_commands/find/find_bot.cpp
+	gm_commands/find/find_bug_category.cpp
+	gm_commands/find/find_character.cpp
+	gm_commands/find/find_class.cpp
+	gm_commands/find/find_comparison_type.cpp
+	gm_commands/find/find_currency.cpp
+	gm_commands/find/find_deity.cpp
+	gm_commands/find/find_emote.cpp
+	gm_commands/find/find_faction.cpp
+	gm_commands/find/find_item.cpp
+	gm_commands/find/find_language.cpp
+	gm_commands/find/find_ldon_theme.cpp
+	gm_commands/find/find_npctype.cpp
+	gm_commands/find/find_object_type.cpp
+	gm_commands/find/find_race.cpp
+	gm_commands/find/find_recipe.cpp
+	gm_commands/find/find_skill.cpp
+	gm_commands/find/find_special_ability.cpp
+	gm_commands/find/find_spell.cpp
+	gm_commands/find/find_stance.cpp
+	gm_commands/find/find_task.cpp
+	gm_commands/find/find_zone.cpp
     gm_commands/fish.cpp
     gm_commands/fixmob.cpp
     gm_commands/flagedit.cpp
@@ -432,7 +457,115 @@ set(gm_command_sources
     gm_commands/sensetrap.cpp
     gm_commands/serverrules.cpp
     gm_commands/set.cpp
+	gm_commands/set/set_aa_exp.cpp
+    gm_commands/set/set_aa_points.cpp
+    gm_commands/set/set_adventure_points.cpp
+    gm_commands/set/set_alternate_currency.cpp
+    gm_commands/set/set_animation.cpp
+    gm_commands/set/set_anon.cpp
+    gm_commands/set/set_auto_login.cpp
+    gm_commands/set/set_bind_point.cpp
+    gm_commands/set/set_checksum.cpp
+    gm_commands/set/set_class_permanent.cpp
+    gm_commands/set/set_crystals.cpp
+    gm_commands/set/set_date.cpp
+    gm_commands/set/set_endurance.cpp
+    gm_commands/set/set_endurance_full.cpp
+    gm_commands/set/set_exp.cpp
+    gm_commands/set/set_flymode.cpp
+    gm_commands/set/set_frozen.cpp
+    gm_commands/set/set_gender.cpp
+    gm_commands/set/set_gender_permanent.cpp
+    gm_commands/set/set_gm.cpp
+    gm_commands/set/set_gm_speed.cpp
+    gm_commands/set/set_gm_status.cpp
+    gm_commands/set/set_god_mode.cpp
+    gm_commands/set/set_haste.cpp
+    gm_commands/set/set_hero_model.cpp
+    gm_commands/set/set_hide_me.cpp
+    gm_commands/set/set_hp.cpp
+    gm_commands/set/set_hp_full.cpp
+    gm_commands/set/set_invulnerable.cpp
+    gm_commands/set/set_language.cpp
+    gm_commands/set/set_last_name.cpp
+    gm_commands/set/set_level.cpp
+    gm_commands/set/set_loginserver_info.cpp
+    gm_commands/set/set_mana.cpp
+    gm_commands/set/set_mana_full.cpp
+    gm_commands/set/set_motd.cpp
+    gm_commands/set/set_name.cpp
+    gm_commands/set/set_ooc_mute.cpp
+    gm_commands/set/set_password.cpp
+    gm_commands/set/set_pvp.cpp
+    gm_commands/set/set_pvp_points.cpp
+    gm_commands/set/set_race.cpp
+    gm_commands/set/set_race_permanent.cpp
+    gm_commands/set/set_server_locked.cpp
+    gm_commands/set/set_skill.cpp
+    gm_commands/set/set_skill_all.cpp
+    gm_commands/set/set_skill_all_max.cpp
+    gm_commands/set/set_start_zone.cpp
+    gm_commands/set/set_temporary_name.cpp
+    gm_commands/set/set_texture.cpp
+    gm_commands/set/set_time.cpp
+    gm_commands/set/set_time_zone.cpp
+    gm_commands/set/set_title.cpp
+    gm_commands/set/set_title_suffix.cpp
+    gm_commands/set/set_weather.cpp
+    gm_commands/set/set_zone.cpp
     gm_commands/show.cpp
+	gm_commands/show/show_aas.cpp
+    gm_commands/show/show_aa_points.cpp
+    gm_commands/show/show_aggro.cpp
+    gm_commands/show/show_auto_login.cpp
+    gm_commands/show/show_buffs.cpp
+    gm_commands/show/show_buried_corpse_count.cpp
+    gm_commands/show/show_client_version_summary.cpp
+    gm_commands/show/show_content_flags.cpp
+    gm_commands/show/show_currencies.cpp
+    gm_commands/show/show_distance.cpp
+    gm_commands/show/show_emotes.cpp
+    gm_commands/show/show_field_of_view.cpp
+    gm_commands/show/show_flags.cpp
+    gm_commands/show/show_group_info.cpp
+    gm_commands/show/show_hatelist.cpp
+    gm_commands/show/show_inventory.cpp
+    gm_commands/show/show_ip_lookup.cpp
+    gm_commands/show/show_keyring.cpp
+    gm_commands/show/show_line_of_sight.cpp
+    gm_commands/show/show_network.cpp
+    gm_commands/show/show_network_stats.cpp
+    gm_commands/show/show_npc_global_loot.cpp
+    gm_commands/show/show_npc_stats.cpp
+    gm_commands/show/show_npc_type.cpp
+    gm_commands/show/show_peqzone_flags.cpp
+    gm_commands/show/show_petition.cpp
+    gm_commands/show/show_petition_info.cpp
+    gm_commands/show/show_proximity.cpp
+    gm_commands/show/show_quest_errors.cpp
+    gm_commands/show/show_quest_globals.cpp
+    gm_commands/show/show_recipe.cpp
+    gm_commands/show/show_server_info.cpp
+    gm_commands/show/show_skills.cpp
+    gm_commands/show/show_spawn_status.cpp
+    gm_commands/show/show_special_abilities.cpp
+    gm_commands/show/show_spells.cpp
+    gm_commands/show/show_spells_list.cpp
+    gm_commands/show/show_stats.cpp
+    gm_commands/show/show_timers.cpp
+    gm_commands/show/show_traps.cpp
+    gm_commands/show/show_uptime.cpp
+    gm_commands/show/show_variable.cpp
+    gm_commands/show/show_version.cpp
+    gm_commands/show/show_waypoints.cpp
+    gm_commands/show/show_who.cpp
+    gm_commands/show/show_xtargets.cpp
+    gm_commands/show/show_zone_data.cpp
+    gm_commands/show/show_zone_global_loot.cpp
+    gm_commands/show/show_zone_loot.cpp
+    gm_commands/show/show_zone_points.cpp
+    gm_commands/show/show_zone_status.cpp
+    gm_commands/show/show_zone_variables.cpp
     gm_commands/shutdown.cpp
     gm_commands/spawn.cpp
     gm_commands/spawneditmass.cpp
@@ -469,6 +602,146 @@ set(gm_command_sources
     gm_commands/zsave.cpp
 )
 
+source_group(find FILES
+	gm_commands/find/find_aa.cpp
+	gm_commands/find/find_account.cpp
+	gm_commands/find/find_body_type.cpp
+	gm_commands/find/find_bot.cpp
+	gm_commands/find/find_bug_category.cpp
+	gm_commands/find/find_character.cpp
+	gm_commands/find/find_class.cpp
+	gm_commands/find/find_comparison_type.cpp
+	gm_commands/find/find_currency.cpp
+	gm_commands/find/find_deity.cpp
+	gm_commands/find/find_emote.cpp
+	gm_commands/find/find_faction.cpp
+	gm_commands/find/find_item.cpp
+	gm_commands/find/find_language.cpp
+	gm_commands/find/find_ldon_theme.cpp
+	gm_commands/find/find_npctype.cpp
+	gm_commands/find/find_object_type.cpp
+	gm_commands/find/find_race.cpp
+	gm_commands/find/find_recipe.cpp
+	gm_commands/find/find_skill.cpp
+	gm_commands/find/find_special_ability.cpp
+	gm_commands/find/find_spell.cpp
+	gm_commands/find/find_stance.cpp
+	gm_commands/find/find_task.cpp
+	gm_commands/find/find_zone.cpp
+)
+
+source_group(set FILES 
+    gm_commands/set/set_aa_exp.cpp
+    gm_commands/set/set_aa_points.cpp
+    gm_commands/set/set_adventure_points.cpp
+    gm_commands/set/set_alternate_currency.cpp
+    gm_commands/set/set_animation.cpp
+    gm_commands/set/set_anon.cpp
+    gm_commands/set/set_auto_login.cpp
+    gm_commands/set/set_bind_point.cpp
+    gm_commands/set/set_checksum.cpp
+    gm_commands/set/set_class_permanent.cpp
+    gm_commands/set/set_crystals.cpp
+    gm_commands/set/set_date.cpp
+    gm_commands/set/set_endurance.cpp
+    gm_commands/set/set_endurance_full.cpp
+    gm_commands/set/set_exp.cpp
+    gm_commands/set/set_flymode.cpp
+    gm_commands/set/set_frozen.cpp
+    gm_commands/set/set_gender.cpp
+    gm_commands/set/set_gender_permanent.cpp
+    gm_commands/set/set_gm.cpp
+    gm_commands/set/set_gm_speed.cpp
+    gm_commands/set/set_gm_status.cpp
+    gm_commands/set/set_god_mode.cpp
+    gm_commands/set/set_haste.cpp
+    gm_commands/set/set_hero_model.cpp
+    gm_commands/set/set_hide_me.cpp
+    gm_commands/set/set_hp.cpp
+    gm_commands/set/set_hp_full.cpp
+    gm_commands/set/set_invulnerable.cpp
+    gm_commands/set/set_language.cpp
+    gm_commands/set/set_last_name.cpp
+    gm_commands/set/set_level.cpp
+    gm_commands/set/set_loginserver_info.cpp
+    gm_commands/set/set_mana.cpp
+    gm_commands/set/set_mana_full.cpp
+    gm_commands/set/set_motd.cpp
+    gm_commands/set/set_name.cpp
+    gm_commands/set/set_ooc_mute.cpp
+    gm_commands/set/set_password.cpp
+    gm_commands/set/set_pvp.cpp
+    gm_commands/set/set_pvp_points.cpp
+    gm_commands/set/set_race.cpp
+    gm_commands/set/set_race_permanent.cpp
+    gm_commands/set/set_server_locked.cpp
+    gm_commands/set/set_skill.cpp
+    gm_commands/set/set_skill_all.cpp
+    gm_commands/set/set_skill_all_max.cpp
+    gm_commands/set/set_start_zone.cpp
+    gm_commands/set/set_temporary_name.cpp
+    gm_commands/set/set_texture.cpp
+    gm_commands/set/set_time.cpp
+    gm_commands/set/set_time_zone.cpp
+    gm_commands/set/set_title.cpp
+    gm_commands/set/set_title_suffix.cpp
+    gm_commands/set/set_weather.cpp
+    gm_commands/set/set_zone.cpp)
+
+source_group(show FILES
+    gm_commands/show/show_aas.cpp
+    gm_commands/show/show_aa_points.cpp
+    gm_commands/show/show_aggro.cpp
+    gm_commands/show/show_auto_login.cpp
+    gm_commands/show/show_buffs.cpp
+    gm_commands/show/show_buried_corpse_count.cpp
+    gm_commands/show/show_client_version_summary.cpp
+    gm_commands/show/show_content_flags.cpp
+    gm_commands/show/show_currencies.cpp
+    gm_commands/show/show_distance.cpp
+    gm_commands/show/show_emotes.cpp
+    gm_commands/show/show_field_of_view.cpp
+    gm_commands/show/show_flags.cpp
+    gm_commands/show/show_group_info.cpp
+    gm_commands/show/show_hatelist.cpp
+    gm_commands/show/show_inventory.cpp
+    gm_commands/show/show_ip_lookup.cpp
+    gm_commands/show/show_keyring.cpp
+    gm_commands/show/show_line_of_sight.cpp
+    gm_commands/show/show_network.cpp
+    gm_commands/show/show_network_stats.cpp
+    gm_commands/show/show_npc_global_loot.cpp
+    gm_commands/show/show_npc_stats.cpp
+    gm_commands/show/show_npc_type.cpp
+    gm_commands/show/show_peqzone_flags.cpp
+    gm_commands/show/show_petition.cpp
+    gm_commands/show/show_petition_info.cpp
+    gm_commands/show/show_proximity.cpp
+    gm_commands/show/show_quest_errors.cpp
+    gm_commands/show/show_quest_globals.cpp
+    gm_commands/show/show_recipe.cpp
+    gm_commands/show/show_server_info.cpp
+    gm_commands/show/show_skills.cpp
+    gm_commands/show/show_spawn_status.cpp
+    gm_commands/show/show_special_abilities.cpp
+    gm_commands/show/show_spells.cpp
+    gm_commands/show/show_spells_list.cpp
+    gm_commands/show/show_stats.cpp
+    gm_commands/show/show_timers.cpp
+    gm_commands/show/show_traps.cpp
+    gm_commands/show/show_uptime.cpp
+    gm_commands/show/show_variable.cpp
+    gm_commands/show/show_version.cpp
+    gm_commands/show/show_waypoints.cpp
+    gm_commands/show/show_who.cpp
+    gm_commands/show/show_xtargets.cpp
+    gm_commands/show/show_zone_data.cpp
+    gm_commands/show/show_zone_global_loot.cpp
+    gm_commands/show/show_zone_loot.cpp
+    gm_commands/show/show_zone_points.cpp
+    gm_commands/show/show_zone_status.cpp
+    gm_commands/show/show_zone_variables.cpp)
+
 add_library(gm_commands_zone STATIC ${gm_command_sources})
 target_link_libraries(gm_commands_zone PRIVATE cereal::cereal fmt::fmt $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> unofficial::libmariadb)
 set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)

zone/gm_commands/CMakeLists.txt

@@ -0,0 +1,169 @@
+cmake_minimum_required(VERSION 3.20)
+
+# gm commands
+set(gm_command_sources
+    command.cpp
+    bot_command.cpp
+    gm_commands/acceptrules.cpp
+    gm_commands/advnpcspawn.cpp
+    gm_commands/aggrozone.cpp
+    gm_commands/ai.cpp
+    gm_commands/appearance.cpp
+    gm_commands/appearanceeffects.cpp
+    gm_commands/attack.cpp
+    gm_commands/augmentitem.cpp
+    gm_commands/ban.cpp
+    gm_commands/bugs.cpp
+    gm_commands/camerashake.cpp
+    gm_commands/castspell.cpp
+    gm_commands/chat.cpp
+    gm_commands/clearxtargets.cpp
+    gm_commands/copycharacter.cpp
+    gm_commands/corpse.cpp
+    gm_commands/corpsefix.cpp
+    gm_commands/countitem.cpp
+    gm_commands/damage.cpp
+    gm_commands/databuckets.cpp
+    gm_commands/dbspawn2.cpp
+    gm_commands/delacct.cpp
+    gm_commands/delpetition.cpp
+    gm_commands/depop.cpp
+    gm_commands/depopzone.cpp
+    gm_commands/devtools.cpp
+    gm_commands/disablerecipe.cpp
+    gm_commands/disarmtrap.cpp
+    gm_commands/doanim.cpp
+    gm_commands/door.cpp
+    gm_commands/door_manipulation.cpp
+    gm_commands/dye.cpp
+    gm_commands/dz.cpp
+    gm_commands/dzkickplayers.cpp
+    gm_commands/editmassrespawn.cpp
+    gm_commands/emote.cpp
+    gm_commands/emptyinventory.cpp
+    gm_commands/enablerecipe.cpp
+    gm_commands/entityvariable.cpp
+    gm_commands/exptoggle.cpp
+    gm_commands/faction.cpp
+    gm_commands/evolving_items.cpp
+    gm_commands/feature.cpp
+    gm_commands/find.cpp
+    gm_commands/fish.cpp
+    gm_commands/fixmob.cpp
+    gm_commands/flagedit.cpp
+    gm_commands/fleeinfo.cpp
+    gm_commands/forage.cpp
+    gm_commands/gearup.cpp
+    gm_commands/giveitem.cpp
+    gm_commands/givemoney.cpp
+    gm_commands/gmzone.cpp
+    gm_commands/goto.cpp
+    gm_commands/grantaa.cpp
+    gm_commands/grid.cpp
+    gm_commands/guild.cpp
+    gm_commands/hp.cpp
+    gm_commands/illusion_block.cpp
+    gm_commands/instance.cpp
+    gm_commands/interrogateinv.cpp
+    gm_commands/interrupt.cpp
+    gm_commands/invsnapshot.cpp
+    gm_commands/ipban.cpp
+    gm_commands/kick.cpp
+    gm_commands/kill.cpp
+    gm_commands/killallnpcs.cpp
+    gm_commands/list.cpp
+    gm_commands/lootsim.cpp
+    gm_commands/loc.cpp
+    gm_commands/logs.cpp
+    gm_commands/makepet.cpp
+    gm_commands/memspell.cpp
+    gm_commands/merchantshop.cpp
+    gm_commands/modifynpcstat.cpp
+    gm_commands/movechar.cpp
+    gm_commands/movement.cpp
+    gm_commands/myskills.cpp
+    gm_commands/mysql.cpp
+    gm_commands/mystats.cpp
+    gm_commands/npccast.cpp
+    gm_commands/npcedit.cpp
+    gm_commands/npceditmass.cpp
+    gm_commands/npcemote.cpp
+    gm_commands/npcloot.cpp
+    gm_commands/npcsay.cpp
+    gm_commands/npcshout.cpp
+    gm_commands/npcspawn.cpp
+    gm_commands/npctypespawn.cpp
+    gm_commands/nudge.cpp
+    gm_commands/nukebuffs.cpp
+    gm_commands/nukeitem.cpp
+    gm_commands/object.cpp
+    gm_commands/object_manipulation.cpp
+    gm_commands/parcels.cpp
+    gm_commands/path.cpp
+    gm_commands/peqzone.cpp
+    gm_commands/petitems.cpp
+    gm_commands/petname.cpp
+    gm_commands/picklock.cpp
+    gm_commands/profanity.cpp
+    gm_commands/push.cpp
+    gm_commands/raidloot.cpp
+    gm_commands/randomfeatures.cpp
+    gm_commands/refreshgroup.cpp
+    gm_commands/reload.cpp
+    gm_commands/removeitem.cpp
+    gm_commands/repop.cpp
+    gm_commands/resetaa.cpp
+    gm_commands/resetaa_timer.cpp
+    gm_commands/resetdisc_timer.cpp
+    gm_commands/revoke.cpp
+    gm_commands/roambox.cpp
+    gm_commands/rules.cpp
+    gm_commands/save.cpp
+    gm_commands/scale.cpp
+    gm_commands/scribespell.cpp
+    gm_commands/scribespells.cpp
+    gm_commands/sendzonespawns.cpp
+    gm_commands/sensetrap.cpp
+    gm_commands/serverrules.cpp
+    gm_commands/set.cpp
+    gm_commands/show.cpp
+    gm_commands/shutdown.cpp
+    gm_commands/spawn.cpp
+    gm_commands/spawneditmass.cpp
+    gm_commands/spawnfix.cpp
+    gm_commands/faction_association.cpp
+    gm_commands/stun.cpp
+    gm_commands/summon.cpp
+    gm_commands/summonburiedplayercorpse.cpp
+    gm_commands/summonitem.cpp
+    gm_commands/suspend.cpp
+    gm_commands/suspendmulti.cpp
+    gm_commands/takeplatinum.cpp
+    gm_commands/task.cpp
+    gm_commands/traindisc.cpp
+    gm_commands/tune.cpp
+    gm_commands/undye.cpp
+    gm_commands/unmemspell.cpp
+    gm_commands/unmemspells.cpp
+    gm_commands/unscribespell.cpp
+    gm_commands/unscribespells.cpp
+    gm_commands/untraindisc.cpp
+    gm_commands/untraindiscs.cpp
+    gm_commands/wc.cpp
+    gm_commands/worldshutdown.cpp
+    gm_commands/worldwide.cpp
+    gm_commands/wp.cpp
+    gm_commands/wpadd.cpp
+    gm_commands/zone.cpp
+    gm_commands/zonebootup.cpp
+    gm_commands/zoneshutdown.cpp
+    gm_commands/zonevariable.cpp
+    gm_commands/zone_instance.cpp
+    gm_commands/zone_shard.cpp
+    gm_commands/zsave.cpp
+)
+
+add_library(gm_commands_zone STATIC ${gm_command_sources})
+target_link_libraries(gm_commands_zone PRIVATE common)
+set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
+

zone/gm_commands/find.cpp

@@ -1,29 +1,30 @@
 #include "../client.h"
-#include "find/aa.cpp"
-#include "find/account.cpp"
-#include "find/body_type.cpp"
-#include "find/bot.cpp"
-#include "find/bug_category.cpp"
-#include "find/character.cpp"
-#include "find/class.cpp"
-#include "find/comparison_type.cpp"
-#include "find/currency.cpp"
-#include "find/deity.cpp"
-#include "find/emote.cpp"
-#include "find/faction.cpp"
-#include "find/item.cpp"
-#include "find/language.cpp"
-#include "find/ldon_theme.cpp"
-#include "find/npctype.cpp"
-#include "find/object_type.cpp"
-#include "find/race.cpp"
-#include "find/recipe.cpp"
-#include "find/skill.cpp"
-#include "find/stance.cpp"
-#include "find/spell.cpp"
-#include "find/special_ability.cpp"
-#include "find/task.cpp"
-#include "find/zone.cpp"
+
+void FindAA(Client* c, const Seperator* sep);
+void FindAccount(Client* c, const Seperator* sep);
+void FindBodyType(Client* c, const Seperator* sep);
+void FindBot(Client* c, const Seperator* sep);
+void FindBugCategory(Client* c, const Seperator* sep);
+void FindCharacter(Client* c, const Seperator* sep);
+void FindClass(Client* c, const Seperator* sep);
+void FindComparisonType(Client* c, const Seperator* sep);
+void FindCurrency(Client* c, const Seperator* sep);
+void FindDeity(Client* c, const Seperator* sep);
+void FindEmote(Client* c, const Seperator* sep);
+void FindFaction(Client* c, const Seperator* sep);
+void FindItem(Client* c, const Seperator* sep);
+void FindLanguage(Client* c, const Seperator* sep);
+void FindLDoNTheme(Client* c, const Seperator* sep);
+void FindNPCType(Client* c, const Seperator* sep);
+void FindObjectType(Client* c, const Seperator* sep);
+void FindRace(Client* c, const Seperator* sep);
+void FindRecipe(Client* c, const Seperator* sep);
+void FindSkill(Client* c, const Seperator* sep);
+void FindSpecialAbility(Client* c, const Seperator* sep);
+void FindStance(Client* c, const Seperator* sep);
+void FindSpell(Client* c, const Seperator* sep);
+void FindTask(Client* c, const Seperator* sep);
+void FindZone(Client* c, const Seperator* sep);
 
 void command_find(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_account.cpp

@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/account_repository.h"
+#include "../../../common/repositories/account_repository.h"
 
 void FindAccount(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_bot.cpp

@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/bot_data_repository.h"
+#include "../../../common/repositories/bot_data_repository.h"
 
 void FindBot(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_character.cpp

@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/character_data_repository.h"
+#include "../../../common/repositories/character_data_repository.h"
 
 void FindCharacter(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_item.cpp

@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/items_repository.h"
+#include "../../../common/repositories/items_repository.h"
 
 void FindItem(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_recipe.cpp

@@ -1,6 +1,6 @@
 #include "../../client.h"
 #include "../../command.h"
-#include "../../common/repositories/tradeskill_recipe_repository.h"
+#include "../../../common/repositories/tradeskill_recipe_repository.h"
 
 void FindRecipe(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_zone.cpp

@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/content/world_content_service.h"
+#include "../../../common/content/world_content_service.h"
 
 void FindZone(Client* c, const Seperator* sep)
 {

zone/gm_commands/set.cpp

@@ -1,60 +1,61 @@
 #include "../client.h"
-#include "set/aa_exp.cpp"
-#include "set/aa_points.cpp"
-#include "set/adventure_points.cpp"
-#include "set/alternate_currency.cpp"
-#include "set/animation.cpp"
-#include "set/anon.cpp"
-#include "set/auto_login.cpp"
-#include "set/bind_point.cpp"
-#include "set/checksum.cpp"
-#include "set/class_permanent.cpp"
-#include "set/crystals.cpp"
-#include "set/date.cpp"
-#include "set/endurance.cpp"
-#include "set/endurance_full.cpp"
-#include "set/exp.cpp"
-#include "set/flymode.cpp"
-#include "set/frozen.cpp"
-#include "set/gender.cpp"
-#include "set/gender_permanent.cpp"
-#include "set/gm.cpp"
-#include "set/gm_speed.cpp"
-#include "set/gm_status.cpp"
-#include "set/god_mode.cpp"
-#include "set/haste.cpp"
-#include "set/hero_model.cpp"
-#include "set/hide_me.cpp"
-#include "set/hp.cpp"
-#include "set/hp_full.cpp"
-#include "set/invulnerable.cpp"
-#include "set/language.cpp"
-#include "set/last_name.cpp"
-#include "set/level.cpp"
-#include "set/loginserver_info.cpp"
-#include "set/mana.cpp"
-#include "set/mana_full.cpp"
-#include "set/motd.cpp"
-#include "set/name.cpp"
-#include "set/ooc_mute.cpp"
-#include "set/password.cpp"
-#include "set/pvp.cpp"
-#include "set/pvp_points.cpp"
-#include "set/race.cpp"
-#include "set/race_permanent.cpp"
-#include "set/server_locked.cpp"
-#include "set/skill.cpp"
-#include "set/skill_all.cpp"
-#include "set/skill_all_max.cpp"
-#include "set/start_zone.cpp"
-#include "set/temporary_name.cpp"
-#include "set/texture.cpp"
-#include "set/time.cpp"
-#include "set/time_zone.cpp"
-#include "set/title.cpp"
-#include "set/title_suffix.cpp"
-#include "set/weather.cpp"
-#include "set/zone.cpp"
+
+void SetAAEXP(Client *c, const Seperator *sep);
+void SetAAPoints(Client *c, const Seperator *sep);
+void SetAdventurePoints(Client *c, const Seperator *sep);
+void SetAlternateCurrency(Client *c, const Seperator *sep);
+void SetAnimation(Client *c, const Seperator *sep);
+void SetAnon(Client *c, const Seperator *sep);
+void SetAutoLogin(Client *c, const Seperator *sep);
+void SetBindPoint(Client *c, const Seperator *sep);
+void SetChecksum(Client *c, const Seperator *sep);
+void SetClassPermanent(Client *c, const Seperator *sep);
+void SetCrystals(Client *c, const Seperator *sep);
+void SetDate(Client *c, const Seperator *sep);
+void SetEndurance(Client *c, const Seperator *sep);
+void SetEnduranceFull(Client *c, const Seperator *sep);
+void SetEXP(Client *c, const Seperator *sep);
+void SetFlymode(Client *c, const Seperator *sep);
+void SetFrozen(Client *c, const Seperator *sep);
+void SetGender(Client *c, const Seperator *sep);
+void SetGenderPermanent(Client *c, const Seperator *sep);
+void SetGM(Client *c, const Seperator *sep);
+void SetGMSpeed(Client *c, const Seperator *sep);
+void SetGMStatus(Client *c, const Seperator *sep);
+void SetGodMode(Client *c, const Seperator *sep);
+void SetHaste(Client *c, const Seperator *sep);
+void SetHideMe(Client *c, const Seperator *sep);
+void SetHeroModel(Client *c, const Seperator *sep);
+void SetHP(Client *c, const Seperator *sep);
+void SetHPFull(Client *c, const Seperator *sep);
+void SetInvulnerable(Client *c, const Seperator *sep);
+void SetLanguage(Client *c, const Seperator *sep);
+void SetLastName(Client *c, const Seperator *sep);
+void SetLevel(Client *c, const Seperator *sep);
+void SetLoginserverInfo(Client *c, const Seperator *sep);
+void SetMana(Client *c, const Seperator *sep);
+void SetManaFull(Client *c, const Seperator *sep);
+void SetMOTD(Client *c, const Seperator *sep);
+void SetName(Client *c, const Seperator *sep);
+void SetOOCMute(Client *c, const Seperator *sep);
+void SetPassword(Client *c, const Seperator *sep);
+void SetPVP(Client *c, const Seperator *sep);
+void SetPVPPoints(Client *c, const Seperator *sep);
+void SetRace(Client *c, const Seperator *sep);
+void SetRacePermanent(Client *c, const Seperator *sep);
+void SetServerLocked(Client *c, const Seperator *sep);
+void SetSkill(Client *c, const Seperator *sep);
+void SetSkillAll(Client *c, const Seperator *sep);
+void SetSkillAllMax(Client *c, const Seperator *sep);
+void SetStartZone(Client *c, const Seperator *sep);
+void SetTemporaryName(Client *c, const Seperator *sep);
+void SetTexture(Client *c, const Seperator *sep);
+void SetTime(Client *c, const Seperator *sep);
+void SetTimeZone(Client *c, const Seperator *sep);
+void SetTitle(Client *c, const Seperator *sep);
+void SetTitleSuffix(Client *c, const Seperator *sep);
+void SetWeather(Client *c, const Seperator *sep);
+void SetZoneData(Client *c, const Seperator *sep);
 
 void command_set(Client *c, const Seperator *sep)
 {

zone/gm_commands/show.cpp

@@ -1,56 +1,57 @@
 #include "../client.h"
-#include "show/aas.cpp"
-#include "show/aa_points.cpp"
-#include "show/aggro.cpp"
-#include "show/auto_login.cpp"
-#include "show/buffs.cpp"
-#include "show/buried_corpse_count.cpp"
-#include "show/client_version_summary.cpp"
-#include "show/content_flags.cpp"
-#include "show/currencies.cpp"
-#include "show/distance.cpp"
-#include "show/emotes.cpp"
-#include "show/field_of_view.cpp"
-#include "show/flags.cpp"
-#include "show/group_info.cpp"
-#include "show/hatelist.cpp"
-#include "show/inventory.cpp"
-#include "show/keyring.cpp"
-#include "show/ip_lookup.cpp"
-#include "show/line_of_sight.cpp"
-#include "show/network.cpp"
-#include "show/network_stats.cpp"
-#include "show/npc_global_loot.cpp"
-#include "show/npc_stats.cpp"
-#include "show/npc_type.cpp"
-#include "show/peqzone_flags.cpp"
-#include "show/petition.cpp"
-#include "show/petition_info.cpp"
-#include "show/proximity.cpp"
-#include "show/quest_errors.cpp"
-#include "show/quest_globals.cpp"
-#include "show/recipe.cpp"
-#include "show/server_info.cpp"
-#include "show/skills.cpp"
-#include "show/spawn_status.cpp"
-#include "show/special_abilities.cpp"
-#include "show/spells.cpp"
-#include "show/spells_list.cpp"
-#include "show/stats.cpp"
-#include "show/timers.cpp"
-#include "show/traps.cpp"
-#include "show/uptime.cpp"
-#include "show/variable.cpp"
-#include "show/version.cpp"
-#include "show/waypoints.cpp"
-#include "show/who.cpp"
-#include "show/xtargets.cpp"
-#include "show/zone_data.cpp"
-#include "show/zone_global_loot.cpp"
-#include "show/zone_loot.cpp"
-#include "show/zone_points.cpp"
-#include "show/zone_status.cpp"
-#include "show/zone_variables.cpp"
+
+void ShowAAs(Client* c, const Seperator* sep);
+void ShowAAPoints(Client* c, const Seperator* sep);
+void ShowAggro(Client* c, const Seperator* sep);
+void ShowAutoLogin(Client* c, const Seperator* sep);
+void ShowBuffs(Client* c, const Seperator* sep);
+void ShowBuriedCorpseCount(Client* c, const Seperator* sep);
+void ShowClientVersionSummary(Client* c, const Seperator* sep);
+void ShowContentFlags(Client* c, const Seperator* sep);
+void ShowCurrencies(Client* c, const Seperator* sep);
+void ShowDistance(Client* c, const Seperator* sep);
+void ShowEmotes(Client* c, const Seperator* sep);
+void ShowFieldOfView(Client* c, const Seperator* sep);
+void ShowFlags(Client* c, const Seperator* sep);
+void ShowGroupInfo(Client* c, const Seperator* sep);
+void ShowHateList(Client* c, const Seperator* sep);
+void ShowInventory(Client* c, const Seperator* sep);
+void ShowIPLookup(Client* c, const Seperator* sep);
+void ShowKeyring(Client* c, const Seperator* sep);
+void ShowLineOfSight(Client* c, const Seperator* sep);
+void ShowNetwork(Client* c, const Seperator* sep);
+void ShowNetworkStats(Client* c, const Seperator* sep);
+void ShowNPCGlobalLoot(Client* c, const Seperator* sep);
+void ShowNPCStats(Client* c, const Seperator* sep);
+void ShowNPCType(Client* c, const Seperator* sep);
+void ShowPEQZoneFlags(Client* c, const Seperator* sep);
+void ShowPetition(Client* c, const Seperator* sep);
+void ShowPetitionInfo(Client* c, const Seperator* sep);
+void ShowProximity(Client* c, const Seperator* sep);
+void ShowQuestErrors(Client* c, const Seperator* sep);
+void ShowQuestGlobals(Client* c, const Seperator* sep);
+void ShowRecipe(Client* c, const Seperator* sep);
+void ShowServerInfo(Client* c, const Seperator* sep);
+void ShowSkills(Client* c, const Seperator* sep);
+void ShowSpawnStatus(Client* c, const Seperator* sep);
+void ShowSpecialAbilities(Client* c, const Seperator* sep);
+void ShowSpells(Client* c, const Seperator* sep);
+void ShowSpellsList(Client* c, const Seperator* sep);
+void ShowStats(Client* c, const Seperator* sep);
+void ShowTimers(Client* c, const Seperator* sep);
+void ShowTraps(Client* c, const Seperator* sep);
+void ShowUptime(Client* c, const Seperator* sep);
+void ShowVariable(Client* c, const Seperator* sep);
+void ShowVersion(Client* c, const Seperator* sep);
+void ShowWaypoints(Client* c, const Seperator* sep);
+void ShowWho(Client* c, const Seperator* sep);
+void ShowXTargets(Client* c, const Seperator* sep);
+void ShowZoneData(Client* c, const Seperator* sep);
+void ShowZoneGlobalLoot(Client* c, const Seperator* sep);
+void ShowZoneLoot(Client* c, const Seperator* sep);
+void ShowZonePoints(Client* c, const Seperator* sep);
+void ShowZoneStatus(Client* c, const Seperator* sep);
+void ShowZoneVariables(Client* c, const Seperator* sep);
 
 void command_show(Client *c, const Seperator *sep)
 {