Merge remote-tracking branch 'upstream/master'

zone/bot.cpp

@@ -2026,6 +2026,16 @@ void Bot::LoadPetBuffs(SpellBuff_Struct* petBuffs, uint32 botPetSaveId) {
 		petBuffs[buffIndex].spellid = atoi(row[0]);
 		petBuffs[buffIndex].level = atoi(row[1]);
 		petBuffs[buffIndex].duration = atoi(row[2]);
+		//Work around for loading the counters and setting them back to max. Need entry in DB for saved counters
+		if(CalculatePoisonCounters(petBuffs[buffIndex].spellid) > 0)
+			petBuffs[buffIndex].counters = CalculatePoisonCounters(petBuffs[buffIndex].spellid);
+		else if(CalculateDiseaseCounters(petBuffs[buffIndex].spellid) > 0)
+			petBuffs[buffIndex].counters = CalculateDiseaseCounters(petBuffs[buffIndex].spellid);
+		else if(CalculateCurseCounters(petBuffs[buffIndex].spellid) > 0)
+			petBuffs[buffIndex].counters = CalculateCurseCounters(petBuffs[buffIndex].spellid);
+		else if(CalculateCorruptionCounters(petBuffs[buffIndex].spellid) > 0)
+			petBuffs[buffIndex].counters = CalculateCorruptionCounters(petBuffs[buffIndex].spellid);
+
 		buffIndex++;
 	}
 	query = StringFormat("DELETE FROM `bot_pet_buffs` WHERE `pets_index` = %u;", botPetSaveId);

zone/client.h

@@ -712,6 +712,7 @@ public:
 	// use this one instead
 	void MemSpell(uint16 spell_id, int slot, bool update_client = true);
 	void UnmemSpell(int slot, bool update_client = true);
+	void UnmemSpellBySpellID(int32 spell_id);
 	void UnmemSpellAll(bool update_client = true);
 	void ScribeSpell(uint16 spell_id, int slot, bool update_client = true);
 	void UnscribeSpell(int slot, bool update_client = true);
@@ -925,6 +926,8 @@ public:
 	void ResetTrade();
 	void DropInst(const ItemInst* inst);
 	bool TrainDiscipline(uint32 itemid);
+	void TrainDiscBySpellID(int32 spell_id);
+	int GetDiscSlotBySpellID(int32 spellid);
 	void SendDisciplineUpdate();
 	void SendDisciplineTimer(uint32 timer_id, uint32 duration);
 	bool UseDiscipline(uint32 spell_id, uint32 target);

zone/client_process.cpp

