[Cleanup] Make use of AccountStatus constants wherever status is checked or used. (#1764)

* [Cleanup] Make use of AccountStatus constants wherever status is checked or used. - Cleanup all instances of SendEmoteMessage. - Cleanup all instances of SendEmoteMessageRaw. - Cleanup all instances of MessageStatus. - Convert Quest API method defaults to use constants. * Cleanup constant names.
2026-05-18 16:38:26 +00:00 · 2021-11-14 22:01:13 -05:00
parent 5d75b7b365
commit 293361a1f7
38 changed files with 1369 additions and 870 deletions
@@ -162,310 +162,310 @@ int command_init(void)
 	commandaliases.clear();

 	if (
-		command_add("acceptrules", "[acceptrules] - Accept the EQEmu Agreement", 0, command_acceptrules) ||
-		command_add("advnpcspawn", "[maketype|makegroup|addgroupentry|addgroupspawn][removegroupspawn|movespawn|editgroupbox|cleargroupbox]", 150, command_advnpcspawn) ||
-		command_add("aggro", "(range) [-v] - Display aggro information for all mobs 'range' distance from your target. -v is verbose faction info.", 80, command_aggro) ||
-		command_add("aggrozone", "[aggro] - Aggro every mob in the zone with X aggro. Default is 0. Not recommend if you're not invulnerable.", 100, command_aggrozone) ||
-		command_add("ai", "[factionid/spellslist/con/guard/roambox/stop/start] - Modify AI on NPC target", 100, command_ai) ||
-		command_add("appearance", "[type] [value] - Send an appearance packet for you or your target", 150, command_appearance) ||
-		command_add("apply_shared_memory", "[shared_memory_name] - Tells every zone and world to apply a specific shared memory segment by name.", 250, command_apply_shared_memory) ||
-		command_add("attack", "[targetname] - Make your NPC target attack targetname", 150, command_attack) ||
-		command_add("augmentitem",  "Force augments an item. Must have the augment item window open.",  250, command_augmentitem) ||
-		command_add("ban", "[name] [reason]- Ban by character name", 150, command_ban) ||
-		command_add("beard", "- Change the beard of your target", 80, command_beard) ||
-		command_add("beardcolor", "- Change the beard color of your target", 80, command_beardcolor) ||
-		command_add("bestz", "- Ask map for a good Z coord for your x,y coords.", 0, command_bestz) ||
-		command_add("bind", "- Sets your targets bind spot to their current location", 200, command_bind) ||
+		command_add("acceptrules", "[acceptrules] - Accept the EQEmu Agreement", AccountStatus::Player, command_acceptrules) ||
+		command_add("advnpcspawn", "[maketype|makegroup|addgroupentry|addgroupspawn][removegroupspawn|movespawn|editgroupbox|cleargroupbox]", AccountStatus::GMLeadAdmin, command_advnpcspawn) ||
+		command_add("aggro", "(range) [-v] - Display aggro information for all mobs 'range' distance from your target. -v is verbose faction info.", AccountStatus::QuestTroupe, command_aggro) ||
+		command_add("aggrozone", "[aggro] - Aggro every mob in the zone with X aggro. Default is 0. Not recommend if you're not invulnerable.", AccountStatus::GMAdmin, command_aggrozone) ||
+		command_add("ai", "[factionid/spellslist/con/guard/roambox/stop/start] - Modify AI on NPC target", AccountStatus::GMAdmin, command_ai) ||
+		command_add("appearance", "[type] [value] - Send an appearance packet for you or your target", AccountStatus::GMLeadAdmin, command_appearance) ||
+		command_add("apply_shared_memory", "[shared_memory_name] - Tells every zone and world to apply a specific shared memory segment by name.", AccountStatus::GMImpossible, command_apply_shared_memory) ||
+		command_add("attack", "[targetname] - Make your NPC target attack targetname", AccountStatus::GMLeadAdmin, command_attack) ||
+		command_add("augmentitem",  "Force augments an item. Must have the augment item window open.", AccountStatus::GMImpossible, command_augmentitem) ||
+		command_add("ban", "[name] [reason]- Ban by character name", AccountStatus::GMLeadAdmin, command_ban) ||
+		command_add("beard", "- Change the beard of your target", AccountStatus::QuestTroupe, command_beard) ||
+		command_add("beardcolor", "- Change the beard color of your target", AccountStatus::QuestTroupe, command_beardcolor) ||
+		command_add("bestz", "- Ask map for a good Z coord for your x,y coords.", AccountStatus::Player, command_bestz) ||
+		command_add("bind", "- Sets your targets bind spot to their current location", AccountStatus::GMMgmt, command_bind) ||

 #ifdef BOTS
-		command_add("bot", "- Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", 0, command_bot) ||
+		command_add("bot", "- Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", AccountStatus::Player, command_bot) ||
 #endif

-		command_add("camerashake",  "Shakes the camera on everyone's screen globally.",  80, command_camerashake) ||
-		command_add("castspell", "[Spell ID] [Instant (0 = False, 1 = True, Default is 1 if Unused)] - Cast a spell", 50, command_castspell) ||
-		command_add("chat", "[channel num] [message] - Send a channel message to all zones", 200, command_chat) ||
-		command_add("checklos", "- Check for line of sight to your target", 50, command_checklos) ||
-		command_add("copycharacter", "[source_char_name] [dest_char_name] [dest_account_name] Copies character to destination account", 250, command_copycharacter) ||
-		command_add("corpse", "- Manipulate corpses, use with no arguments for help", 50, command_corpse) ||
-		command_add("corpsefix", "Attempts to bring corpses from underneath the ground within close proximity of the player", 0, command_corpsefix) ||
-		command_add("cvs", "- Summary of client versions currently online.", 200, command_cvs) ||
-		command_add("damage", "[amount] - Damage your target", 100, command_damage) ||
-		command_add("databuckets", "View|Delete [key] [limit]- View data buckets, limit 50 default or Delete databucket by key", 80, command_databuckets) ||
-		command_add("date", "[yyyy] [mm] [dd] [HH] [MM] - Set EQ time", 90, command_date) ||
-		command_add("dbspawn2", "[spawngroup] [respawn] [variance] - Spawn an NPC from a predefined row in the spawn2 table", 100, command_dbspawn2) ||
-		command_add("delacct", "[accountname] - Delete an account", 150, command_delacct) ||
-		command_add("deletegraveyard", "[zone name] - Deletes the graveyard for the specified zone.",  200, command_deletegraveyard) ||
-		command_add("delpetition", "[petition number] - Delete a petition", 20, command_delpetition) ||
-		command_add("depop", "- Depop your NPC target", 50, command_depop) ||
-		command_add("depopzone", "- Depop the zone", 100, command_depopzone) ||
-		command_add("devtools", "- Manages devtools", 200, command_devtools) ||
-		command_add("details", "- Change the details of your target (Drakkin Only)", 80, command_details) ||
-		command_add("disablerecipe",  "[recipe_id] - Disables a recipe using the recipe id.",  80, command_disablerecipe) ||
-		command_add("disarmtrap",  "Analog for ldon disarm trap for the newer clients since we still don't have it working.", 80, command_disarmtrap) ||
-		command_add("distance", "- Reports the distance between you and your target.",  80, command_distance) ||
-		command_add("door", "Door editing command", 80, command_door) ||
-		command_add("doanim", "[animnum] [type] - Send an EmoteAnim for you or your target", 50, command_doanim) ||
-		command_add("dye", "[slot|'help'] [red] [green] [blue] [use_tint] - Dyes the specified armor slot to Red, Green, and Blue provided, allows you to bypass darkness limits.", 20, command_dye) ||
-		command_add("dz", "Manage expeditions and dynamic zone instances", 80, command_dz) ||
-		command_add("dzkickplayers", "Removes all players from current expedition. (/kickplayers alternative for pre-RoF clients)", 0, command_dzkickplayers) ||
-		command_add("editmassrespawn", "[name-search] [second-value] - Mass (Zone wide) NPC respawn timer editing command", 100, command_editmassrespawn) ||
-		command_add("emote", "['name'/'world'/'zone'] [type] [message] - Send an emote message", 80, command_emote) ||
-		command_add("emotesearch", "Searches NPC Emotes", 80, command_emotesearch) ||
-		command_add("emoteview", "Lists all NPC Emotes", 80, command_emoteview) ||
-		command_add("emptyinventory", "- Clears you or your target's entire inventory (Equipment, General, Bank, and Shared Bank)", 250, command_emptyinventory) ||
-		command_add("enablerecipe",  "[recipe_id] - Enables a recipe using the recipe id.",  80, command_enablerecipe) ||
-		command_add("endurance", "Restores you or your target's endurance.", 50, command_endurance) ||
-		command_add("equipitem", "[slotid(0-21)] - Equip the item on your cursor into the specified slot", 50, command_equipitem) ||
-		command_add("face", "- Change the face of your target", 80, command_face) ||
-		command_add("faction", "[Find (criteria | all ) | Review (criteria | all) | Reset (id)] - Resets Player's Faction", 80, command_faction) ||
-		command_add("findaliases", "[search criteria]- Searches for available command aliases, by alias or command", 0, command_findaliases) ||
-		command_add("findclass", "[search criteria] - Search for a class", 50, command_findclass) ||
-		command_add("findfaction", "[search criteria] - Search for a faction", 50, command_findfaction) ||
-		command_add("findnpctype", "[search criteria] - Search database NPC types", 100, command_findnpctype) ||
-		command_add("findrace", "[search criteria] - Search for a race", 50, command_findrace) ||
-		command_add("findskill", "[search criteria] - Search for a skill", 50, command_findskill) ||
-		command_add("findspell", "[search criteria] - Search for a spell", 50, command_findspell) ||
-		command_add("findtask", "[search criteria] - Search for a task", 50, command_findtask) ||
-		command_add("findzone", "[search criteria] - Search database zones", 100, command_findzone) ||
-		command_add("fixmob", "[race|gender|texture|helm|face|hair|haircolor|beard|beardcolor|heritage|tattoo|detail] [next|prev] - Manipulate appearance of your target", 80, command_fixmob) ||
-		command_add("flag", "[status] [acctname] - Refresh your admin status, or set an account's admin status if arguments provided", 0, command_flag) ||
-		command_add("flagedit", "- Edit zone flags on your target", 100, command_flagedit) ||
-		command_add("flags", "- displays the flags of you or your target", 0, command_flags) ||
-		command_add("flymode", "[0/1/2/3/4/5] - Set your or your player target's flymode to ground/flying/levitate/water/floating/levitate_running", 50, command_flymode) ||
-		command_add("fov", "- Check wether you're behind or in your target's field of view", 80, command_fov) ||
-		command_add("freeze", "- Freeze your target", 80, command_freeze) ||
-		command_add("gassign", "[id] - Assign targetted NPC to predefined wandering grid id", 100, command_gassign) ||
-		command_add("gearup", "Developer tool to quickly equip a character", 200, command_gearup) ||
-		command_add("gender", "[0/1/2] - Change your or your target's gender to male/female/neuter", 50, command_gender) ||
-		command_add("getplayerburiedcorpsecount", "- Get the target's total number of buried player corpses.",  100, command_getplayerburiedcorpsecount) ||
-		command_add("getvariable", "[varname] - Get the value of a variable from the database", 200, command_getvariable) ||
-		command_add("ginfo", "- get group info on target.", 20, command_ginfo) ||
-		command_add("giveitem", "[itemid] [charges] - Summon an item onto your target's cursor. Charges are optional.", 200, command_giveitem) ||
-		command_add("givemoney", "[pp] [gp] [sp] [cp] - Gives specified amount of money to the target player.", 200, command_givemoney) ||
-		command_add("globalview", "Lists all qglobals in cache if you were to do a quest with this target.", 80, command_globalview) ||
-		command_add("gm", "- Turn player target's or your GM flag on or off", 80, command_gm) ||
-		command_add("gmspeed", "[on/off] - Turn GM speed hack on/off for you or your player target", 100, command_gmspeed) ||
-		command_add("gmzone", "[zone_short_name] [zone_version=0] [identifier=gmzone] - Zones to a private GM instance", 100, command_gmzone) ||
-		command_add("goto", "[playername] or [x y z] [h] - Teleport to the provided coordinates or to your target", 10, command_goto) ||
-		command_add("grid", "[add/delete] [grid_num] [wandertype] [pausetype] - Create/delete a wandering grid", 170, command_grid) ||
-		command_add("guild", "- Guild manipulation commands. Use argument help for more info.", 10, command_guild) ||
-		command_add("guildapprove", "[guildapproveid] - Approve a guild with specified ID (guild creator receives the id)", 0, command_guildapprove) ||
-		command_add("guildcreate", "[guildname] - Creates an approval setup for guild name specified", 0, command_guildcreate) ||
-		command_add("guildlist", "[guildapproveid] - Lists character names who have approved the guild specified by the approve id", 0, command_guildlist) ||
-		command_add("hair", "- Change the hair style of your target", 80, command_hair) ||
-		command_add("haircolor", "- Change the hair color of your target", 80, command_haircolor) ||
-		command_add("haste", "[percentage] - Set your haste percentage", 100, command_haste) ||
-		command_add("hatelist", " - Display hate list for target.",  80, command_hatelist) ||
-		command_add("heal", "- Completely heal your target", 10, command_heal) ||
-		command_add("helm", "- Change the helm of your target", 80, command_helm) ||
-		command_add("help", "[search term] - List available commands and their description, specify partial command as argument to search", 0, command_help) ||
-		command_add("heritage", "- Change the heritage of your target (Drakkin Only)", 80, command_heritage) ||
-		command_add("heromodel",  "[hero model] [slot] - Full set of Hero's Forge Armor appearance. If slot is set, sends exact model just to slot.",  200, command_heromodel) ||
-		command_add("hideme", "[on/off] - Hide yourself from spawn lists.", 80, command_hideme) ||
-		command_add("hotfix", "[hotfix_name] - Reloads shared memory into a hotfix, equiv to load_shared_memory followed by apply_shared_memory", 250, command_hotfix) ||
-		command_add("hp", "- Refresh your HP bar from the server.", 0, command_hp) ||
-		command_add("incstat", "- Increases or Decreases a client's stats permanently.", 200, command_incstat) ||
-		command_add("instance", "- Modify Instances", 200, command_instance) ||
-		command_add("interrogateinv", "- use [help] argument for available options", 0, command_interrogateinv) ||
-		command_add("interrupt", "[message id] [color] - Interrupt your casting. Arguments are optional.", 50, command_interrupt) ||
-		command_add("invsnapshot", "- Manipulates inventory snapshots for your current target", 80, command_invsnapshot) ||
-		command_add("invul", "[on/off] - Turn player target's or your invulnerable flag on or off", 80, command_invul) ||
-		command_add("ipban", "[IP address] - Ban IP by character name", 200, command_ipban) ||
-		command_add("iplookup", "[charname] - Look up IP address of charname", 200, command_iplookup) ||
-		command_add("iteminfo", "- Get information about the item on your cursor", 10, command_iteminfo) ||
-		command_add("itemsearch", "[search criteria] - Search for an item", 10, command_itemsearch) ||
-		command_add("kick", "[charname] - Disconnect charname", 150, command_kick) ||
-		command_add("kill", "- Kill your target", 100, command_kill) ||
-		command_add("killallnpcs", " [npc_name] Kills all npcs by search name, leave blank for all attackable NPC's", 200, command_killallnpcs) ||
-		command_add("lastname", "[new lastname] - Set your or your player target's lastname", 50, command_lastname) ||
-		command_add("level", "[level] - Set your or your target's level", 10, command_level) ||
-		command_add("list", "[npcs|players|corpses|doors|objects] [search] - Search entities", 20, command_list) ||
-		command_add("listpetition", "- List petitions", 50, command_listpetition) ||
-		command_add("load_shared_memory", "[shared_memory_name] - Reloads shared memory and uses the input as output", 250, command_load_shared_memory) ||
-		command_add("loc", "- Print out your or your target's current location and heading", 0, command_loc) ||
-		command_add("lock", "- Lock the worldserver", 150, command_lock) ||
-		command_add("logs",  "Manage anything to do with logs",  250, command_logs) ||
-		command_add("makepet", "[level] [class] [race] [texture] - Make a pet", 50, command_makepet) ||
-		command_add("mana", "- Fill your or your target's mana", 50, command_mana) ||
-		command_add("maxskills", "Maxes skills for you.", 200, command_max_all_skills) ||
-		command_add("memspell", "[slotid] [spellid] - Memorize spellid in the specified slot", 50, command_memspell) ||
-		command_add("merchant_close_shop",  "Closes a merchant shop",  100, command_merchantcloseshop) ||
-		command_add("merchant_open_shop",  "Opens a merchants shop",  100, command_merchantopenshop) ||
-		command_add("modifynpcstat", "- Modifys a NPC's stats", 150, command_modifynpcstat) ||
-		command_add("motd", "[new motd] - Set message of the day", 150, command_motd) ||
-		command_add("movechar", "[charname] [zonename] - Move charname to zonename", 50, command_movechar) ||
-		command_add("movement", "Various movement commands", 200, command_movement) ||
-		command_add("myskills", "- Show details about your current skill levels", 0, command_myskills) ||
-		command_add("mysql", "Mysql CLI, see 'help' for options.", 250, command_mysql) ||
-		command_add("mystats", "- Show details about you or your pet", 50, command_mystats) ||
-		command_add("name", "[newname] - Rename your player target", 150, command_name) ||
-		command_add("netstats", "- Gets the network stats for a stream.", 200, command_netstats) ||
-		command_add("network", "- Admin commands for the udp network interface.", 250, command_network) ||
-		command_add("npccast", "[targetname/entityid] [spellid] - Causes NPC target to cast spellid on targetname/entityid", 80, command_npccast) ||
-		command_add("npcedit", "[column] [value] - Mega NPC editing command", 100, command_npcedit) ||
-		command_add("npceditmass", "[name-search] [column] [value] - Mass (Zone wide) NPC data editing command", 100, command_npceditmass) ||
-		command_add("npcemote", "[message] - Make your NPC target emote a message.", 150, command_npcemote) ||
-		command_add("npcloot", "[show/money/add/remove] [itemid/all/money: pp gp sp cp] - Manipulate the loot an NPC is carrying", 80, command_npcloot) ||
-		command_add("npcsay", "[message] - Make your NPC target say a message.", 150, command_npcsay) ||
-		command_add("npcshout", "[message] - Make your NPC target shout a message.", 150, command_npcshout) ||
-		command_add("npcspawn", "[create/add/update/remove/delete] - Manipulate spawn DB", 170, command_npcspawn) ||
-		command_add("npcspecialattk", "[flagchar] [perm] - Set NPC special attack flags. Flags are E(nrage) F(lurry) R(ampage) S(ummon).", 80, command_npcspecialattk) ||
-		command_add("npcstats", "- Show stats about target NPC", 80, command_npcstats) ||
-		command_add("npctype_cache",  "[id] or all - Clears the npc type cache for either the id or all npcs.",  250, command_npctype_cache) ||
-		command_add("npctypespawn", "[npctypeid] [factionid] - Spawn an NPC from the db", 10, command_npctypespawn) ||
-		command_add("nudge", "- Nudge your target's current position by specific values", 80, command_nudge) ||
-		command_add("nukebuffs", "- Strip all buffs on you or your target", 50, command_nukebuffs) ||
-		command_add("nukeitem", "[itemid] - Remove itemid from your player target's inventory", 150, command_nukeitem) ||
-		command_add("object", "List|Add|Edit|Move|Rotate|Copy|Save|Undo|Delete - Manipulate static and tradeskill objects within the zone", 100, command_object) ||
-		command_add("oocmute", "[1/0] - Mutes OOC chat", 200, command_oocmute) ||
-		command_add("opcode", "- opcode management", 250, command_opcode) ||
+		command_add("camerashake",  "Shakes the camera on everyone's screen globally.", AccountStatus::QuestTroupe, command_camerashake) ||
+		command_add("castspell", "[Spell ID] [Instant (0 = False, 1 = True, Default is 1 if Unused)] - Cast a spell", AccountStatus::Guide, command_castspell) ||
+		command_add("chat", "[channel num] [message] - Send a channel message to all zones", AccountStatus::GMMgmt, command_chat) ||
+		command_add("checklos", "- Check for line of sight to your target", AccountStatus::Guide, command_checklos) ||
+		command_add("copycharacter", "[source_char_name] [dest_char_name] [dest_account_name] Copies character to destination account", AccountStatus::GMImpossible, command_copycharacter) ||
+		command_add("corpse", "- Manipulate corpses, use with no arguments for help", AccountStatus::Guide, command_corpse) ||
+		command_add("corpsefix", "Attempts to bring corpses from underneath the ground within close proximity of the player", AccountStatus::Player, command_corpsefix) ||
+		command_add("cvs", "- Summary of client versions currently online.", AccountStatus::GMMgmt, command_cvs) ||
+		command_add("damage", "[amount] - Damage your target", AccountStatus::GMAdmin, command_damage) ||
+		command_add("databuckets", "View|Delete [key] [limit]- View data buckets, limit 50 default or Delete databucket by key", AccountStatus::QuestTroupe, command_databuckets) ||
+		command_add("date", "[yyyy] [mm] [dd] [HH] [MM] - Set EQ time", AccountStatus::EQSupport, command_date) ||
+		command_add("dbspawn2", "[spawngroup] [respawn] [variance] - Spawn an NPC from a predefined row in the spawn2 table", AccountStatus::GMAdmin, command_dbspawn2) ||
+		command_add("delacct", "[accountname] - Delete an account", AccountStatus::GMLeadAdmin, command_delacct) ||
+		command_add("deletegraveyard", "[zone name] - Deletes the graveyard for the specified zone.", AccountStatus::GMMgmt, command_deletegraveyard) ||
+		command_add("delpetition", "[petition number] - Delete a petition", AccountStatus::ApprenticeGuide, command_delpetition) ||
+		command_add("depop", "- Depop your NPC target", AccountStatus::Guide, command_depop) ||
+		command_add("depopzone", "- Depop the zone", AccountStatus::GMAdmin, command_depopzone) ||
+		command_add("devtools", "- Manages devtools", AccountStatus::GMMgmt, command_devtools) ||
+		command_add("details", "- Change the details of your target (Drakkin Only)", AccountStatus::QuestTroupe, command_details) ||
+		command_add("disablerecipe",  "[recipe_id] - Disables a recipe using the recipe id.", AccountStatus::QuestTroupe, command_disablerecipe) ||
+		command_add("disarmtrap",  "Analog for ldon disarm trap for the newer clients since we still don't have it working.", AccountStatus::QuestTroupe, command_disarmtrap) ||
+		command_add("distance", "- Reports the distance between you and your target.", AccountStatus::QuestTroupe, command_distance) ||
+		command_add("door", "Door editing command", AccountStatus::QuestTroupe, command_door) ||
+		command_add("doanim", "[animnum] [type] - Send an EmoteAnim for you or your target", AccountStatus::Guide, command_doanim) ||
+		command_add("dye", "[slot|'help'] [red] [green] [blue] [use_tint] - Dyes the specified armor slot to Red, Green, and Blue provided, allows you to bypass darkness limits.", AccountStatus::ApprenticeGuide, command_dye) ||
+		command_add("dz", "Manage expeditions and dynamic zone instances", AccountStatus::QuestTroupe, command_dz) ||
+		command_add("dzkickplayers", "Removes all players from current expedition. (/kickplayers alternative for pre-RoF clients)", AccountStatus::Player, command_dzkickplayers) ||
+		command_add("editmassrespawn", "[name-search] [second-value] - Mass (Zone wide) NPC respawn timer editing command", AccountStatus::GMAdmin, command_editmassrespawn) ||
+		command_add("emote", "['name'/'world'/'zone'] [type] [message] - Send an emote message", AccountStatus::QuestTroupe, command_emote) ||
+		command_add("emotesearch", "Searches NPC Emotes", AccountStatus::QuestTroupe, command_emotesearch) ||
+		command_add("emoteview", "Lists all NPC Emotes", AccountStatus::QuestTroupe, command_emoteview) ||
+		command_add("emptyinventory", "- Clears you or your target's entire inventory (Equipment, General, Bank, and Shared Bank)", AccountStatus::GMImpossible, command_emptyinventory) ||
+		command_add("enablerecipe",  "[recipe_id] - Enables a recipe using the recipe id.", AccountStatus::QuestTroupe, command_enablerecipe) ||
+		command_add("endurance", "Restores you or your target's endurance.", AccountStatus::Guide, command_endurance) ||
+		command_add("equipitem", "[slotid(0-21)] - Equip the item on your cursor into the specified slot", AccountStatus::Guide, command_equipitem) ||
+		command_add("face", "- Change the face of your target", AccountStatus::QuestTroupe, command_face) ||
+		command_add("faction", "[Find (criteria | all ) | Review (criteria | all) | Reset (id)] - Resets Player's Faction", AccountStatus::QuestTroupe, command_faction) ||
+		command_add("findaliases", "[search criteria]- Searches for available command aliases, by alias or command", AccountStatus::Player, command_findaliases) ||
+		command_add("findclass", "[search criteria] - Search for a class", AccountStatus::Guide, command_findclass) ||
+		command_add("findfaction", "[search criteria] - Search for a faction", AccountStatus::Guide, command_findfaction) ||
+		command_add("findnpctype", "[search criteria] - Search database NPC types", AccountStatus::GMAdmin, command_findnpctype) ||
+		command_add("findrace", "[search criteria] - Search for a race", AccountStatus::Guide, command_findrace) ||
+		command_add("findskill", "[search criteria] - Search for a skill", AccountStatus::Guide, command_findskill) ||
+		command_add("findspell", "[search criteria] - Search for a spell", AccountStatus::Guide, command_findspell) ||
+		command_add("findtask", "[search criteria] - Search for a task", AccountStatus::Guide, command_findtask) ||
+		command_add("findzone", "[search criteria] - Search database zones", AccountStatus::GMAdmin, command_findzone) ||
+		command_add("fixmob", "[race|gender|texture|helm|face|hair|haircolor|beard|beardcolor|heritage|tattoo|detail] [next|prev] - Manipulate appearance of your target", AccountStatus::QuestTroupe, command_fixmob) ||
+		command_add("flag", "[status] [acctname] - Refresh your admin status, or set an account's admin status if arguments provided", AccountStatus::Player, command_flag) ||
+		command_add("flagedit", "- Edit zone flags on your target", AccountStatus::GMAdmin, command_flagedit) ||
+		command_add("flags", "- displays the flags of you or your target", AccountStatus::Player, command_flags) ||
+		command_add("flymode", "[0/1/2/3/4/5] - Set your or your player target's flymode to ground/flying/levitate/water/floating/levitate_running", AccountStatus::Guide, command_flymode) ||
+		command_add("fov", "- Check wether you're behind or in your target's field of view", AccountStatus::QuestTroupe, command_fov) ||
+		command_add("freeze", "- Freeze your target", AccountStatus::QuestTroupe, command_freeze) ||
+		command_add("gassign", "[id] - Assign targetted NPC to predefined wandering grid id", AccountStatus::GMAdmin, command_gassign) ||
+		command_add("gearup", "Developer tool to quickly equip a character", AccountStatus::GMMgmt, command_gearup) ||
+		command_add("gender", "[0/1/2] - Change your or your target's gender to male/female/neuter", AccountStatus::Guide, command_gender) ||
+		command_add("getplayerburiedcorpsecount", "- Get the target's total number of buried player corpses.", AccountStatus::GMAdmin, command_getplayerburiedcorpsecount) ||
+		command_add("getvariable", "[varname] - Get the value of a variable from the database", AccountStatus::GMMgmt, command_getvariable) ||
+		command_add("ginfo", "- get group info on target.", AccountStatus::ApprenticeGuide, command_ginfo) ||
+		command_add("giveitem", "[itemid] [charges] - Summon an item onto your target's cursor. Charges are optional.", AccountStatus::GMMgmt, command_giveitem) ||
+		command_add("givemoney", "[pp] [gp] [sp] [cp] - Gives specified amount of money to the target player.", AccountStatus::GMMgmt, command_givemoney) ||
+		command_add("globalview", "Lists all qglobals in cache if you were to do a quest with this target.", AccountStatus::QuestTroupe, command_globalview) ||
+		command_add("gm", "- Turn player target's or your GM flag on or off", AccountStatus::QuestTroupe, command_gm) ||
+		command_add("gmspeed", "[on/off] - Turn GM speed hack on/off for you or your player target", AccountStatus::GMAdmin, command_gmspeed) ||
+		command_add("gmzone", "[zone_short_name] [zone_version=0] [identifier=gmzone] - Zones to a private GM instance", AccountStatus::GMAdmin, command_gmzone) ||
+		command_add("goto", "[playername] or [x y z] [h] - Teleport to the provided coordinates or to your target", AccountStatus::Steward, command_goto) ||
+		command_add("grid", "[add/delete] [grid_num] [wandertype] [pausetype] - Create/delete a wandering grid", AccountStatus::GMAreas, command_grid) ||
+		command_add("guild", "- Guild manipulation commands. Use argument help for more info.", AccountStatus::Steward, command_guild) ||
+		command_add("guildapprove", "[guildapproveid] - Approve a guild with specified ID (guild creator receives the id)", AccountStatus::Player, command_guildapprove) ||
+		command_add("guildcreate", "[guildname] - Creates an approval setup for guild name specified", AccountStatus::Player, command_guildcreate) ||
+		command_add("guildlist", "[guildapproveid] - Lists character names who have approved the guild specified by the approve id", AccountStatus::Player, command_guildlist) ||
+		command_add("hair", "- Change the hair style of your target", AccountStatus::QuestTroupe, command_hair) ||
+		command_add("haircolor", "- Change the hair color of your target", AccountStatus::QuestTroupe, command_haircolor) ||
+		command_add("haste", "[percentage] - Set your haste percentage", AccountStatus::GMAdmin, command_haste) ||
+		command_add("hatelist", " - Display hate list for target.", AccountStatus::QuestTroupe, command_hatelist) ||
+		command_add("heal", "- Completely heal your target", AccountStatus::Steward, command_heal) ||
+		command_add("helm", "- Change the helm of your target", AccountStatus::QuestTroupe, command_helm) ||
+		command_add("help", "[search term] - List available commands and their description, specify partial command as argument to search", AccountStatus::Player, command_help) ||
+		command_add("heritage", "- Change the heritage of your target (Drakkin Only)", AccountStatus::QuestTroupe, command_heritage) ||
+		command_add("heromodel",  "[hero model] [slot] - Full set of Hero's Forge Armor appearance. If slot is set, sends exact model just to slot.", AccountStatus::GMMgmt, command_heromodel) ||
+		command_add("hideme", "[on/off] - Hide yourself from spawn lists.", AccountStatus::QuestTroupe, command_hideme) ||
+		command_add("hotfix", "[hotfix_name] - Reloads shared memory into a hotfix, equiv to load_shared_memory followed by apply_shared_memory", AccountStatus::GMImpossible, command_hotfix) ||
+		command_add("hp", "- Refresh your HP bar from the server.", AccountStatus::Player, command_hp) ||
+		command_add("incstat", "- Increases or Decreases a client's stats permanently.", AccountStatus::GMMgmt, command_incstat) ||
+		command_add("instance", "- Modify Instances", AccountStatus::GMMgmt, command_instance) ||
+		command_add("interrogateinv", "- use [help] argument for available options", AccountStatus::Player, command_interrogateinv) ||
+		command_add("interrupt", "[message id] [color] - Interrupt your casting. Arguments are optional.", AccountStatus::Guide, command_interrupt) ||
+		command_add("invsnapshot", "- Manipulates inventory snapshots for your current target", AccountStatus::QuestTroupe, command_invsnapshot) ||
+		command_add("invul", "[on/off] - Turn player target's or your invulnerable flag on or off", AccountStatus::QuestTroupe, command_invul) ||
+		command_add("ipban", "[IP address] - Ban IP by character name", AccountStatus::GMMgmt, command_ipban) ||
+		command_add("iplookup", "[charname] - Look up IP address of charname", AccountStatus::GMMgmt, command_iplookup) ||
+		command_add("iteminfo", "- Get information about the item on your cursor", AccountStatus::Steward, command_iteminfo) ||
+		command_add("itemsearch", "[search criteria] - Search for an item", AccountStatus::Steward, command_itemsearch) ||
+		command_add("kick", "[charname] - Disconnect charname", AccountStatus::GMLeadAdmin, command_kick) ||
+		command_add("kill", "- Kill your target", AccountStatus::GMAdmin, command_kill) ||
+		command_add("killallnpcs", " [npc_name] Kills all npcs by search name, leave blank for all attackable NPC's", AccountStatus::GMMgmt, command_killallnpcs) ||
+		command_add("lastname", "[new lastname] - Set your or your player target's lastname", AccountStatus::Guide, command_lastname) ||
+		command_add("level", "[level] - Set your or your target's level", AccountStatus::Steward, command_level) ||
+		command_add("list", "[npcs|players|corpses|doors|objects] [search] - Search entities", AccountStatus::ApprenticeGuide, command_list) ||
+		command_add("listpetition", "- List petitions", AccountStatus::Guide, command_listpetition) ||
+		command_add("load_shared_memory", "[shared_memory_name] - Reloads shared memory and uses the input as output", AccountStatus::GMImpossible, command_load_shared_memory) ||
+		command_add("loc", "- Print out your or your target's current location and heading", AccountStatus::Player, command_loc) ||
+		command_add("lock", "- Lock the worldserver", AccountStatus::GMLeadAdmin, command_lock) ||
+		command_add("logs",  "Manage anything to do with logs", AccountStatus::GMImpossible, command_logs) ||
+		command_add("makepet", "[level] [class] [race] [texture] - Make a pet", AccountStatus::Guide, command_makepet) ||
+		command_add("mana", "- Fill your or your target's mana", AccountStatus::Guide, command_mana) ||
+		command_add("maxskills", "Maxes skills for you.", AccountStatus::GMMgmt, command_max_all_skills) ||
+		command_add("memspell", "[slotid] [spellid] - Memorize spellid in the specified slot", AccountStatus::Guide, command_memspell) ||
+		command_add("merchant_close_shop",  "Closes a merchant shop", AccountStatus::GMAdmin, command_merchantcloseshop) ||
+		command_add("merchant_open_shop",  "Opens a merchants shop", AccountStatus::GMAdmin, command_merchantopenshop) ||
+		command_add("modifynpcstat", "- Modifys a NPC's stats", AccountStatus::GMLeadAdmin, command_modifynpcstat) ||
+		command_add("motd", "[new motd] - Set message of the day", AccountStatus::GMLeadAdmin, command_motd) ||
+		command_add("movechar", "[charname] [zonename] - Move charname to zonename", AccountStatus::Guide, command_movechar) ||
+		command_add("movement", "Various movement commands", AccountStatus::GMMgmt, command_movement) ||
+		command_add("myskills", "- Show details about your current skill levels", AccountStatus::Player, command_myskills) ||
+		command_add("mysql", "Mysql CLI, see 'help' for options.", AccountStatus::GMImpossible, command_mysql) ||
+		command_add("mystats", "- Show details about you or your pet", AccountStatus::Guide, command_mystats) ||
+		command_add("name", "[newname] - Rename your player target", AccountStatus::GMLeadAdmin, command_name) ||
+		command_add("netstats", "- Gets the network stats for a stream.", AccountStatus::GMMgmt, command_netstats) ||
+		command_add("network", "- Admin commands for the udp network interface.", AccountStatus::GMImpossible, command_network) ||
+		command_add("npccast", "[targetname/entityid] [spellid] - Causes NPC target to cast spellid on targetname/entityid", AccountStatus::QuestTroupe, command_npccast) ||
+		command_add("npcedit", "[column] [value] - Mega NPC editing command", AccountStatus::GMAdmin, command_npcedit) ||
+		command_add("npceditmass", "[name-search] [column] [value] - Mass (Zone wide) NPC data editing command", AccountStatus::GMAdmin, command_npceditmass) ||
+		command_add("npcemote", "[message] - Make your NPC target emote a message.", AccountStatus::GMLeadAdmin, command_npcemote) ||
+		command_add("npcloot", "[show/money/add/remove] [itemid/all/money: pp gp sp cp] - Manipulate the loot an NPC is carrying", AccountStatus::QuestTroupe, command_npcloot) ||
+		command_add("npcsay", "[message] - Make your NPC target say a message.", AccountStatus::GMLeadAdmin, command_npcsay) ||
+		command_add("npcshout", "[message] - Make your NPC target shout a message.", AccountStatus::GMLeadAdmin, command_npcshout) ||
+		command_add("npcspawn", "[create/add/update/remove/delete] - Manipulate spawn DB", AccountStatus::GMAreas, command_npcspawn) ||
+		command_add("npcspecialattk", "[flagchar] [perm] - Set NPC special attack flags. Flags are E(nrage) F(lurry) R(ampage) S(ummon).", AccountStatus::QuestTroupe, command_npcspecialattk) ||
+		command_add("npcstats", "- Show stats about target NPC", AccountStatus::QuestTroupe, command_npcstats) ||
+		command_add("npctype_cache",  "[id] or all - Clears the npc type cache for either the id or all npcs.", AccountStatus::GMImpossible, command_npctype_cache) ||
+		command_add("npctypespawn", "[npctypeid] [factionid] - Spawn an NPC from the db", AccountStatus::Steward, command_npctypespawn) ||
+		command_add("nudge", "- Nudge your target's current position by specific values", AccountStatus::QuestTroupe, command_nudge) ||
+		command_add("nukebuffs", "- Strip all buffs on you or your target", AccountStatus::Guide, command_nukebuffs) ||
+		command_add("nukeitem", "[itemid] - Remove itemid from your player target's inventory", AccountStatus::GMLeadAdmin, command_nukeitem) ||
+		command_add("object", "List|Add|Edit|Move|Rotate|Copy|Save|Undo|Delete - Manipulate static and tradeskill objects within the zone", AccountStatus::GMAdmin, command_object) ||
+		command_add("oocmute", "[1/0] - Mutes OOC chat", AccountStatus::GMMgmt, command_oocmute) ||
+		command_add("opcode", "- opcode management", AccountStatus::GMImpossible, command_opcode) ||

 #ifdef PACKET_PROFILER
-		command_add("packetprofile", "- Dump packet profile for target or self.", 250, command_packetprofile) ||
+		command_add("packetprofile", "- Dump packet profile for target or self.", AccountStatus::GMImpossible, command_packetprofile) ||
 #endif

-		command_add("path", "- view and edit pathing", 200, command_path) ||
-		command_add("peekinv", "[equip/gen/cursor/poss/limbo/curlim/trib/bank/shbank/allbank/trade/world/all] - Print out contents of your player target's inventory", 100, command_peekinv) ||
-		command_add("peqzone", "[zonename] - Go to specified zone, if you have > 75% health", 0, command_peqzone) ||
-		command_add("permaclass", "[classnum] - Change your or your player target's class (target is disconnected)", 80, command_permaclass) ||
-		command_add("permagender", "[gendernum] - Change your or your player target's gender (zone to take effect)", 80, command_permagender) ||
-		command_add("permarace", "[racenum] - Change your or your player target's race (zone to take effect)", 80, command_permarace) ||
-		command_add("petitioninfo", "[petition number] - Get info about a petition", 20, command_petitioninfo) ||
-		command_add("pf", "- Display additional mob coordinate and wandering data", 0, command_pf) ||
-		command_add("picklock",  "Analog for ldon pick lock for the newer clients since we still don't have it working.",  0, command_picklock) ||
-		command_add("profanity", "Manage censored language.", 150, command_profanity) ||
+		command_add("path", "- view and edit pathing", AccountStatus::GMMgmt, command_path) ||
+		command_add("peekinv", "[equip/gen/cursor/poss/limbo/curlim/trib/bank/shbank/allbank/trade/world/all] - Print out contents of your player target's inventory", AccountStatus::GMAdmin, command_peekinv) ||
+		command_add("peqzone", "[zonename] - Go to specified zone, if you have > 75% health", AccountStatus::Player, command_peqzone) ||
+		command_add("permaclass", "[classnum] - Change your or your player target's class (target is disconnected)", AccountStatus::QuestTroupe, command_permaclass) ||
+		command_add("permagender", "[gendernum] - Change your or your player target's gender (zone to take effect)", AccountStatus::QuestTroupe, command_permagender) ||
+		command_add("permarace", "[racenum] - Change your or your player target's race (zone to take effect)", AccountStatus::QuestTroupe, command_permarace) ||
+		command_add("petitioninfo", "[petition number] - Get info about a petition", AccountStatus::ApprenticeGuide, command_petitioninfo) ||
+		command_add("pf", "- Display additional mob coordinate and wandering data", AccountStatus::Player, command_pf) ||
+		command_add("picklock",  "Analog for ldon pick lock for the newer clients since we still don't have it working.", AccountStatus::Player, command_picklock) ||
+		command_add("profanity", "Manage censored language.", AccountStatus::GMLeadAdmin, command_profanity) ||

 #ifdef EQPROFILE
-		command_add("profiledump", "- Dump profiling info to logs", 250, command_profiledump) ||
-		command_add("profilereset", "- Reset profiling info", 250, command_profilereset) ||
+		command_add("profiledump", "- Dump profiling info to logs", AccountStatus::GMImpossible, command_profiledump) ||
+		command_add("profilereset", "- Reset profiling info", AccountStatus::GMImpossible, command_profilereset) ||
 #endif

-		command_add("push", "Lets you do spell push", 150, command_push) ||
-		command_add("proximity", "Shows NPC proximity", 150, command_proximity) ||
-		command_add("pvp", "[on/off] - Set your or your player target's PVP status", 100, command_pvp) ||
-		command_add("qglobal", "[on/off/view] - Toggles qglobal functionality on an NPC", 100, command_qglobal) ||
-		command_add("questerrors", "Shows quest errors.", 100, command_questerrors) ||
-		command_add("race", "[racenum] - Change your or your target's race. Use racenum 0 to return to normal", 50, command_race) ||
-		command_add("raidloot", "[All|GroupLeader|RaidLeader|Selected] - Sets your Raid Loot Type if you have permission to do so.", 0, command_raidloot) ||
-		command_add("randomfeatures", "- Temporarily randomizes the Facial Features of your target", 80, command_randomfeatures) ||
-		command_add("refreshgroup", "- Refreshes Group.",  0, command_refreshgroup) ||
-		command_add("reloadaa", "Reloads AA data", 200, command_reloadaa) ||
-		command_add("reloadallrules", "Executes a reload of all rules.", 80, command_reloadallrules) ||
-		command_add("reloademote", "Reloads NPC Emotes", 80, command_reloademote) ||
-		command_add("reloadlevelmods", nullptr, 255, command_reloadlevelmods) ||
-		command_add("reloadmerchants", nullptr, 255, command_reloadmerchants) ||
-		command_add("reloadperlexportsettings", nullptr, 255, command_reloadperlexportsettings) ||
-		command_add("reloadqst", " - Clear quest cache (any argument causes it to also stop all timers)", 150, command_reloadqst) ||
-		command_add("reloadrulesworld", "Executes a reload of all rules in world specifically.", 80, command_reloadworldrules) ||
-		command_add("reloadstatic", "- Reload Static Zone Data", 150, command_reloadstatic) ||
-		command_add("reloadtraps", "- Repops all traps in the current zone.", 80, command_reloadtraps) ||
-		command_add("reloadtitles", "- Reload player titles from the database",  150, command_reloadtitles) ||
-		command_add("reloadworld", "[0|1] - Clear quest cache (0 - no repop, 1 - repop)", 255, command_reloadworld) ||
-		command_add("reloadzps", "- Reload zone points from database", 150, command_reloadzps) ||
-		command_add("repop", "[delay] - Repop the zone with optional delay", 100, command_repop) ||
-		command_add("resetaa", "- Resets a Player's AA in their profile and refunds spent AA's to unspent, may disconnect player.", 200, command_resetaa) ||
-		command_add("resetaa_timer", "Command to reset AA cooldown timers.", 200, command_resetaa_timer) ||
-		command_add("resetdisc_timer", "Command to reset all discipline cooldown timers.", 200, command_resetdisc_timer) ||
-		command_add("revoke", "[charname] [1/0] - Makes charname unable to talk on OOC", 200, command_revoke) ||
-		command_add("roambox", "Manages roambox settings for an NPC", 200, command_roambox) ||
-		command_add("rules", "(subcommand) - Manage server rules", 250, command_rules) ||
-		command_add("save", "- Force your player or player corpse target to be saved to the database", 50, command_save) ||
-		command_add("scale", "- Handles npc scaling", 150, command_scale) ||
-		command_add("scribespell", "[spellid] - Scribe specified spell in your target's spell book.", 180, command_scribespell) ||
-		command_add("scribespells", "[max level] [min level] - Scribe all spells for you or your player target that are usable by them, up to level specified. (may freeze client for a few seconds)", 150, command_scribespells) ||
-		command_add("sendzonespawns", "- Refresh spawn list for all clients in zone", 150, command_sendzonespawns) ||
-		command_add("sensetrap",  "Analog for ldon sense trap for the newer clients since we still don't have it working.",  0, command_sensetrap) ||
-		command_add("serverinfo", "- Get OS info about server host", 200, command_serverinfo) ||
-		command_add("serverrules", "- Read this server's rules", 0, command_serverrules) ||
-		command_add("setaapts", "[AA|Group|Raid] [AA Amount] - Set your or your player target's Available AA Points by Type", 100, command_setaapts) ||
-		command_add("setaaxp", "[AA|Group|Raid] [AA Experience] - Set your or your player target's AA Experience by Type", 100, command_setaaxp) ||
-		command_add("setadventurepoints", "- Set your or your player target's available adventure points", 150, command_set_adventure_points) ||
-		command_add("setanim", "[animnum] - Set target's appearance to animnum", 200, command_setanim) ||
-		command_add("setcrystals", "[value] - Set your or your player target's available radiant or ebon crystals", 100, command_setcrystals) ||
-		command_add("setfaction", "[faction number] - Sets targeted NPC's faction in the database", 170, command_setfaction) ||
-		command_add("setgraveyard", "[zone name] - Creates a graveyard for the specified zone based on your target's LOC.",  200, command_setgraveyard) ||
-		command_add("setlanguage", "[language ID] [value] - Set your target's language skillnum to value", 50, command_setlanguage) ||
-		command_add("setlsinfo", "[email] [password] - Set login server email address and password (if supported by login server)", 10, command_setlsinfo) ||
-		command_add("setpass", "[accountname] [password] - Set local password for accountname", 150, command_setpass) ||
-		command_add("setpvppoints", "[Amount] - Set your or your player target's PVP points", 100, command_setpvppoints) ||
-		command_add("setskill", "[skillnum] [value] - Set your target's skill skillnum to value", 50, command_setskill) ||
-		command_add("setskillall", "[value] - Set all of your target's skills to value", 50, command_setskillall) ||
-		command_add("setstartzone", "[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity", 80, command_setstartzone) ||
-		command_add("setstat", "- Sets the stats to a specific value.", 255, command_setstat) ||
-		command_add("setxp", "[value] - Set your or your player target's experience", 100, command_setxp) ||
-		command_add("showbonusstats", "[item|spell|all] Shows bonus stats for target from items or spells. Shows both by default.", 50, command_showbonusstats) ||
-		command_add("showbuffs", "- List buffs active on your target or you if no target", 50, command_showbuffs) ||
-		command_add("shownumhits",  "Shows buffs numhits for yourself.",  0, command_shownumhits) ||
-		command_add("shownpcgloballoot", "Show GlobalLoot entires on this npc", 50, command_shownpcgloballoot) ||
-		command_add("showskills", "- Show the values of your or your player target's skills", 50, command_showskills) ||
-		command_add("showspellslist", "Shows spell list of targeted NPC", 100, command_showspellslist) ||
-		command_add("showstats", "- Show details about you or your target", 50, command_showstats) ||
-		command_add("showzonegloballoot", "Show GlobalLoot entires on this zone", 50, command_showzonegloballoot) ||
-		command_add("showzonepoints", "Show zone points for current zone", 50, command_showzonepoints) ||
-		command_add("shutdown", "- Shut this zone process down", 150, command_shutdown) ||
-		command_add("size", "[size] - Change size of you or your target", 50, command_size) ||
-		command_add("spawn", "[name] [race] [level] [material] [hp] [gender] [class] [priweapon] [secweapon] [merchantid] - Spawn an NPC", 10, command_spawn) ||
-		command_add("spawneditmass", "Mass editing spawn command", 150, command_spawneditmass) ||
-		command_add("spawnfix", "- Find targeted NPC in database based on its X/Y/heading and update the database to make it spawn at your current location/heading.", 170, command_spawnfix) ||
-		command_add("spawnstatus", "- Show respawn timer status", 100, command_spawnstatus) ||
-		command_add("spellinfo", "[spellid] - Get detailed info about a spell", 10, command_spellinfo) ||
-		command_add("stun", "[duration] - Stuns you or your target for duration", 100, command_stun) ||
-		command_add("summon", "[charname] - Summons your player/npc/corpse target, or charname if specified", 80, command_summon) ||
-		command_add("summonburiedplayercorpse", "- Summons the target's oldest buried corpse, if any exist.",  100, command_summonburiedplayercorpse) ||
-		command_add("summonitem", "[itemid] [charges] - Summon an item onto your cursor. Charges are optional.", 200, command_summonitem) ||
-		command_add("suspend", "[name] [days] [reason] - Suspend by character name and for specificed number of days", 150, command_suspend) ||
-		command_add("task", "(subcommand) - Task system commands",  150, command_task) ||
-		command_add("tattoo", "- Change the tattoo of your target (Drakkin Only)", 80, command_tattoo) ||
-		command_add("tempname", "[newname] - Temporarily renames your target. Leave name blank to restore the original name.", 100, command_tempname) ||
-		command_add("petname", "[newname] - Temporarily renames your pet. Leave name blank to restore the original name.", 100, command_petname) ||
-		command_add("texture", "[texture] [helmtexture] - Change your or your target's appearance, use 255 to show equipment", 10, command_texture) ||
-		command_add("time", "[HH] [MM] - Set EQ time", 90, command_time) ||
-		command_add("timers", "- Display persistent timers for target", 200, command_timers) ||
-		command_add("timezone", "[HH] [MM] - Set timezone. Minutes are optional", 90, command_timezone) ||
-		command_add("title", "[text] [1 = create title table row] - Set your or your player target's title", 50, command_title) ||
-		command_add("titlesuffix", "[text] [1 = create title table row] - Set your or your player target's title suffix", 50, command_titlesuffix) ||
-		command_add("traindisc", "[level] - Trains all the disciplines usable by the target, up to level specified. (may freeze client for a few seconds)", 150, command_traindisc) ||
-		command_add("trapinfo", "- Gets infomation about the traps currently spawned in the zone.", 81, command_trapinfo) ||
-		command_add("tune",  "Calculate statistical values related to combat.",  100, command_tune) ||
-		command_add("ucs", "- Attempts to reconnect to the UCS server", 0, command_ucs) ||
-		command_add("undyeme", "- Remove dye from all of your armor slots", 0, command_undyeme) ||
-		command_add("unfreeze", "- Unfreeze your target", 80, command_unfreeze) ||
-		command_add("unlock", "- Unlock the worldserver", 150, command_unlock) ||
-		command_add("unscribespell", "[spellid] - Unscribe specified spell from your target's spell book.", 180, command_unscribespell) ||
-		command_add("unscribespells", "- Clear out your or your player target's spell book.", 180, command_unscribespells) ||
-		command_add("untraindisc", "[spellid] - Untrain specified discipline from your target.", 180, command_untraindisc) ||
-		command_add("untraindiscs", "- Untrains all disciplines from your target.", 180, command_untraindiscs) ||
-		command_add("uptime", "[zone server id] - Get uptime of worldserver, or zone server if argument provided", 10, command_uptime) ||
-		command_add("version", "- Display current version of EQEmu server", 0, command_version) ||
-		command_add("viewnpctype", "[NPC ID] - Show stats for an NPC by NPC ID", 100, command_viewnpctype) ||
-		command_add("viewpetition", "[petition number] - View a petition", 20, command_viewpetition) ||
-		command_add("viewzoneloot", "[item id] - Allows you to search a zone's loot for a specific item ID. (0 shows all loot in the zone)", 80, command_viewzoneloot) ||
-		command_add("wc", "[wear slot] [material] - Sends an OP_WearChange for your target", 200, command_wc) ||
-		command_add("weather", "[0/1/2/3] (Off/Rain/Snow/Manual) - Change the weather", 80, command_weather) ||
-		command_add("who", "[search]", 20, command_who) ||
-		command_add("worldshutdown", "- Shut down world and all zones", 200, command_worldshutdown) ||
-		command_add("wp", "[add|delete] [grid_id] [pause] [waypoint_id] [-h] - Add or delete a waypoint by grid ID. (-h to use current heading)", 170, command_wp) ||
-		command_add("wpadd", "[pause] [-h] - Add your current location as a waypoint to your NPC target's AI path. (-h to use current heading)", 170, command_wpadd) ||
-		command_add("wpinfo", "- Show waypoint info about your NPC target", 170, command_wpinfo) ||
-		command_add("worldwide", "Performs world-wide GM functions such as cast (can be extended for other commands). Use caution", 250, command_worldwide) ||
-		command_add("xtargets",  "Show your targets Extended Targets and optionally set how many xtargets they can have.",  250, command_xtargets) ||
-		command_add("zclip", "[min] [max] - modifies and resends zhdr packet", 80, command_zclip) ||
-		command_add("zcolor", "[red] [green] [blue] - Change sky color", 80, command_zcolor) ||
-		command_add("zheader", "[zonename] - Load zheader for zonename from the database", 80, command_zheader) ||
-		command_add("zone", "[zonename] [x] [y] [z] - Go to specified zone (coords optional)", 50, command_zone) ||
-		command_add("zonebootup", "[ZoneServerID] [shortname] - Make a zone server boot a specific zone", 150, command_zonebootup) ||
-		command_add("zoneinstance", "[instanceid] [x] [y] [z] - Go to specified instance zone (coords optional)", 50, command_zone_instance) ||
-		command_add("zonelock", "[List|Lock|Unlock] [Zone ID|Zone Short Name] - Set or get lock status of a Zone by ID or Short Name", 100, command_zonelock) ||
-		command_add("zoneshutdown", "[shortname] - Shut down a zone server", 150, command_zoneshutdown) ||
-		command_add("zonespawn", "- Not implemented", 250, command_zonespawn) ||
-		command_add("zonestatus", "- Show connected zoneservers, synonymous with /servers", 150, command_zonestatus) ||
-		command_add("zopp",  "Troubleshooting command - Sends a fake item packet to you. No server reference is created.",  250, command_zopp) ||
-		command_add("zsafecoords", "[x] [y] [z] - Set safe coords", 80, command_zsafecoords) ||
-		command_add("zsave", " - Saves zheader to the database", 80, command_zsave) ||
-		command_add("zsky", "[skytype] - Change zone sky type", 80, command_zsky) ||
-		command_add("zstats", "- Show info about zone header", 80, command_zstats) ||
-		command_add("zunderworld", "[zcoord] - Sets the underworld using zcoord", 80, command_zunderworld) ||
-		command_add("zuwcoords", "[z coord] - Set underworld coord", 80, command_zuwcoords)
+		command_add("push", "Lets you do spell push", AccountStatus::GMLeadAdmin, command_push) ||
+		command_add("proximity", "Shows NPC proximity", AccountStatus::GMLeadAdmin, command_proximity) ||
+		command_add("pvp", "[on/off] - Set your or your player target's PVP status", AccountStatus::GMAdmin, command_pvp) ||
+		command_add("qglobal", "[on/off/view] - Toggles qglobal functionality on an NPC", AccountStatus::GMAdmin, command_qglobal) ||
+		command_add("questerrors", "Shows quest errors.", AccountStatus::GMAdmin, command_questerrors) ||
+		command_add("race", "[racenum] - Change your or your target's race. Use racenum 0 to return to normal", AccountStatus::Guide, command_race) ||
+		command_add("raidloot", "[All|GroupLeader|RaidLeader|Selected] - Sets your Raid Loot Type if you have permission to do so.", AccountStatus::Player, command_raidloot) ||
+		command_add("randomfeatures", "- Temporarily randomizes the Facial Features of your target", AccountStatus::QuestTroupe, command_randomfeatures) ||
+		command_add("refreshgroup", "- Refreshes Group.", AccountStatus::Player, command_refreshgroup) ||
+		command_add("reloadaa", "Reloads AA data", AccountStatus::GMMgmt, command_reloadaa) ||
+		command_add("reloadallrules", "Executes a reload of all rules.", AccountStatus::QuestTroupe, command_reloadallrules) ||
+		command_add("reloademote", "Reloads NPC Emotes", AccountStatus::QuestTroupe, command_reloademote) ||
+		command_add("reloadlevelmods", nullptr, AccountStatus::Max, command_reloadlevelmods) ||
+		command_add("reloadmerchants", nullptr, AccountStatus::Max, command_reloadmerchants) ||
+		command_add("reloadperlexportsettings", nullptr, AccountStatus::Max, command_reloadperlexportsettings) ||
+		command_add("reloadqst", " - Clear quest cache (any argument causes it to also stop all timers)", AccountStatus::GMLeadAdmin, command_reloadqst) ||
+		command_add("reloadrulesworld", "Executes a reload of all rules in world specifically.", AccountStatus::QuestTroupe, command_reloadworldrules) ||
+		command_add("reloadstatic", "- Reload Static Zone Data", AccountStatus::GMLeadAdmin, command_reloadstatic) ||
+		command_add("reloadtraps", "- Repops all traps in the current zone.", AccountStatus::QuestTroupe, command_reloadtraps) ||
+		command_add("reloadtitles", "- Reload player titles from the database", AccountStatus::GMLeadAdmin, command_reloadtitles) ||
+		command_add("reloadworld", "[0|1] - Clear quest cache (0 - no repop, 1 - repop)", AccountStatus::Max, command_reloadworld) ||
+		command_add("reloadzps", "- Reload zone points from database", AccountStatus::GMLeadAdmin, command_reloadzps) ||
+		command_add("repop", "[delay] - Repop the zone with optional delay", AccountStatus::GMAdmin, command_repop) ||
+		command_add("resetaa", "- Resets a Player's AA in their profile and refunds spent AA's to unspent, may disconnect player.", AccountStatus::GMMgmt, command_resetaa) ||
+		command_add("resetaa_timer", "Command to reset AA cooldown timers.", AccountStatus::GMMgmt, command_resetaa_timer) ||
+		command_add("resetdisc_timer", "Command to reset all discipline cooldown timers.", AccountStatus::GMMgmt, command_resetdisc_timer) ||
+		command_add("revoke", "[charname] [1/0] - Makes charname unable to talk on OOC", AccountStatus::GMMgmt, command_revoke) ||
+		command_add("roambox", "Manages roambox settings for an NPC", AccountStatus::GMMgmt, command_roambox) ||
+		command_add("rules", "(subcommand) - Manage server rules", AccountStatus::GMImpossible, command_rules) ||
+		command_add("save", "- Force your player or player corpse target to be saved to the database", AccountStatus::Guide, command_save) ||
+		command_add("scale", "- Handles npc scaling", AccountStatus::GMLeadAdmin, command_scale) ||
+		command_add("scribespell", "[spellid] - Scribe specified spell in your target's spell book.", AccountStatus::GMCoder, command_scribespell) ||
+		command_add("scribespells", "[max level] [min level] - Scribe all spells for you or your player target that are usable by them, up to level specified. (may freeze client for a few seconds)", AccountStatus::GMLeadAdmin, command_scribespells) ||
+		command_add("sendzonespawns", "- Refresh spawn list for all clients in zone", AccountStatus::GMLeadAdmin, command_sendzonespawns) ||
+		command_add("sensetrap",  "Analog for ldon sense trap for the newer clients since we still don't have it working.", AccountStatus::Player, command_sensetrap) ||
+		command_add("serverinfo", "- Get OS info about server host", AccountStatus::GMMgmt, command_serverinfo) ||
+		command_add("serverrules", "- Read this server's rules", AccountStatus::Player, command_serverrules) ||
+		command_add("setaapts", "[AA|Group|Raid] [AA Amount] - Set your or your player target's Available AA Points by Type", AccountStatus::GMAdmin, command_setaapts) ||
+		command_add("setaaxp", "[AA|Group|Raid] [AA Experience] - Set your or your player target's AA Experience by Type", AccountStatus::GMAdmin, command_setaaxp) ||
+		command_add("setadventurepoints", "- Set your or your player target's available adventure points", AccountStatus::GMLeadAdmin, command_set_adventure_points) ||
+		command_add("setanim", "[animnum] - Set target's appearance to animnum", AccountStatus::GMMgmt, command_setanim) ||
+		command_add("setcrystals", "[value] - Set your or your player target's available radiant or ebon crystals", AccountStatus::GMAdmin, command_setcrystals) ||
+		command_add("setfaction", "[faction number] - Sets targeted NPC's faction in the database", AccountStatus::GMAreas, command_setfaction) ||
+		command_add("setgraveyard", "[zone name] - Creates a graveyard for the specified zone based on your target's LOC.", AccountStatus::GMMgmt, command_setgraveyard) ||
+		command_add("setlanguage", "[language ID] [value] - Set your target's language skillnum to value", AccountStatus::Guide, command_setlanguage) ||
+		command_add("setlsinfo", "[email] [password] - Set login server email address and password (if supported by login server)", AccountStatus::Steward, command_setlsinfo) ||
+		command_add("setpass", "[accountname] [password] - Set local password for accountname", AccountStatus::GMLeadAdmin, command_setpass) ||
+		command_add("setpvppoints", "[Amount] - Set your or your player target's PVP points", AccountStatus::GMAdmin, command_setpvppoints) ||
+		command_add("setskill", "[skillnum] [value] - Set your target's skill skillnum to value", AccountStatus::Guide, command_setskill) ||
+		command_add("setskillall", "[value] - Set all of your target's skills to value", AccountStatus::Guide, command_setskillall) ||
+		command_add("setstartzone", "[zoneid] - Set target's starting zone. Set to zero to allow the player to use /setstartcity", AccountStatus::QuestTroupe, command_setstartzone) ||
+		command_add("setstat", "- Sets the stats to a specific value.", AccountStatus::Max, command_setstat) ||
+		command_add("setxp", "[value] - Set your or your player target's experience", AccountStatus::GMAdmin, command_setxp) ||
+		command_add("showbonusstats", "[item|spell|all] Shows bonus stats for target from items or spells. Shows both by default.", AccountStatus::Guide, command_showbonusstats) ||
+		command_add("showbuffs", "- List buffs active on your target or you if no target", AccountStatus::Guide, command_showbuffs) ||
+		command_add("shownumhits",  "Shows buffs numhits for yourself.", AccountStatus::Player, command_shownumhits) ||
+		command_add("shownpcgloballoot", "Show GlobalLoot entires on this npc", AccountStatus::Guide, command_shownpcgloballoot) ||
+		command_add("showskills", "- Show the values of your or your player target's skills", AccountStatus::Guide, command_showskills) ||
+		command_add("showspellslist", "Shows spell list of targeted NPC", AccountStatus::GMAdmin, command_showspellslist) ||
+		command_add("showstats", "- Show details about you or your target", AccountStatus::Guide, command_showstats) ||
+		command_add("showzonegloballoot", "Show GlobalLoot entires on this zone", AccountStatus::Guide, command_showzonegloballoot) ||
+		command_add("showzonepoints", "Show zone points for current zone", AccountStatus::Guide, command_showzonepoints) ||
+		command_add("shutdown", "- Shut this zone process down", AccountStatus::GMLeadAdmin, command_shutdown) ||
+		command_add("size", "[size] - Change size of you or your target", AccountStatus::Guide, command_size) ||
+		command_add("spawn", "[name] [race] [level] [material] [hp] [gender] [class] [priweapon] [secweapon] [merchantid] - Spawn an NPC", AccountStatus::Steward, command_spawn) ||
+		command_add("spawneditmass", "Mass editing spawn command", AccountStatus::GMLeadAdmin, command_spawneditmass) ||
+		command_add("spawnfix", "- Find targeted NPC in database based on its X/Y/heading and update the database to make it spawn at your current location/heading.", AccountStatus::GMAreas, command_spawnfix) ||
+		command_add("spawnstatus", "- Show respawn timer status", AccountStatus::GMAdmin, command_spawnstatus) ||
+		command_add("spellinfo", "[spellid] - Get detailed info about a spell", AccountStatus::Steward, command_spellinfo) ||
+		command_add("stun", "[duration] - Stuns you or your target for duration", AccountStatus::GMAdmin, command_stun) ||
+		command_add("summon", "[charname] - Summons your player/npc/corpse target, or charname if specified", AccountStatus::QuestTroupe, command_summon) ||
+		command_add("summonburiedplayercorpse", "- Summons the target's oldest buried corpse, if any exist.", AccountStatus::GMAdmin, command_summonburiedplayercorpse) ||
+		command_add("summonitem", "[itemid] [charges] - Summon an item onto your cursor. Charges are optional.", AccountStatus::GMMgmt, command_summonitem) ||
+		command_add("suspend", "[name] [days] [reason] - Suspend by character name and for specificed number of days", AccountStatus::GMLeadAdmin, command_suspend) ||
+		command_add("task", "(subcommand) - Task system commands", AccountStatus::GMLeadAdmin, command_task) ||
+		command_add("tattoo", "- Change the tattoo of your target (Drakkin Only)", AccountStatus::QuestTroupe, command_tattoo) ||
+		command_add("tempname", "[newname] - Temporarily renames your target. Leave name blank to restore the original name.", AccountStatus::GMAdmin, command_tempname) ||
+		command_add("petname", "[newname] - Temporarily renames your pet. Leave name blank to restore the original name.", AccountStatus::GMAdmin, command_petname) ||
+		command_add("texture", "[texture] [helmtexture] - Change your or your target's appearance, use 255 to show equipment", AccountStatus::Steward, command_texture) ||
+		command_add("time", "[HH] [MM] - Set EQ time", AccountStatus::EQSupport, command_time) ||
+		command_add("timers", "- Display persistent timers for target", AccountStatus::GMMgmt, command_timers) ||
+		command_add("timezone", "[HH] [MM] - Set timezone. Minutes are optional", AccountStatus::EQSupport, command_timezone) ||
+		command_add("title", "[text] [1 = create title table row] - Set your or your player target's title", AccountStatus::Guide, command_title) ||
+		command_add("titlesuffix", "[text] [1 = create title table row] - Set your or your player target's title suffix", AccountStatus::Guide, command_titlesuffix) ||
+		command_add("traindisc", "[level] - Trains all the disciplines usable by the target, up to level specified. (may freeze client for a few seconds)", AccountStatus::GMLeadAdmin, command_traindisc) ||
+		command_add("trapinfo", "- Gets infomation about the traps currently spawned in the zone.", AccountStatus::QuestTroupe, command_trapinfo) ||
+		command_add("tune",  "Calculate statistical values related to combat.", AccountStatus::GMAdmin, command_tune) ||
+		command_add("ucs", "- Attempts to reconnect to the UCS server", AccountStatus::Player, command_ucs) ||
+		command_add("undyeme", "- Remove dye from all of your armor slots", AccountStatus::Player, command_undyeme) ||
+		command_add("unfreeze", "- Unfreeze your target", AccountStatus::QuestTroupe, command_unfreeze) ||
+		command_add("unlock", "- Unlock the worldserver", AccountStatus::GMLeadAdmin, command_unlock) ||
+		command_add("unscribespell", "[spellid] - Unscribe specified spell from your target's spell book.", AccountStatus::GMCoder, command_unscribespell) ||
+		command_add("unscribespells", "- Clear out your or your player target's spell book.", AccountStatus::GMCoder, command_unscribespells) ||
+		command_add("untraindisc", "[spellid] - Untrain specified discipline from your target.", AccountStatus::GMCoder, command_untraindisc) ||
+		command_add("untraindiscs", "- Untrains all disciplines from your target.", AccountStatus::GMCoder, command_untraindiscs) ||
+		command_add("uptime", "[zone server id] - Get uptime of worldserver, or zone server if argument provided", AccountStatus::Steward, command_uptime) ||
+		command_add("version", "- Display current version of EQEmu server", AccountStatus::Player, command_version) ||
+		command_add("viewnpctype", "[NPC ID] - Show stats for an NPC by NPC ID", AccountStatus::GMAdmin, command_viewnpctype) ||
+		command_add("viewpetition", "[petition number] - View a petition", AccountStatus::ApprenticeGuide, command_viewpetition) ||
+		command_add("viewzoneloot", "[item id] - Allows you to search a zone's loot for a specific item ID. (0 shows all loot in the zone)", AccountStatus::QuestTroupe, command_viewzoneloot) ||
+		command_add("wc", "[wear slot] [material] - Sends an OP_WearChange for your target", AccountStatus::GMMgmt, command_wc) ||
+		command_add("weather", "[0/1/2/3] (Off/Rain/Snow/Manual) - Change the weather", AccountStatus::QuestTroupe, command_weather) ||
+		command_add("who", "[search]", AccountStatus::ApprenticeGuide, command_who) ||
+		command_add("worldshutdown", "- Shut down world and all zones", AccountStatus::GMMgmt, command_worldshutdown) ||
+		command_add("wp", "[add|delete] [grid_id] [pause] [waypoint_id] [-h] - Add or delete a waypoint by grid ID. (-h to use current heading)", AccountStatus::GMAreas, command_wp) ||
+		command_add("wpadd", "[pause] [-h] - Add your current location as a waypoint to your NPC target's AI path. (-h to use current heading)", AccountStatus::GMAreas, command_wpadd) ||
+		command_add("wpinfo", "- Show waypoint info about your NPC target", AccountStatus::GMAreas, command_wpinfo) ||
+		command_add("worldwide", "Performs world-wide GM functions such as cast (can be extended for other commands). Use caution", AccountStatus::GMImpossible, command_worldwide) ||
+		command_add("xtargets",  "Show your targets Extended Targets and optionally set how many xtargets they can have.", AccountStatus::GMImpossible, command_xtargets) ||
+		command_add("zclip", "[min] [max] - modifies and resends zhdr packet", AccountStatus::QuestTroupe, command_zclip) ||
+		command_add("zcolor", "[red] [green] [blue] - Change sky color", AccountStatus::QuestTroupe, command_zcolor) ||
+		command_add("zheader", "[zonename] - Load zheader for zonename from the database", AccountStatus::QuestTroupe, command_zheader) ||
+		command_add("zone", "[zonename] [x] [y] [z] - Go to specified zone (coords optional)", AccountStatus::Guide, command_zone) ||
+		command_add("zonebootup", "[ZoneServerID] [shortname] - Make a zone server boot a specific zone", AccountStatus::GMLeadAdmin, command_zonebootup) ||
+		command_add("zoneinstance", "[instanceid] [x] [y] [z] - Go to specified instance zone (coords optional)", AccountStatus::Guide, command_zone_instance) ||
+		command_add("zonelock", "[List|Lock|Unlock] [Zone ID|Zone Short Name] - Set or get lock status of a Zone by ID or Short Name", AccountStatus::GMAdmin, command_zonelock) ||
+		command_add("zoneshutdown", "[shortname] - Shut down a zone server", AccountStatus::GMLeadAdmin, command_zoneshutdown) ||
+		command_add("zonespawn", "- Not implemented", AccountStatus::GMImpossible, command_zonespawn) ||
+		command_add("zonestatus", "- Show connected zoneservers, synonymous with /servers", AccountStatus::GMLeadAdmin, command_zonestatus) ||
+		command_add("zopp",  "Troubleshooting command - Sends a fake item packet to you. No server reference is created.", AccountStatus::GMImpossible, command_zopp) ||
+		command_add("zsafecoords", "[x] [y] [z] - Set safe coords", AccountStatus::QuestTroupe, command_zsafecoords) ||
+		command_add("zsave", " - Saves zheader to the database", AccountStatus::QuestTroupe, command_zsave) ||
+		command_add("zsky", "[skytype] - Change zone sky type", AccountStatus::QuestTroupe, command_zsky) ||
+		command_add("zstats", "- Show info about zone header", AccountStatus::QuestTroupe, command_zstats) ||
+		command_add("zunderworld", "[zcoord] - Sets the underworld using zcoord", AccountStatus::QuestTroupe, command_zunderworld) ||
+		command_add("zuwcoords", "[z coord] - Set underworld coord", AccountStatus::QuestTroupe, command_zuwcoords)
 	) {
 		command_deinit();
 		return -1;
@@ -681,53 +681,67 @@ int command_realdispatch(Client *c, const char *message)

 void command_logcommand(Client *c, const char *message)
 {
-	int admin=c->Admin();
+	int admin = c->Admin();

-	bool continueevents=false;
+	bool continueevents = false;
 	switch (zone->loglevelvar){ //catch failsafe
 		case 9: { // log only LeadGM
-			if ((admin>= 150) && (admin <200))
-				continueevents=true;
+			if (
+				admin >= AccountStatus::GMLeadAdmin &&
+				admin < AccountStatus::GMMgmt
+			) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 8: { // log only GM
-			if ((admin>= 100) && (admin <150))
-				continueevents=true;
+			if (
+				admin >= AccountStatus::GMAdmin &&
+				admin < AccountStatus::GMLeadAdmin
+			) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 1: {
-			if ((admin>= 200))
-				continueevents=true;
+			if (admin >= AccountStatus::GMMgmt) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 2: {
-			if ((admin>= 150))
-				continueevents=true;
+			if (admin >= AccountStatus::GMLeadAdmin) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 3: {
-			if ((admin>= 100))
-				continueevents=true;
+			if (admin >= AccountStatus::GMAdmin) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 4: {
-			if ((admin>= 80))
-				continueevents=true;
+			if (admin >= AccountStatus::QuestTroupe) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 5: {
-			if ((admin>= 20))
-				continueevents=true;
+			if (admin >= AccountStatus::ApprenticeGuide) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 6: {
-			if ((admin>= 10))
-				continueevents=true;
+			if (admin >= AccountStatus::Steward) {
+				continueevents = true;
+			}
 			break;
 		}
 		case 7: {
-				continueevents=true;
-				break;
+			continueevents = true;
+			break;
 		}
 	}

@@ -1274,10 +1288,7 @@ void command_summon(Client *c, const Seperator *sep)
 		t=c->GetTarget();
 	else
 	{
-		/*if(c->Admin() < 150)
-			c->Message(Chat::White, "You need a NPC/corpse target for this command");
-		else*/
-			c->Message(Chat::White, "Usage: #summon [charname] Either target or charname is required");
+		c->Message(Chat::White, "Usage: #summon [charname] Either target or charname is required");
 		return;
 	}

@@ -1297,11 +1308,6 @@ void command_summon(Client *c, const Seperator *sep)
 	}
 	else if (t->IsClient())
 	{
-		/*if(c->Admin() < 150)
-		{
-			c->Message(Chat::White, "You may not summon a player.");
-			return;
-		}*/
 		c->Message(Chat::White, "Summoning player %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(), 2, GMSummon);
 	}
@@ -2016,13 +2022,23 @@ void command_emote(Client *c, const Seperator *sep)
 				for(newmessage = strtok((char*)sep->arg[3],"^");newmessage!=nullptr;newmessage=strtok(nullptr, "^"))
 					entity_list.Message(0, atoi(sep->arg[2]), newmessage);
 			}
-		}
-		else if (!worldserver.Connected())
+		} else if (!worldserver.Connected()) {
 			c->Message(Chat::White, "Error: World server disconnected");
-		else if (strcasecmp(sep->arg[1], "world") == 0)
-			worldserver.SendEmoteMessage(0, 0, atoi(sep->arg[2]), sep->argplus[3]);
-		else
-			worldserver.SendEmoteMessage(sep->arg[1], 0, atoi(sep->arg[2]), sep->argplus[3]);
+		} else if (!strcasecmp(sep->arg[1], "world")) {
+			worldserver.SendEmoteMessage(
+				0,
+				0,
+				atoi(sep->arg[2]),
+				sep->argplus[3]
+			);
+		} else {
+			worldserver.SendEmoteMessage(
+				sep->arg[1],
+				0,
+				atoi(sep->arg[2]),
+				sep->argplus[3]
+			);
+		}
 	}
 }

@@ -5785,7 +5801,7 @@ void command_zonelock(Client *c, const Seperator *sep)
 	strn0cpy(lock_zone->adminname, c->GetName(), sizeof(lock_zone->adminname));
 	
 	if (is_list) {
-		lock_zone->op = EQ::constants::ServerLockType::List;
+		lock_zone->op = ServerLockType::List;
 		worldserver.SendPacket(pack);
 	} else if (!is_list && c->Admin() >= commandLockZones) {		
 		auto zone_id = (
@@ -5796,7 +5812,7 @@ void command_zonelock(Client *c, const Seperator *sep)
 		std::string zone_short_name = str_tolower(ZoneName(zone_id, true));
 		bool is_unknown_zone = zone_short_name.find("unknown") != std::string::npos;
 		if (zone_id && !is_unknown_zone) {
-			lock_zone->op = is_lock ? EQ::constants::ServerLockType::Lock : EQ::constants::ServerLockType::Unlock;
+			lock_zone->op = is_lock ? ServerLockType::Lock : ServerLockType::Unlock;
 			lock_zone->zoneID = zone_id;
 			worldserver.SendPacket(pack);
 		} else {
@@ -6274,7 +6290,7 @@ void command_gmzone(Client *c, const Seperator *sep)

 	if (instance_id > 0) {
 		float target_x   = -1, target_y = -1, target_z = -1, target_heading = -1;
-		int16 min_status = 0;
+		int16 min_status = AccountStatus::Player;
 		uint8 min_level  = 0;

 		if (!content_db.GetSafePoints(
@@ -7494,7 +7510,7 @@ void command_iteminfo(Client *c, const Seperator *sep)
 		c->Message(Chat::White, ">> EffectType: 0x%02X, CastTime: %.2f", (uint8)item->Click.Type, ((double)item->CastTime / 1000));
 	}

-	if (c->Admin() >= 200)
+	if (c->Admin() >= AccountStatus::GMMgmt)
 		c->Message(Chat::White, ">> MinStatus: %u", item->MinStatus);
 }

@@ -7638,58 +7654,6 @@ void command_guild(Client *c, const Seperator *sep)
 				guild_mgr.DescribeGuild(c, tmp);
 		}
 	}
-	/*
-	else if (strcasecmp(sep->arg[1], "edit") == 0) {
-		if (c->GuildDBID() == 0)
-			c->Message(Chat::White, "You arent in a guild!");
-		else if (!sep->IsNumber(2))
-			c->Message(Chat::White, "Error: invalid rank #.");
-		else if (atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > GUILD_MAX_RANK)
-			c->Message(Chat::White, "Error: invalid rank #.");
-		else if (!c->GuildRank() == 0)
-			c->Message(Chat::White, "You must be rank %s to use edit.",  guilds[c->GuildEQID()].rank[0].rankname);
-		else if (!worldserver.Connected())
-			c->Message(Chat::White, "Error: World server dirconnected");
-		else {
-			if (!helper_guild_edit(c, c->GuildDBID(), c->GuildEQID(), atoi(sep->arg[2]), sep->arg[3], sep->argplus[4])) {
-				c->Message(Chat::White, "  #guild edit rank title newtitle");
-				c->Message(Chat::White, "  #guild edit rank permission 0/1");
-			}
-			else {
-				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
-				int32 geqid=c->GuildEQID();
-				memcpy(pack->pBuffer, &geqid, 4);
-				worldserver.SendPacket(pack);
-				safe_delete(pack);
-			}
-		}
-	}
-	else if (strcasecmp(sep->arg[1], "gmedit") == 0 && admin >= 100) {
-		if (!sep->IsNumber(2))
-			c->Message(Chat::White, "Error: invalid guilddbid.");
-		else if (!sep->IsNumber(3))
-			c->Message(Chat::White, "Error: invalid rank #.");
-		else if (atoi(sep->arg[3]) < 0 || atoi(sep->arg[3]) > GUILD_MAX_RANK)
-			c->Message(Chat::White, "Error: invalid rank #.");
-		else if (!worldserver.Connected())
-			c->Message(Chat::White, "Error: World server dirconnected");
-		else {
-			uint32 eqid = database.GetGuildEQID(atoi(sep->arg[2]));
-			if (eqid == GUILD_NONE)
-				c->Message(Chat::White, "Error: Guild not found");
-			else if (!helper_guild_edit(c, atoi(sep->arg[2]), eqid, atoi(sep->arg[3]), sep->arg[4], sep->argplus[5])) {
-				c->Message(Chat::White, "  #guild gmedit guilddbid rank title newtitle");
-				c->Message(Chat::White, "  #guild gmedit guilddbid rank permission 0/1");
-			}
-			else {
-				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
-				memcpy(pack->pBuffer, &eqid, 4);
-				worldserver.SendPacket(pack);
-				safe_delete(pack);
-			}
-		}
-	}
-	*/
 	else if (strcasecmp(sep->arg[1], "set") == 0) {
 		if (!sep->IsNumber(3))
 			c->Message(Chat::White, "Usage: #guild set charname guildgbid (0 = clear guildtag)");