@@ -1153,6 +1153,11 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 			{
 				const Item_Struct* item = inst->GetItem();
 
+				if (RuleB(Character, RestrictSpellScribing) && !item->IsEquipable(GetRace(), GetClass())) {
+					Message_StringID(13, CANNOT_USE_ITEM);
+					break;
+				}
+
 				if(item && item->Scroll.Effect == (int32)(memspell->spell_id))
 				{
 					ScribeSpell(memspell->spell_id, memspell->slot);

zone/command.cpp

@@ -23,12 +23,12 @@
 	1.	At the bottom of command.h you must add a prototype for it.
 	2.	Add the function in this file.
 	3.	In the command_init function you must add a call to command_add
-		for your function. If you want an alias for your command, add
-		a second call to command_add with the description and access args
-		set to nullptr and 0 respectively since they aren't used when adding
-		an alias. The function pointers being equal is makes it an alias.
-		The access level you set with command_add is only a default if
-		the command isn't listed in the commands db table.
+		for your function.
+		
+	Notes: If you want an alias for your command, add an entry to the
+	`command_settings` table in your database. The access level you
+	set with command_add is the default setting if the command isn't
+	listed in the `command_settings` db table.
 
 */
 
@@ -73,9 +73,7 @@ extern TaskManager *taskmanager;
 void CatchSignal(int sig_num);
 
 
-
-//struct cl_struct *commandlist;	// the actual linked list of commands
-int commandcount;								// how many commands we have
+int commandcount;					// how many commands we have
 
 // this is the pointer to the dispatch function, updated once
 // init has been performed to point at the real function
@@ -86,11 +84,11 @@ void command_bestz(Client *c, const Seperator *message);
 void command_pf(Client *c, const Seperator *message);
 
 std::map<std::string, CommandRecord *> commandlist;
+std::map<std::string, std::string> commandaliases;
 
 //All allocated CommandRecords get put in here so they get deleted on shutdown
 LinkedList<CommandRecord *> cleanup_commandlist;
 
-
 /*
  * command_notavail
  * This is the default dispatch function when commands aren't loaded.
@@ -139,31 +137,17 @@ Access Levels:
  * Parameters:
  *	none
  *
- * When adding a command, if it's the first time that function pointer is
- * used it is a new command. If that function pointer is used for another
- * command, the command is added as an alias; description and access level
- * are not used and can be nullptr.
+ * When adding a new command, only hard-code 'real' commands -
+ * all command aliases are added later through a database call
  *
  */
 
-int command_init(void) {
-
-	if
-	(
-
-#ifdef PACKET_PROFILER
-	command_add("packetprofile",  "- Dump packet profile for target or self.",  250, command_packetprofile) ||
-#endif
-#ifdef EQPROFILE
-	command_add("profiledump",  "- Dump profiling info to logs",  250, command_profiledump) ||
-	command_add("profilereset",  "- Reset profiling info",  250, command_profilereset) ||
-#endif
-#ifdef BOTS
-	command_add("bot",  "- Type \"#bot help\" to the see the list of available commands for bots.",  0, command_bot) ||
-#endif
-
+int command_init(void)
+{
+	commandaliases.clear();
+	
+	if (
 		command_add("acceptrules", "[acceptrules] - Accept the EQEmu Agreement", 0, command_acceptrules) ||
-		command_add("advnpc", "analog for advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn][removegroupspawn|movespawn|editgroupbox|cleargroupbox]", 150, command_advnpcspawn) ||
 		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) ||
@@ -172,27 +156,27 @@ int command_init(void) {
 		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("aug", nullptr, 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) ||
+
+#ifdef BOTS
+		command_add("bot", "- Type \"#bot help\" to the see the list of available commands for bots.", 0, command_bot) ||
+#endif
+
 		command_add("camerashake",  "Shakes the camera on everyone's screen globally.",  80, command_camerashake) ||
-		command_add("cast", nullptr,0, command_castspell) ||
 		command_add("castspell", "[spellid] - 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("clearinvsnapshots", "[use rule] - Clear inventory snapshot history (true - elapsed entries, false - all entries)", 200, command_clearinvsnapshots) ||
-		command_add("close_shop",  nullptr, 100, command_merchantcloseshop) ||
-		command_add("connectworld", nullptr,0, command_connectworldserver) ||
 		command_add("connectworldserver", "- Make zone attempt to connect to worldserver", 200, command_connectworldserver) ||
 		command_add("corpse", "- Manipulate corpses, use with no arguments for help", 50, command_corpse) ||
-		command_add("crashtest",  "- Crash the zoneserver",  255, command_crashtest) ||
-		command_add("cvs", "- Summary of client versions currently online.",  200, command_cvs) ||
+		command_add("crashtest", "- Crash the zoneserver", 255, command_crashtest) ||
+		command_add("cvs", "- Summary of client versions currently online.", 200, command_cvs) ||
 		command_add("damage", "[amount] - Damage your target", 100, command_damage) ||
 		command_add("date", "[yyyy] [mm] [dd] [HH] [MM] - Set EQ time", 90, command_date) ||
-		command_add("dbspawn", nullptr,10, command_npctypespawn) ||
 		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) ||
@@ -210,8 +194,6 @@ int command_init(void) {
 		command_add("enablerecipe",  "[recipe_id] - Enables a recipe using the recipe id.",  80, command_enablerecipe) ||
 		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("fi", nullptr,10, command_itemsearch) ||
-		command_add("finditem", nullptr,10, command_itemsearch) ||
 		command_add("findnpctype", "[search criteria] - Search database NPC types", 100, command_findnpctype) ||
 		command_add("findspell", "[searchstring] - Search for a spell", 50, command_findspell) ||
 		command_add("findzone", "[search criteria] - Search database zones", 100, command_findzone) ||
@@ -220,22 +202,17 @@ int command_init(void) {
 		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] - Set your or your player target's flymode to off/on/levitate", 50, command_flymode) ||
-		command_add("fn", nullptr, 100, command_findnpctype) ||
 		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("fs", nullptr, 50, command_findspell) ||
-		command_add("fz", nullptr, 100, command_findzone) ||
 		command_add("gassign", "[id] - Assign targetted NPC to predefined wandering grid id", 100, command_gassign) ||
 		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("gi", nullptr,200, command_giveitem) ||
 		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("gmhideme", nullptr,0, command_hideme) ||
 		command_add("gmspeed", "[on/off] - Turn GM speed hack on/off for you or your player target", 100, command_gmspeed) ||
 		command_add("goto", "[x] [y] [z] - 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) ||
@@ -243,7 +220,6 @@ int command_init(void) {
 		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("guilds", nullptr,0, command_guild) ||
 		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) ||
@@ -254,7 +230,6 @@ int command_init(void) {
 		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("hm",  "[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("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) ||
@@ -262,8 +237,7 @@ int command_init(void) {
 		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", "- Takes an inventory snapshot of your current target", 80, command_invsnapshot) ||
-		command_add("invul", nullptr,0, command_invul) ||
-		command_add("invulnerable", "[on/off] - Turn player target's or your invulnerable flag on or off", 80, command_invul) ||
+		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) ||
@@ -279,10 +253,9 @@ int command_init(void) {
 		command_add("lock", "- Lock the worldserver", 150, command_lock) ||
 		command_add("logs",  "Manage anything to do with logs",  250, command_logs) ||
 		command_add("logtest",  "Performs log performance testing.",  250, command_logtest) ||
-		command_add("los", nullptr,0, command_checklos) ||
 		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("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) ||
@@ -291,7 +264,7 @@ int command_init(void) {
 		command_add("movechar", "[charname] [zonename] - Move charname to zonename", 50, command_movechar) ||
 		command_add("myskills", "- Show details about your current skill levels", 0, command_myskills) ||
 		command_add("mysqltest", "Akkadius MySQL Bench Test", 250, command_mysqltest) ||
-		command_add("mysql",  "Mysql CLI, see 'help' for options.",  250, command_mysql) ||
+		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) ||
@@ -302,8 +275,6 @@ int command_init(void) {
 		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("npcspecialatk", nullptr,0, command_npcspecialattk) ||
-		command_add("npcspecialattack", nullptr,0, command_npcspecialattk) ||
 		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) ||
@@ -313,7 +284,11 @@ int command_init(void) {
 		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("open_shop",  nullptr, 100, command_merchantopenshop) ||
+
+#ifdef PACKET_PROFILER
+		command_add("packetprofile", "- Dump packet profile for target or self.", 250, command_packetprofile) ||
+#endif
+
 		command_add("path", "- view and edit pathing", 200, command_path) ||
 		command_add("peekinv", "[worn/inv/cursor/trib/bank/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) ||
@@ -323,9 +298,15 @@ int command_init(void) {
 		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) ||
+
+#ifdef EQPROFILE
+		command_add("profiledump", "- Dump profiling info to logs", 250, command_profiledump) ||
+		command_add("profilereset", "- Reset profiling info", 250, command_profilereset) ||
+#endif
+
 		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("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", "LEADER|GROUPLEADER|SELECTED|ALL - Sets your raid loot settings if you have permission to do so.", 0, command_raidloot) ||
 		command_add("randomfeatures", "- Temporarily randomizes the Facial Features of your target", 80, command_randomfeatures) ||
@@ -333,41 +314,32 @@ int command_init(void) {
 		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("reloadlevelmods", nullptr, 255, command_reloadlevelmods) ||
 		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("reloadquest", " - 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("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("reloadzonepoints", "- Reload zone points from database", 150, command_reloadzps) ||
-		command_add("reloadzps", nullptr,0, command_reloadzps) ||
+		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("repopclose", "[distance in units] Repops only NPC's nearby for fast development purposes", 100, command_repopclose) ||
 		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("revoke", "[charname] [1/0] - Makes charname unable to talk on OOC", 200, command_revoke) ||
-		command_add("rq", nullptr, 150, command_reloadqst) ||
-		command_add("rules", "(subcommand) - Manage server rules",  250, command_rules) ||
+		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("scribespell",  "[spellid] - Scribe specified spell in your target's spell book.",  180, command_scribespell) ||
+		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("search", nullptr,10, command_itemsearch) ||
 		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("setaaexp", nullptr,0, command_setaaxp) ||
-		command_add("setaapoints", nullptr,0, command_setaapts) ||
 		command_add("setaapts", "[value] - Set your or your player target's available AA points", 100, command_setaapts) ||
 		command_add("setaaxp", "[value] - Set your or your player target's AA experience", 100, command_setaaxp) ||
 		command_add("setadventurepoints", "- Set your or your player target's available adventure points", 150, command_set_adventure_points) ||
-		command_add("setallskill", nullptr,0, command_setskillall) ||
-		command_add("setallskills", nullptr,0, command_setskillall) ||
 		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("setexp", nullptr,0, command_setxp) ||
 		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) ||
@@ -386,13 +358,11 @@ int command_init(void) {
 		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("shutdown", "- Shut this zone process down", 150, command_shutdown) ||
-		command_add("si", nullptr,200, command_summonitem) ||
 		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("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("spfind", nullptr,0, command_findspell) ||
 		command_add("spoff", "- Sends OP_ManaChange", 80, command_spoff) ||
 		command_add("spon", "- Sends OP_MemorizeSpell", 80, command_spon) ||
 		command_add("stun", "[duration] - Stuns you or your target for duration", 100, command_stun) ||
@@ -414,7 +384,7 @@ int command_init(void) {
 		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("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) ||
@@ -446,27 +416,38 @@ int command_init(void) {
 		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_deinit();
 		return -1;
 	}
-
-	std::map<std::string, CommandRecord *>::iterator cur,end;
-	cur = commandlist.begin();
-	end = commandlist.end();
-	std::map<std::string,uint8> command_settings;
-	std::map<std::string,uint8>::iterator itr;
+	
+	std::map<std::string, std::pair<uint8, std::vector<std::string>>> command_settings;
 	database.GetCommandSettings(command_settings);
-	for(; cur != end; ++cur) {
-		if ((itr=command_settings.find(cur->first))!=command_settings.end()) {
-			cur->second->access = itr->second;
-			Log.Out(Logs::General, Logs::Commands, "command_init(): - Command '%s' set to access level %d.",  cur->first.c_str(), itr->second);
+	for (std::map<std::string, CommandRecord *>::iterator iter_cl = commandlist.begin(); iter_cl != commandlist.end(); ++iter_cl) {
+		std::map<std::string, std::pair<uint8, std::vector<std::string>>>::iterator iter_cs = command_settings.find(iter_cl->first);
+		if (iter_cs == command_settings.end()) {
+			if (iter_cl->second->access == 0)
+				Log.Out(Logs::General, Logs::Commands, "command_init(): Warning: Command '%s' defaulting to access level 0!", iter_cl->first.c_str());
+			continue;
 		}
-		else
-		{
-			if(cur->second->access == 0)
-				Log.Out(Logs::General, Logs::Commands, "command_init(): Warning: Command '%s' defaulting to access level 0!" , cur->first.c_str());
+
+		iter_cl->second->access = iter_cs->second.first;
+		Log.Out(Logs::General, Logs::Commands, "command_init(): - Command '%s' set to access level %d.", iter_cl->first.c_str(), iter_cs->second.first);
+		if (iter_cs->second.second.empty())
+			continue;
+
+		for (std::vector<std::string>::iterator iter_aka = iter_cs->second.second.begin(); iter_aka != iter_cs->second.second.end(); ++iter_aka) {
+			if (iter_aka->empty())
+				continue;
+			if (commandlist.find(*iter_aka) != commandlist.end()) {
+				Log.Out(Logs::General, Logs::Commands, "command_init(): Warning: Alias '%s' already exists as a command - skipping!", iter_aka->c_str());
+				continue;
+			}
+
+			commandlist[*iter_aka] = iter_cl->second;
+			commandaliases[*iter_aka] = iter_cl->first;
+
+			Log.Out(Logs::General, Logs::Commands, "command_init(): - Alias '%s' added to command '%s'.", iter_aka->c_str(), commandaliases[*iter_aka].c_str());
 		}
 	}
 
@@ -486,6 +467,7 @@ int command_init(void) {
 void command_deinit(void)
 {
 	commandlist.clear();
+	commandaliases.clear();
 
 	command_dispatch = command_notavail;
 	commandcount = 0;
@@ -496,53 +478,43 @@ void command_deinit(void)
  * adds a command to the command list; used by command_init
  *
  * Parameters:
- *	command_string	- the command ex: "spawn"
- *	desc		- text description of command for #help
- *	access		- default access level required to use command
+ *	command_name	- the command ex: "spawn"
+ *	desc			- text description of command for #help
+ *	access			- default access level required to use command
  *	function		- pointer to function that handles command
  *
  */
-int command_add(const char *command_string, const char *desc, int access, CmdFuncPtr function)
+int command_add(std::string command_name, const char *desc, int access, CmdFuncPtr function)
 {
-	if(function == nullptr)
-		return(-1);
-
-	std::string cstr(command_string);
-
-	if(commandlist.count(cstr) != 0) {
-		Log.Out(Logs::General, Logs::Error, "command_add() - Command '%s' is a duplicate - check command.cpp." , command_string);
-		return(-1);
+	if (command_name.empty()) {
+		Log.Out(Logs::General, Logs::Error, "command_add() - Command added with empty name string - check command.cpp.");
+		return -1;
 	}
-
-	//look for aliases...
-	std::map<std::string, CommandRecord *>::iterator cur,end,del;
-	cur = commandlist.begin();
-	end = commandlist.end();
-	for(; cur != end; ++cur) {
-		if(cur->second->function == function) {
-			int r;
-			for(r = 1; r < CMDALIASES; r++) {
-				if(cur->second->command[r] == nullptr) {
-					cur->second->command[r] = command_string;
-					break;
-				}
-			}
-			commandlist[cstr] = cur->second;
-			return(0);
-		}
+	if (function == nullptr) {
+		Log.Out(Logs::General, Logs::Error, "command_add() - Command '%s' added without a valid function pointer - check command.cpp.", command_name.c_str());
+		return -1;
+	}
+	if (commandlist.count(command_name) != 0) {
+		Log.Out(Logs::General, Logs::Error, "command_add() - Command '%s' is a duplicate command name - check command.cpp.", command_name.c_str());
+		return -1;
+	}
+	for (std::map<std::string, CommandRecord *>::iterator iter = commandlist.begin(); iter != commandlist.end(); ++iter) {
+		if (iter->second->function != function)
+			continue;
+		Log.Out(Logs::General, Logs::Error, "command_add() - Command '%s' equates to an alias of '%s' - check command.cpp.", command_name.c_str(), iter->first.c_str());
+		return -1;
 	}
 
 	CommandRecord *c = new CommandRecord;
-	cleanup_commandlist.Append(c);
-	c->desc = desc;
 	c->access = access;
+	c->desc = desc;
 	c->function = function;
-	memset(c->command, 0, sizeof(c->command));
-	c->command[0] = command_string;
-
-	commandlist[cstr] = c;
 
+	commandlist[command_name] = c;
+	commandaliases[command_name] = command_name;
+	cleanup_commandlist.Append(c);
 	commandcount++;
+
 	return 0;
 }
 

zone/command.h

@@ -25,324 +25,311 @@ class Seperator;
 
 #include "../common/types.h"
 
-#define	COMMAND_CHAR	'#'
-#define CMDALIASES	5
+#define	COMMAND_CHAR '#'
 
 typedef void (*CmdFuncPtr)(Client *,const Seperator *);
 
-// this is a command list item
-/*struct cl_struct
-{
-	char *command[CMDALIASES];			// the command(s)
-	char *desc;					// description of command
-	CmdFuncPtr function;				// the function to call
-	int access;					// the required 'status' level
-
-	struct cl_struct *next;			// linked list
-};
-
-extern struct cl_struct *commandlist;		// the head of the list
-*/
-
 typedef struct {
-	const char *command[CMDALIASES];			// the command(s)
 	int access;
-	const char *desc;		// description of command
-	CmdFuncPtr function;	//null means perl function
+	const char *desc;			// description of command
+	CmdFuncPtr function;		// null means perl function
 } CommandRecord;
 
 extern int (*command_dispatch)(Client *,char const*);
-extern int commandcount;			// number of commands loaded
+extern int commandcount;		// number of commands loaded
 
 // the command system:
 int command_init(void);
 void command_deinit(void);
-int command_add(const char *command_string, const char *desc, int access, CmdFuncPtr function);
+int command_add(std::string command_name, const char *desc, int access, CmdFuncPtr function);
 int command_notavail(Client *c, const char *message);
 int command_realdispatch(Client *c, char const *message);
 void command_logcommand(Client *c, const char *message);
 
 //commands
-void command_resetaa(Client* c,const Seperator *sep);
-void command_bind(Client* c,const Seperator *sep);
-void command_sendop(Client *c, const Seperator *sep);
-void command_optest(Client *c, const Seperator *sep);
-void command_setstat(Client *c, const Seperator *sep);
-void command_incstat(Client *c, const Seperator *sep);
-void command_help(Client *c, const Seperator *sep);
-void command_version(Client *c, const Seperator *sep);
-void command_setfaction(Client *c, const Seperator *sep);
-void command_serversidename(Client *c, const Seperator *sep);
-void command_testspawnkill(Client *c, const Seperator *sep);
-void command_testspawn(Client *c, const Seperator *sep);
-void command_wc(Client *c, const Seperator *sep);
-void command_heromodel(Client *c, const Seperator *sep);
-void command_numauths(Client *c, const Seperator *sep);
-void command_setanim(Client *c, const Seperator *sep);
-void command_connectworldserver(Client *c, const Seperator *sep);
-void command_serverinfo(Client *c, const Seperator *sep);
-void command_crashtest(Client *c, const Seperator *sep);
-void command_getvariable(Client *c, const Seperator *sep);
-void command_chat(Client *c, const Seperator *sep);
-void command_showpetspell(Client *c, const Seperator *sep);
-void command_ipc(Client *c, const Seperator *sep);
-void command_npcloot(Client *c, const Seperator *sep);
-void command_gm(Client *c, const Seperator *sep);
-void command_summon(Client *c, const Seperator *sep);
-void command_zone(Client *c, const Seperator *sep);
-void command_zone_instance(Client *c, const Seperator *sep);
-void command_peqzone(Client *c, const Seperator *sep);
-void command_showbuffs(Client *c, const Seperator *sep);
-void command_movechar(Client *c, const Seperator *sep);
-void command_viewpetition(Client *c, const Seperator *sep);
-void command_petitioninfo(Client *c, const Seperator *sep);
-void command_delpetition(Client *c, const Seperator *sep);
-void command_listnpcs(Client *c, const Seperator *sep);
-void command_date(Client *c, const Seperator *sep);
-void command_timezone(Client *c, const Seperator *sep);
-void command_synctod(Client *c, const Seperator *sep);
-void command_invul(Client *c, const Seperator *sep);
-void command_hideme(Client *c, const Seperator *sep);
-void command_emote(Client *c, const Seperator *sep);
-void command_fov(Client *c, const Seperator *sep);
-void command_manastat(Client *c, const Seperator *sep);
-void command_npcstats(Client *c, const Seperator *sep);
-void command_zclip(Client *c, const Seperator *sep);
-void command_npccast(Client *c, const Seperator *sep);
-void command_zstats(Client *c, const Seperator *sep);
-void command_permaclass(Client *c, const Seperator *sep);
-void command_permarace(Client *c, const Seperator *sep);
-void command_permagender(Client *c, const Seperator *sep);
-void command_weather(Client *c, const Seperator *sep);
-void command_zheader(Client *c, const Seperator *sep);
-void command_zsky(Client *c, const Seperator *sep);
-void command_zcolor(Client *c, const Seperator *sep);
-void command_spon(Client *c, const Seperator *sep);
-void command_spoff(Client *c, const Seperator *sep);
-void command_itemtest(Client *c, const Seperator *sep);
-void command_gassign(Client *c, const Seperator *sep);
+void command_acceptrules(Client *c, const Seperator *sep);
+void command_advnpcspawn(Client *c, const Seperator *sep);
+void command_aggro(Client *c, const Seperator *sep);
+void command_aggrozone(Client *c, const Seperator *sep);
 void command_ai(Client *c, const Seperator *sep);
-void command_worldshutdown(Client *c, const Seperator *sep);
-void command_sendzonespawns(Client *c, const Seperator *sep);
-void command_zsave(Client *c, const Seperator *sep);
-void command_dbspawn2(Client *c, const Seperator *sep);
-void command_shutdown(Client *c, const Seperator *sep);
-void command_delacct(Client *c, const Seperator *sep);
-void command_setpass(Client *c, const Seperator *sep);
-void command_setlsinfo(Client *c, const Seperator *sep);
-void command_grid(Client *c, const Seperator *sep);
-void command_wp(Client *c, const Seperator *sep);
-void command_iplookup(Client *c, const Seperator *sep);
-void command_size(Client *c, const Seperator *sep);
-void command_mana(Client *c, const Seperator *sep);
-void command_flymode(Client *c, const Seperator *sep);
-void command_showskills(Client *c, const Seperator *sep);
-void command_findspell(Client *c, const Seperator *sep);
-void command_castspell(Client *c, const Seperator *sep);
-void command_setlanguage(Client *c, const Seperator *sep);
-void command_setskill(Client *c, const Seperator *sep);
-void command_setskillall(Client *c, const Seperator *sep);
-void command_race(Client *c, const Seperator *sep);
-void command_gender(Client *c, const Seperator *sep);
-void command_makepet(Client *c, const Seperator *sep);
-void command_level(Client *c, const Seperator *sep);
-void command_spawn(Client *c, const Seperator *sep);
-void command_texture(Client *c, const Seperator *sep);
-void command_npctypespawn(Client *c, const Seperator *sep);
-void command_heal(Client *c, const Seperator *sep);
 void command_appearance(Client *c, const Seperator *sep);
-void command_nukeitem(Client *c, const Seperator *sep);
-void command_peekinv(Client *c, const Seperator *sep);
-void command_interrogateinv(Client *c, const Seperator *sep);
-void command_invsnapshot(Client *c, const Seperator *sep);
-void command_clearinvsnapshots(Client *c, const Seperator *sep);
-void command_findnpctype(Client *c, const Seperator *sep);
-void command_findzone(Client *c, const Seperator *sep);
-void command_viewnpctype(Client *c, const Seperator *sep);
-void command_reloadqst(Client *c, const Seperator *sep);
-void command_reloadworld(Client *c, const Seperator *sep);
-void command_reloadzps(Client *c, const Seperator *sep);
-void command_zoneshutdown(Client *c, const Seperator *sep);
-void command_zonebootup(Client *c, const Seperator *sep);
-void command_kick(Client *c, const Seperator *sep);
+void command_apply_shared_memory(Client *c, const Seperator *sep);
 void command_attack(Client *c, const Seperator *sep);
-void command_lock(Client *c, const Seperator *sep);
-void command_unlock(Client *c, const Seperator *sep);
-void command_motd(Client *c, const Seperator *sep);
-void command_listpetition(Client *c, const Seperator *sep);
-void command_equipitem(Client *c, const Seperator *sep);
-void command_zonelock(Client *c, const Seperator *sep);
-void command_corpse(Client *c, const Seperator *sep);
-void command_fixmob(Client *c, const Seperator *sep);
-void command_gmspeed(Client *c, const Seperator *sep);
-void command_title(Client *c, const Seperator *sep);
-void command_titlesuffix(Client *c, const Seperator *sep);
-void command_spellinfo(Client *c, const Seperator *sep);
-void command_lastname(Client *c, const Seperator *sep);
-void command_memspell(Client *c, const Seperator *sep);
-void command_save(Client *c, const Seperator *sep);
-void command_showstats(Client *c, const Seperator *sep);
-void command_mystats(Client *c, const Seperator *sep);
-void command_myskills(Client *c, const Seperator *sep);
-void command_depop(Client *c, const Seperator *sep);
-void command_depopzone(Client *c, const Seperator *sep);
-void command_repop(Client *c, const Seperator *sep);
-void command_repopclose(Client *c, const Seperator *sep);
-void command_spawnstatus(Client *c, const Seperator *sep);
-void command_nukebuffs(Client *c, const Seperator *sep);
-void command_zuwcoords(Client *c, const Seperator *sep);
-void command_zunderworld(Client *c, const Seperator *sep);
-void command_zsafecoords(Client *c, const Seperator *sep);
-void command_freeze(Client *c, const Seperator *sep);
-void command_unfreeze(Client *c, const Seperator *sep);
-void command_pvp(Client *c, const Seperator *sep);
-void command_setxp(Client *c, const Seperator *sep);
-void command_setpvppoints(Client *c, const Seperator *sep);
-void command_name(Client *c, const Seperator *sep);
-void command_tempname(Client *c, const Seperator *sep);
-void command_npcspecialattk(Client *c, const Seperator *sep);
-void command_kill(Client *c, const Seperator *sep);
-void command_haste(Client *c, const Seperator *sep);
-void command_damage(Client *c, const Seperator *sep);
-void command_zonespawn(Client *c, const Seperator *sep);
-void command_npcspawn(Client *c, const Seperator *sep);
-void command_spawnfix(Client *c, const Seperator *sep);
-void command_loc(Client *c, const Seperator *sep);
-void command_goto(Client *c, const Seperator *sep);
+void command_augmentitem(Client *c, const Seperator *sep);
+void command_ban(Client *c, const Seperator *sep);
+void command_beard(Client *c, const Seperator *sep);
+void command_beardcolor(Client *c, const Seperator *sep);
+void command_bind(Client* c, const Seperator *sep);
+
 #ifdef BUGTRACK
 void command_bug(Client *c, const Seperator *sep);
 #endif
-void command_iteminfo(Client *c, const Seperator *sep);
-void command_uptime(Client *c, const Seperator *sep);
-void command_flag(Client *c, const Seperator *sep);
-void command_time(Client *c, const Seperator *sep);
-void command_guild(Client *c, const Seperator *sep);
-bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const char* what, const char* value);
-void command_zonestatus(Client *c, const Seperator *sep);
-void command_doanim(Client *c, const Seperator *sep);
-void command_randomfeatures(Client *c, const Seperator *sep);
-void command_face(Client *c, const Seperator *sep);
-void command_helm(Client *c, const Seperator *sep);
-void command_hair(Client *c, const Seperator *sep);
-void command_haircolor(Client *c, const Seperator *sep);
-void command_beard(Client *c, const Seperator *sep);
-void command_beardcolor(Client *c, const Seperator *sep);
-void command_tattoo(Client *c, const Seperator *sep);
-void command_heritage(Client *c, const Seperator *sep);
-void command_details(Client *c, const Seperator *sep);
-void command_scribespells(Client *c, const Seperator *sep);
-void command_unscribespells(Client *c, const Seperator *sep);
-void command_wpinfo(Client *c, const Seperator *sep);
-void command_wpadd(Client *c, const Seperator *sep);
-void command_interrupt(Client *c, const Seperator *sep);
+
+void command_camerashake(Client *c, const Seperator *sep);
+void command_castspell(Client *c, const Seperator *sep);
+void command_chat(Client *c, const Seperator *sep);
+void command_checklos(Client *c, const Seperator *sep);
+void command_clearinvsnapshots(Client *c, const Seperator *sep);
+void command_connectworldserver(Client *c, const Seperator *sep);
+void command_corpse(Client *c, const Seperator *sep);
+void command_crashtest(Client *c, const Seperator *sep);
+void command_cvs(Client *c, const Seperator *sep);
 void command_d1(Client *c, const Seperator *sep);
-void command_summonitem(Client *c, const Seperator *sep);
+void command_damage(Client *c, const Seperator *sep);
+void command_date(Client *c, const Seperator *sep);
+void command_dbspawn2(Client *c, const Seperator *sep);
+void command_delacct(Client *c, const Seperator *sep);
+void command_deletegraveyard(Client *c, const Seperator *sep);
+void command_delpetition(Client *c, const Seperator *sep);
+void command_depop(Client *c, const Seperator *sep);
+void command_depopzone(Client *c, const Seperator *sep);
+void command_details(Client *c, const Seperator *sep);
+void command_disablerecipe(Client *c, const Seperator *sep);
+void command_disarmtrap(Client *c, const Seperator *sep);
+void command_distance(Client *c, const Seperator *sep);
+void command_doanim(Client *c, const Seperator *sep);
+void command_emote(Client *c, const Seperator *sep);
+void command_emotesearch(Client* c, const Seperator *sep);
+void command_emoteview(Client* c, const Seperator *sep);
+void command_enablerecipe(Client *c, const Seperator *sep);
+void command_equipitem(Client *c, const Seperator *sep);
+void command_face(Client *c, const Seperator *sep);
+void command_findnpctype(Client *c, const Seperator *sep);
+void command_findspell(Client *c, const Seperator *sep);
+void command_findzone(Client *c, const Seperator *sep);
+void command_fixmob(Client *c, const Seperator *sep);
+void command_flag(Client *c, const Seperator *sep);
+void command_flagedit(Client *c, const Seperator *sep);
+void command_flags(Client *c, const Seperator *sep);
+void command_flymode(Client *c, const Seperator *sep);
+void command_fov(Client *c, const Seperator *sep);
+void command_freeze(Client *c, const Seperator *sep);
+void command_gassign(Client *c, const Seperator *sep);
+void command_gender(Client *c, const Seperator *sep);
+void command_getplayerburiedcorpsecount(Client *c, const Seperator *sep);
+void command_getvariable(Client *c, const Seperator *sep);
+void command_ginfo(Client *c, const Seperator *sep);
 void command_giveitem(Client *c, const Seperator *sep);
 void command_givemoney(Client *c, const Seperator *sep);
-void command_itemsearch(Client *c, const Seperator *sep);
-void command_setaaxp(Client *c, const Seperator *sep);
-void command_setaapts(Client *c, const Seperator *sep);
-void command_setcrystals(Client *c, const Seperator *sep);
-void command_stun(Client *c, const Seperator *sep);
-void command_ban(Client *c, const Seperator *sep);
-void command_suspend(Client *c, const Seperator *sep);
+void command_globalview(Client* c, const Seperator *sep);
+void command_gm(Client *c, const Seperator *sep);
+void command_gmspeed(Client *c, const Seperator *sep);
+void command_goto(Client *c, const Seperator *sep);
+void command_grid(Client *c, const Seperator *sep);
+void command_guild(Client *c, const Seperator *sep);
+bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const char* what, const char* value);
+void command_guildapprove(Client *c, const Seperator *sep);
+void command_guildcreate(Client *c, const Seperator *sep);
+void command_guildlist(Client *c, const Seperator *sep);
+void command_hair(Client *c, const Seperator *sep);
+void command_haircolor(Client *c, const Seperator *sep);
+void command_haste(Client *c, const Seperator *sep);
+void command_hatelist(Client *c, const Seperator *sep);
+void command_heal(Client *c, const Seperator *sep);
+void command_helm(Client *c, const Seperator *sep);
+void command_help(Client *c, const Seperator *sep);
+void command_heritage(Client *c, const Seperator *sep);
+void command_heromodel(Client *c, const Seperator *sep);
+void command_hideme(Client *c, const Seperator *sep);
+void command_hotfix(Client *c, const Seperator *sep);
+void command_hp(Client *c, const Seperator *sep);
+void command_incstat(Client *c, const Seperator *sep);
+void command_instance(Client *c, const Seperator *sep);
+void command_interrogateinv(Client *c, const Seperator *sep);
+void command_interrupt(Client *c, const Seperator *sep);
+void command_invsnapshot(Client *c, const Seperator *sep);
+void command_invul(Client *c, const Seperator *sep);
 void command_ipban(Client *c, const Seperator *sep);
-void command_oocmute(Client *c, const Seperator *sep);
-void command_revoke(Client *c, const Seperator *sep);
-void command_checklos(Client *c, const Seperator *sep);
-void command_set_adventure_points(Client *c, const Seperator *sep);
+void command_ipc(Client *c, const Seperator *sep);
+void command_iplookup(Client *c, const Seperator *sep);
+void command_iteminfo(Client *c, const Seperator *sep);
+void command_itemsearch(Client *c, const Seperator *sep);
+void command_itemtest(Client *c, const Seperator *sep);
+void command_kick(Client *c, const Seperator *sep);
+void command_kill(Client *c, const Seperator *sep);
+void command_lastname(Client *c, const Seperator *sep);
+void command_level(Client *c, const Seperator *sep);
+void command_listnpcs(Client *c, const Seperator *sep);
+void command_listpetition(Client *c, const Seperator *sep);
+void command_load_shared_memory(Client *c, const Seperator *sep);
+void command_loc(Client *c, const Seperator *sep);
+void command_lock(Client *c, const Seperator *sep);
+void command_logs(Client *c, const Seperator *sep);
+void command_logtest(Client *c, const Seperator *sep);
+void command_makepet(Client *c, const Seperator *sep);
+void command_mana(Client *c, const Seperator *sep);
+void command_manastat(Client *c, const Seperator *sep);
+void command_max_all_skills(Client *c, const Seperator *sep);
+void command_memspell(Client *c, const Seperator *sep);
+void command_merchantcloseshop(Client *c, const Seperator *sep);
+void command_merchantopenshop(Client *c, const Seperator *sep);
+void command_modifynpcstat(Client *c, const Seperator *sep);
+void command_motd(Client *c, const Seperator *sep);
+void command_movechar(Client *c, const Seperator *sep);
+void command_myskills(Client *c, const Seperator *sep);
+void command_mysql(Client *c, const Seperator *sep);
+void command_mysqltest(Client *c, const Seperator *sep);
+void command_mystats(Client *c, const Seperator *sep);
+void command_name(Client *c, const Seperator *sep);
+void command_netstats(Client *c, const Seperator *sep);
+void command_npccast(Client *c, const Seperator *sep);
+void command_npcedit(Client *c, const Seperator *sep);
+void command_npcemote(Client *c, const Seperator *sep);
+void command_npcloot(Client *c, const Seperator *sep);
 void command_npcsay(Client *c, const Seperator *sep);
 void command_npcshout(Client *c, const Seperator *sep);
-void command_npcemote(Client *c, const Seperator *sep);
-void command_npcedit(Client *c, const Seperator *sep);
-void command_timers(Client *c, const Seperator *sep);
-void command_undye(Client *c, const Seperator *sep);
-void command_undyeme(Client *c, const Seperator *sep);
-void command_hp(Client *c, const Seperator *sep);
-void command_ginfo(Client *c, const Seperator *sep);
-void command_qglobal(Client *c, const Seperator *sep);
-void command_path(Client *c, const Seperator *sep);
-void command_ginfo(Client *c, const Seperator *sep);
-void command_opcode(Client *c, const Seperator *sep);
-void command_aggro(Client *c, const Seperator *sep);
-void command_hatelist(Client *c, const Seperator *sep);
-void command_aggrozone(Client *c, const Seperator *sep);
-void command_reloadstatic(Client *c, const Seperator *sep);
-void command_flags(Client *c, const Seperator *sep);
-void command_flagedit(Client *c, const Seperator *sep);
-void command_serverrules(Client *c, const Seperator *sep);
-void command_acceptrules(Client *c, const Seperator *sep);
-void command_guildcreate(Client *c, const Seperator *sep);
-void command_guildapprove(Client *c, const Seperator *sep);
-void command_guildlist(Client *c, const Seperator *sep);
-void command_rules(Client *c, const Seperator *sep);
-void command_task(Client *c, const Seperator *sep);
-void command_reloadtitles(Client *c, const Seperator *sep);
-void command_refundaa(Client *c, const Seperator *sep);
-void command_traindisc(Client *c, const Seperator *sep);
-void command_deletegraveyard(Client *c, const Seperator *sep);
-void command_setgraveyard(Client *c, const Seperator *sep);
-void command_getplayerburiedcorpsecount(Client *c, const Seperator *sep);
-void command_summonburiedplayercorpse(Client *c, const Seperator *sep);
-void command_unscribespell(Client *c, const Seperator *sep);
-void command_scribespell(Client *c, const Seperator *sep);
-void command_refreshgroup(Client *c, const Seperator *sep);
-void command_advnpcspawn(Client *c, const Seperator *sep);
-void command_modifynpcstat(Client *c, const Seperator *sep);
-void command_instance(Client *c, const Seperator *sep);
-void command_setstartzone(Client *c, const Seperator *sep);
-void command_netstats(Client *c, const Seperator *sep);
-void command_object(Client* c, const Seperator *sep);
-void command_raidloot(Client* c, const Seperator *sep);
-void command_globalview(Client* c, const Seperator *sep);
-void command_emoteview(Client* c, const Seperator *sep);
-void command_reloademote(Client* c, const Seperator *sep);
-void command_emotesearch(Client* c, const Seperator *sep);
-void command_distance(Client *c, const Seperator *sep);
-void command_cvs(Client *c, const Seperator *sep);
-void command_max_all_skills(Client *c, const Seperator *sep);
-void command_showbonusstats(Client *c, const Seperator *sep);
-void command_reloadallrules(Client *c, const Seperator *sep);
-void command_reloadworldrules(Client *c, const Seperator *sep);
-void command_reloadlevelmods(Client *c, const Seperator *sep);
-void command_camerashake(Client *c, const Seperator *sep);
-void command_disarmtrap(Client *c, const Seperator *sep);
-void command_sensetrap(Client *c, const Seperator *sep);
-void command_picklock(Client *c, const Seperator *sep);
-void command_qtest(Client *c, const Seperator *sep);
-void command_mysql(Client *c, const Seperator *sep);
-void command_xtargets(Client *c, const Seperator *sep);
-void command_zopp(Client *c, const Seperator *sep);
-void command_augmentitem(Client *c, const Seperator *sep);
-void command_questerrors(Client *c, const Seperator *sep);
-void command_enablerecipe(Client *c, const Seperator *sep);
-void command_disablerecipe(Client *c, const Seperator *sep);
-void command_showspellslist(Client *c, const Seperator *sep);
+void command_npcspawn(Client *c, const Seperator *sep);
+void command_npcspecialattk(Client *c, const Seperator *sep);
+void command_npcstats(Client *c, const Seperator *sep);
 void command_npctype_cache(Client *c, const Seperator *sep);
-void command_merchantopenshop(Client *c, const Seperator *sep);
-void command_merchantcloseshop(Client *c, const Seperator *sep);
-void command_shownumhits(Client *c, const Seperator *sep);
-void command_tune(Client *c, const Seperator *sep);
-void command_logtest(Client *c, const Seperator *sep);
-void command_mysqltest(Client *c, const Seperator *sep);
-void command_logs(Client *c, const Seperator *sep);
-void command_resetaa_timer(Client *c, const Seperator *sep);
-void command_reloadaa(Client *c, const Seperator *sep);
-void command_hotfix(Client *c, const Seperator *sep);
-void command_load_shared_memory(Client *c, const Seperator *sep);
-void command_apply_shared_memory(Client *c, const Seperator *sep);
-void command_untraindisc(Client *c, const Seperator *sep);
-void command_untraindiscs(Client *c, const Seperator *sep);
-void command_reloadperlexportsettings(Client *c, const Seperator *sep);
+void command_npctypespawn(Client *c, const Seperator *sep);
+void command_nukebuffs(Client *c, const Seperator *sep);
+void command_nukeitem(Client *c, const Seperator *sep);
+void command_numauths(Client *c, const Seperator *sep);
+void command_object(Client* c, const Seperator *sep);
+void command_oocmute(Client *c, const Seperator *sep);
+void command_opcode(Client *c, const Seperator *sep);
+void command_optest(Client *c, const Seperator *sep);
+
+#ifdef PACKET_PROFILER
+void command_packetprofile(Client *c, const Seperator *sep);
+#endif
+
+void command_path(Client *c, const Seperator *sep);
+void command_peekinv(Client *c, const Seperator *sep);
+void command_peqzone(Client *c, const Seperator *sep);
+void command_permaclass(Client *c, const Seperator *sep);
+void command_permagender(Client *c, const Seperator *sep);
+void command_permarace(Client *c, const Seperator *sep);
+void command_petitioninfo(Client *c, const Seperator *sep);
+void command_picklock(Client *c, const Seperator *sep);
 
 #ifdef EQPROFILE
 void command_profiledump(Client *c, const Seperator *sep);
 void command_profilereset(Client *c, const Seperator *sep);
 #endif
 
-#ifdef PACKET_PROFILER
-void command_packetprofile(Client *c, const Seperator *sep);
-#endif
+void command_pvp(Client *c, const Seperator *sep);
+void command_qglobal(Client *c, const Seperator *sep);
+void command_qtest(Client *c, const Seperator *sep);
+void command_questerrors(Client *c, const Seperator *sep);
+void command_race(Client *c, const Seperator *sep);
+void command_raidloot(Client* c, const Seperator *sep);
+void command_randomfeatures(Client *c, const Seperator *sep);
+void command_refreshgroup(Client *c, const Seperator *sep);
+void command_refundaa(Client *c, const Seperator *sep);
+void command_reloadaa(Client *c, const Seperator *sep);
+void command_reloadallrules(Client *c, const Seperator *sep);
+void command_reloademote(Client* c, const Seperator *sep);
+void command_reloadlevelmods(Client *c, const Seperator *sep);
+void command_reloadperlexportsettings(Client *c, const Seperator *sep);
+void command_reloadqst(Client *c, const Seperator *sep);
+void command_reloadstatic(Client *c, const Seperator *sep);
+void command_reloadtitles(Client *c, const Seperator *sep);
+void command_reloadworld(Client *c, const Seperator *sep);
+void command_reloadworldrules(Client *c, const Seperator *sep);
+void command_reloadzps(Client *c, const Seperator *sep);
+void command_repop(Client *c, const Seperator *sep);
+void command_repopclose(Client *c, const Seperator *sep);
+void command_resetaa(Client* c,const Seperator *sep);
+void command_resetaa_timer(Client *c, const Seperator *sep);
+void command_revoke(Client *c, const Seperator *sep);
+void command_rules(Client *c, const Seperator *sep);
+void command_save(Client *c, const Seperator *sep);
+void command_scribespell(Client *c, const Seperator *sep);
+void command_scribespells(Client *c, const Seperator *sep);
+void command_sendop(Client *c, const Seperator *sep);
+void command_sendzonespawns(Client *c, const Seperator *sep);
+void command_sensetrap(Client *c, const Seperator *sep);
+void command_serverinfo(Client *c, const Seperator *sep);
+void command_serverrules(Client *c, const Seperator *sep);
+void command_serversidename(Client *c, const Seperator *sep);
+void command_set_adventure_points(Client *c, const Seperator *sep);
+void command_setaapts(Client *c, const Seperator *sep);
+void command_setaaxp(Client *c, const Seperator *sep);
+void command_setanim(Client *c, const Seperator *sep);
+void command_setcrystals(Client *c, const Seperator *sep);
+void command_setfaction(Client *c, const Seperator *sep);
+void command_setgraveyard(Client *c, const Seperator *sep);
+void command_setlanguage(Client *c, const Seperator *sep);
+void command_setlsinfo(Client *c, const Seperator *sep);
+void command_setpass(Client *c, const Seperator *sep);
+void command_setpvppoints(Client *c, const Seperator *sep);
+void command_setskill(Client *c, const Seperator *sep);
+void command_setskillall(Client *c, const Seperator *sep);
+void command_setstartzone(Client *c, const Seperator *sep);
+void command_setstat(Client *c, const Seperator *sep);
+void command_setxp(Client *c, const Seperator *sep);
+void command_showbonusstats(Client *c, const Seperator *sep);
+void command_showbuffs(Client *c, const Seperator *sep);
+void command_shownumhits(Client *c, const Seperator *sep);
+void command_showpetspell(Client *c, const Seperator *sep);
+void command_showskills(Client *c, const Seperator *sep);
+void command_showspellslist(Client *c, const Seperator *sep);
+void command_showstats(Client *c, const Seperator *sep);
+void command_shutdown(Client *c, const Seperator *sep);
+void command_size(Client *c, const Seperator *sep);
+void command_spawn(Client *c, const Seperator *sep);
+void command_spawnfix(Client *c, const Seperator *sep);
+void command_spawnstatus(Client *c, const Seperator *sep);
+void command_spellinfo(Client *c, const Seperator *sep);
+void command_spoff(Client *c, const Seperator *sep);
+void command_spon(Client *c, const Seperator *sep);
+void command_stun(Client *c, const Seperator *sep);
+void command_summon(Client *c, const Seperator *sep);
+void command_summonburiedplayercorpse(Client *c, const Seperator *sep);
+void command_summonitem(Client *c, const Seperator *sep);
+void command_suspend(Client *c, const Seperator *sep);
+void command_synctod(Client *c, const Seperator *sep);
+void command_task(Client *c, const Seperator *sep);
+void command_tattoo(Client *c, const Seperator *sep);
+void command_tempname(Client *c, const Seperator *sep);
+void command_testspawn(Client *c, const Seperator *sep);
+void command_testspawnkill(Client *c, const Seperator *sep);
+void command_texture(Client *c, const Seperator *sep);
+void command_time(Client *c, const Seperator *sep);
+void command_timers(Client *c, const Seperator *sep);
+void command_timezone(Client *c, const Seperator *sep);
+void command_title(Client *c, const Seperator *sep);
+void command_titlesuffix(Client *c, const Seperator *sep);
+void command_traindisc(Client *c, const Seperator *sep);
+void command_tune(Client *c, const Seperator *sep);
+void command_undye(Client *c, const Seperator *sep);
+void command_undyeme(Client *c, const Seperator *sep);
+void command_unfreeze(Client *c, const Seperator *sep);
+void command_unlock(Client *c, const Seperator *sep);
+void command_unscribespell(Client *c, const Seperator *sep);
+void command_unscribespells(Client *c, const Seperator *sep);
+void command_untraindisc(Client *c, const Seperator *sep);
+void command_untraindiscs(Client *c, const Seperator *sep);
+void command_uptime(Client *c, const Seperator *sep);
+void command_version(Client *c, const Seperator *sep);
+void command_viewnpctype(Client *c, const Seperator *sep);
+void command_viewpetition(Client *c, const Seperator *sep);
+void command_wc(Client *c, const Seperator *sep);
+void command_weather(Client *c, const Seperator *sep);
+void command_worldshutdown(Client *c, const Seperator *sep);
+void command_wp(Client *c, const Seperator *sep);
+void command_wpadd(Client *c, const Seperator *sep);
+void command_wpinfo(Client *c, const Seperator *sep);
+void command_xtargets(Client *c, const Seperator *sep);
+void command_zclip(Client *c, const Seperator *sep);
+void command_zcolor(Client *c, const Seperator *sep);
+void command_zheader(Client *c, const Seperator *sep);
+void command_zone(Client *c, const Seperator *sep);
+void command_zone_instance(Client *c, const Seperator *sep);
+void command_zonebootup(Client *c, const Seperator *sep);
+void command_zonelock(Client *c, const Seperator *sep);
+void command_zoneshutdown(Client *c, const Seperator *sep);
+void command_zonespawn(Client *c, const Seperator *sep);
+void command_zonestatus(Client *c, const Seperator *sep);
+void command_zopp(Client *c, const Seperator *sep);
+void command_zsafecoords(Client *c, const Seperator *sep);
+void command_zsave(Client *c, const Seperator *sep);
+void command_zsky(Client *c, const Seperator *sep);
+void command_zstats(Client *c, const Seperator *sep);
+void command_zunderworld(Client *c, const Seperator *sep);
+void command_zuwcoords(Client *c, const Seperator *sep);
 
 #ifdef BOTS
 #include "bot.h"
@@ -350,4 +337,3 @@ void command_bot(Client*c, const Seperator *sep);
 #endif
 
 #endif
-

zone/effects.cpp

@@ -571,6 +571,33 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	return(false);
 }
 
+void Client::TrainDiscBySpellID(int32 spell_id)
+{
+	int i;
+	for(i = 0; i < MAX_PP_DISCIPLINES; i++) {
+		if(m_pp.disciplines.values[i] == 0) {
+			m_pp.disciplines.values[i] = spell_id;
+			database.SaveCharacterDisc(this->CharacterID(), i, spell_id);
+			SendDisciplineUpdate();
+			Message(15, "You have learned a new combat ability!");
+			return;
+		}
+	}
+}
+
+int Client::GetDiscSlotBySpellID(int32 spellid)
+{
+	int i;
+
+	for(i = 0; i < MAX_PP_DISCIPLINES; i++)
+	{
+		if(m_pp.disciplines.values[i] == spellid)
+			return i;
+	}
+	
+	return -1;
+}
+
 void Client::SendDisciplineUpdate() {
 	EQApplicationPacket app(OP_DisciplineUpdate, sizeof(Disciplines_Struct));
 	Disciplines_Struct *d = (Disciplines_Struct*)app.pBuffer;

zone/embparser_api.cpp

@@ -2906,6 +2906,19 @@ XS(XS__DestroyInstance) {
 	XSRETURN_EMPTY;
 }
 
+XS(XS__UpdateInstanceTimer);
+XS(XS__UpdateInstanceTimer) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: UpdateInstanceTimer(instance_id, new_duration)");
+
+	uint16 instance_id = (uint16)SvUV(ST(0));
+	uint32 new_duration = (uint32)SvUV(ST(1));
+	quest_manager.UpdateInstanceTimer(instance_id, new_duration);
+
+	XSRETURN_EMPTY;
+}
+
 XS(XS__GetInstanceID);
 XS(XS__GetInstanceID) {
 	dXSARGS;
@@ -3636,6 +3649,7 @@ EXTERN_C XS(boot_quest)
 		newXS(strcpy(buf, "ChooseRandom"), XS__ChooseRandom, file);
 		newXS(strcpy(buf, "CreateInstance"), XS__CreateInstance, file);
 		newXS(strcpy(buf, "DestroyInstance"), XS__DestroyInstance, file);
+		newXS(strcpy(buf, "UpdateInstanceTimer"), XS__UpdateInstanceTimer, file);
 		newXS(strcpy(buf, "FlagInstanceByGroupLeader"), XS__FlagInstanceByGroupLeader, file);
 		newXS(strcpy(buf, "FlagInstanceByRaidLeader"), XS__FlagInstanceByRaidLeader, file);
 		newXS(strcpy(buf, "FlyMode"), XS__FlyMode, file);

zone/lua_client.cpp

@@ -530,6 +530,11 @@ void Lua_Client::UnmemSpell(int slot, bool update_client) {
 	self->UnmemSpell(slot, update_client);
 }
 
+void Lua_Client::UnmemSpellBySpellID(int32 spell_id) {
+	Lua_Safe_Call_Void();
+	self->UnmemSpellBySpellID(spell_id);
+}
+
 void Lua_Client::UnmemSpellAll() {
 	Lua_Safe_Call_Void();
 	self->UnmemSpellAll();
@@ -575,6 +580,16 @@ void Lua_Client::TrainDisc(int itemid) {
 	self->TrainDiscipline(itemid);
 }
 
+void Lua_Client::TrainDiscBySpellID(int32 spell_id) {
+	Lua_Safe_Call_Void();
+	self->TrainDiscBySpellID(spell_id);
+}
+
+int Lua_Client::GetDiscSlotBySpellID(int32 spell_id) {
+	Lua_Safe_Call_Int();
+	return self->GetDiscSlotBySpellID(spell_id);
+}
+
 void Lua_Client::UntrainDisc(int slot) {
 	Lua_Safe_Call_Void();
 	self->UntrainDisc(slot);
@@ -1426,6 +1441,7 @@ luabind::scope lua_register_client() {
 		.def("MemSpell", (void(Lua_Client::*)(int,int,bool))&Lua_Client::MemSpell)
 		.def("UnmemSpell", (void(Lua_Client::*)(int))&Lua_Client::UnmemSpell)
 		.def("UnmemSpell", (void(Lua_Client::*)(int,bool))&Lua_Client::UnmemSpell)
+		.def("UnmemSpellBySpellID", (void(Lua_Client::*)(int32))&Lua_Client::UnmemSpellBySpellID)
 		.def("UnmemSpellAll", (void(Lua_Client::*)(void))&Lua_Client::UnmemSpellAll)
 		.def("UnmemSpellAll", (void(Lua_Client::*)(bool))&Lua_Client::UnmemSpellAll)
 		.def("ScribeSpell", (void(Lua_Client::*)(int,int))&Lua_Client::ScribeSpell)
@@ -1435,6 +1451,8 @@ luabind::scope lua_register_client() {
 		.def("UnscribeSpellAll", (void(Lua_Client::*)(void))&Lua_Client::UnscribeSpellAll)
 		.def("UnscribeSpellAll", (void(Lua_Client::*)(bool))&Lua_Client::UnscribeSpellAll)
 		.def("TrainDisc", (void(Lua_Client::*)(int))&Lua_Client::TrainDisc)
+		.def("TrainDiscBySpellID", (void(Lua_Client::*)(int32))&Lua_Client::TrainDiscBySpellID)
+		.def("GetDiscSlotBySpellID", (int(Lua_Client::*)(int32))&Lua_Client::GetDiscSlotBySpellID)
 		.def("UntrainDisc", (void(Lua_Client::*)(int))&Lua_Client::UntrainDisc)
 		.def("UntrainDisc", (void(Lua_Client::*)(int,bool))&Lua_Client::UntrainDisc)
 		.def("UntrainDiscAll", (void(Lua_Client::*)(void))&Lua_Client::UntrainDiscAll)

zone/lua_client.h

@@ -131,6 +131,7 @@ public:
 	void MemSpell(int spell_id, int slot, bool update_client);
 	void UnmemSpell(int slot);
 	void UnmemSpell(int slot, bool update_client);
+	void UnmemSpellBySpellID(int32 spell_id);
 	void UnmemSpellAll();
 	void UnmemSpellAll(bool update_client);
 	void ScribeSpell(int spell_id, int slot);
@@ -140,6 +141,8 @@ public:
 	void UnscribeSpellAll();
 	void UnscribeSpellAll(bool update_client);
 	void TrainDisc(int itemid);
+	void TrainDiscBySpellID(int32 spell_id);
+	int GetDiscSlotBySpellID(int32 spell_id);
 	void UntrainDisc(int slot);
 	void UntrainDisc(int slot, bool update_client);
 	void UntrainDiscAll();

zone/lua_general.cpp

@@ -804,6 +804,10 @@ void lua_destroy_instance(uint32 instance_id) {
 	quest_manager.DestroyInstance(instance_id);
 }
 
+void lua_update_instance_timer(uint16 instance_id, uint32 new_duration) {
+	quest_manager.UpdateInstanceTimer(instance_id, new_duration);
+}
+
 int lua_get_instance_id(const char *zone, uint32 version) {
 	return quest_manager.GetInstanceID(zone, version);
 }
@@ -1576,6 +1580,7 @@ luabind::scope lua_register_general() {
 		luabind::def("get_guild_name_by_id", &lua_get_guild_name_by_id),
 		luabind::def("create_instance", &lua_create_instance),
 		luabind::def("destroy_instance", &lua_destroy_instance),
+		luabind::def("update_instance_timer", &lua_update_instance_timer),
 		luabind::def("get_instance_id", &lua_get_instance_id),
 		luabind::def("get_characters_in_instance", &lua_get_characters_in_instance),
 		luabind::def("assign_to_instance", &lua_assign_to_instance),

zone/lua_mob.cpp

@@ -1871,6 +1871,16 @@ void Lua_Mob::SetPseudoRoot(bool in) {
 	self->SetPseudoRoot(in);
 }
 
+bool Lua_Mob::IsFeared() {
+	Lua_Safe_Call_Bool();
+	return self->IsFeared();
+}
+
+bool Lua_Mob::IsBlind() {
+	Lua_Safe_Call_Bool();
+	return self->IsBlind();
+}
+
 luabind::scope lua_register_mob() {
 	return luabind::class_<Lua_Mob, Lua_Entity>("Mob")
 		.def(luabind::constructor<>())
@@ -2156,6 +2166,8 @@ luabind::scope lua_register_mob() {
 		.def("WearChange", (void(Lua_Mob::*)(int,int,uint32))&Lua_Mob::WearChange)
 		.def("DoKnockback", (void(Lua_Mob::*)(Lua_Mob,uint32,uint32))&Lua_Mob::DoKnockback)
 		.def("RemoveNimbusEffect", (void(Lua_Mob::*)(int))&Lua_Mob::RemoveNimbusEffect)
+		.def("IsFeared", (bool(Lua_Mob::*)(void))&Lua_Mob::IsFeared)
+		.def("IsBlind", (bool(Lua_Mob::*)(void))&Lua_Mob::IsBlind)
 		.def("IsRunning", (bool(Lua_Mob::*)(void))&Lua_Mob::IsRunning)
 		.def("SetRunning", (void(Lua_Mob::*)(bool))&Lua_Mob::SetRunning)
 		.def("SetBodyType", (void(Lua_Mob::*)(int,bool))&Lua_Mob::SetBodyType)

zone/lua_mob.h

@@ -40,6 +40,8 @@ public:
 	void SetLevel(int level, bool command);
 	void SendWearChange(int material_slot);
 	bool IsMoving();
+	bool IsFeared();
+	bool IsBlind();
 	void GotoBind();
 	void Gate();
 	bool Attack(Lua_Mob other);

zone/perl_client.cpp

@@ -2445,6 +2445,30 @@ XS(XS_Client_UnmemSpell)
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_UnmemSpellBySpellID); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_UnmemSpellBySpellID)
+{
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::UnmemSpellBySpellID(THIS, spell_id)");
+	{
+		Client *		THIS;
+		int32		spell_id = (int32)SvIV(ST(1));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Client *,tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->UnmemSpellBySpellID(spell_id);
+	}
+	XSRETURN_EMPTY;
+}
+
 XS(XS_Client_UnmemSpellAll); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_UnmemSpellAll)
 {
@@ -2568,6 +2592,57 @@ XS(XS_Client_UnscribeSpellAll)
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_TrainDiscBySpellID); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_TrainDiscBySpellID)
+{
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::TrainDiscBySpellID(THIS, spell_id)");
+	{
+		Client *		THIS;
+		int32		spell_id = (int32)SvIV(ST(1));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Client *,tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->TrainDiscBySpellID(spell_id);
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_Client_GetDiscSlotBySpellID); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_GetDiscSlotBySpellID)
+{
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::GetDiscSlotBySpellID(THIS, spell_id)");
+	{
+		Client *	THIS;
+		int			RETVAL;
+		int32		spell_id = (int32)SvIV(ST(1));
+		dXSTARG;
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Client *,tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if(THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		RETVAL = THIS->GetDiscSlotBySpellID(spell_id);
+		XSprePUSH; PUSHi((IV)RETVAL);
+	}
+	XSRETURN(1);
+}
+
 XS(XS_Client_UntrainDisc); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_UntrainDisc)
 {
@@ -6443,10 +6518,13 @@ XS(boot_Client)
 		newXSproto(strcpy(buf, "ResetAA"), XS_Client_ResetAA, file, "$");
 		newXSproto(strcpy(buf, "MemSpell"), XS_Client_MemSpell, file, "$$$;$");
 		newXSproto(strcpy(buf, "UnmemSpell"), XS_Client_UnmemSpell, file, "$$;$");
+		newXSproto(strcpy(buf, "UnmemSpellBySpellID"), XS_Client_UnmemSpellBySpellID, file, "$$");
 		newXSproto(strcpy(buf, "UnmemSpellAll"), XS_Client_UnmemSpellAll, file, "$;$");
 		newXSproto(strcpy(buf, "ScribeSpell"), XS_Client_ScribeSpell, file, "$$$;$");
 		newXSproto(strcpy(buf, "UnscribeSpell"), XS_Client_UnscribeSpell, file, "$$;$");
 		newXSproto(strcpy(buf, "UnscribeSpellAll"), XS_Client_UnscribeSpellAll, file, "$;$");
+		newXSproto(strcpy(buf, "TrainDiscBySpellID"), XS_Client_TrainDiscBySpellID, file, "$$");
+		newXSproto(strcpy(buf, "GetDiscSlotBySpellID"), XS_Client_GetDiscSlotBySpellID, file, "$$");
 		newXSproto(strcpy(buf, "UntrainDisc"), XS_Client_UntrainDisc, file, "$$;$");
 		newXSproto(strcpy(buf, "UntrainDiscAll"), XS_Client_UntrainDiscAll, file, "$;$");
 		newXSproto(strcpy(buf, "IsSitting"), XS_Client_IsSitting, file, "$");

zone/perl_mob.cpp

@@ -8440,6 +8440,56 @@ XS(XS_Mob_CanClassEquipItem)
 	XSRETURN(1);
 }
 
+XS(XS_Mob_IsFeared);
+XS(XS_Mob_IsFeared) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: Mob::IsFeared(THIS)");
+	{
+		Mob* THIS;
+		bool RETVAL;
+		if (sv_derived_from(ST(0), "Mob")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Mob*, tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Mob");
+		
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		
+		RETVAL = THIS->IsFeared();
+		ST(0) = boolSV(RETVAL);
+		sv_2mortal(ST(0));
+	}
+	XSRETURN(1);
+}
+
+XS(XS_Mob_IsBlind);
+XS(XS_Mob_IsBlind) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: Mob::IsBlind(THIS)");
+	{
+		Mob* THIS;
+		bool RETVAL;
+		if (sv_derived_from(ST(0), "Mob")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Mob*, tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Mob");
+		
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		
+		RETVAL = THIS->IsBlind();
+		ST(0) = boolSV(RETVAL);
+		sv_2mortal(ST(0));
+	}
+	XSRETURN(1);
+}
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -8751,6 +8801,8 @@ XS(boot_Mob)
 		newXSproto(strcpy(buf, "ClearSpecialAbilities"), XS_Mob_ClearSpecialAbilities, file, "$");
 		newXSproto(strcpy(buf, "ProcessSpecialAbilities"), XS_Mob_ProcessSpecialAbilities, file, "$$");
 		newXSproto(strcpy(buf, "CanClassEquipItem"), XS_Mob_CanClassEquipItem, file, "$$");
+		newXSproto(strcpy(buf, "IsFeared"), XS_Mob_IsFeared, file, "$");
+		newXSproto(strcpy(buf, "IsBlind"), XS_Mob_IsBlind, file, "$");
 	XSRETURN_YES;
 }
 

zone/questmgr.cpp

@@ -2582,6 +2582,22 @@ void QuestManager::DestroyInstance(uint16 instance_id)
 	database.DeleteInstance(instance_id);
 }
 
+void QuestManager::UpdateInstanceTimer(uint16 instance_id, uint32 new_duration)
+{
+	std::string query = StringFormat("UPDATE instance_list SET duration = %lu, start_time = UNIX_TIMESTAMP() WHERE id = %lu",
+		(unsigned long)new_duration, (unsigned long)instance_id);
+	auto results = database.QueryDatabase(query);
+
+	if (results.Success()) {
+		auto pack = new ServerPacket(ServerOP_InstanceUpdateTime, sizeof(ServerInstanceUpdateTime_Struct));
+		ServerInstanceUpdateTime_Struct *ut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer;
+		ut->instance_id = instance_id;
+		ut->new_duration = new_duration;
+		worldserver.SendPacket(pack);
+		safe_delete(pack);
+	}
+}
+
 uint16 QuestManager::GetInstanceID(const char *zone, int16 version)
 {
 	QuestManagerCurrentQuestVars();

zone/questmgr.h

@@ -217,6 +217,7 @@ public:
 	void MerchantSetItem(uint32 NPCid, uint32 itemid, uint32 quantity = 0);
 	uint32 MerchantCountItem(uint32 NPCid, uint32 itemid);
 	uint16 CreateInstance(const char *zone, int16 version, uint32 duration);
+	void UpdateInstanceTimer(uint16 instance_id, uint32 new_duration);
 	void DestroyInstance(uint16 instance_id);
 	uint16 GetInstanceID(const char *zone, int16 version);
 	void AssignToInstance(uint16 instance_id);

zone/spells.cpp

@@ -4910,6 +4910,16 @@ void Client::UnmemSpell(int slot, bool update_client)
 	}
 }
 
+void Client::UnmemSpellBySpellID(int32 spell_id)
+{
+	for(int i = 0; i < MAX_PP_MEMSPELL; i++) {
+		if(m_pp.mem_spells[i] == spell_id) {
+			UnmemSpell(i, true);
+			break;
+		}
+	}
+}
+
 void Client::UnmemSpellAll(bool update_client)
 {
 	int i;