From 8a27fce3a8d808d746946ce3e817e41b153480d3 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 21 Nov 2021 10:12:37 -0500
Subject: [PATCH] [Commands] Cleanup #memspell Command. (#1801)

- Cleanup message and logic.
- Add support for memorizing spell to target if you have GM enabled.
---
 zone/command.cpp              |  2 +-
 zone/gm_commands/memspell.cpp | 56 +++++++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/zone/command.cpp b/zone/command.cpp
index f91094ad1..24e0ab814 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -240,7 +240,7 @@ int command_init(void)
 		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("memspell", "[Slot] [Spell ID] - Memorize a Spell by ID 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) ||
diff --git a/zone/gm_commands/memspell.cpp b/zone/gm_commands/memspell.cpp
index 5511dae39..6fce2900f 100755
--- a/zone/gm_commands/memspell.cpp
+++ b/zone/gm_commands/memspell.cpp
@@ -2,21 +2,47 @@
 
 void command_memspell(Client *c, const Seperator *sep)
 {
-	uint32 slot;
-	uint16 spell_id;
-
-	if (!(sep->IsNumber(1) && sep->IsNumber(2))) {
-		c->Message(Chat::White, "Usage: #MemSpell slotid spellid");
+	int arguments = sep->argnum;
+	if (
+		!arguments ||
+		!sep->IsNumber(1) ||
+		!sep->IsNumber(2)
+	) {
+		c->Message(Chat::White, "Usage: #memspell [Slot] [Spell ID]");
+		return;
 	}
-	else {
-		slot     = atoi(sep->arg[1]) - 1;
-		spell_id = atoi(sep->arg[2]);
-		if (slot > EQ::spells::SPELL_GEM_COUNT || spell_id >= SPDAT_RECORDS) {
-			c->Message(Chat::White, "Error: #MemSpell: Arguement out of range");
-		}
-		else {
-			c->MemSpell(spell_id, slot);
-			c->Message(Chat::White, "Spell slot changed, have fun!");
-		}
+
+	Client* target = c;
+	if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
+		target = c->GetTarget()->CastToClient();
+	}
+
+	uint32 spell_gem = std::stoul(sep->arg[1]);
+	uint32 slot = (spell_gem - 1);
+	uint16 spell_id = static_cast<uint16>(std::stoul(sep->arg[2]));
+	if (
+		IsValidSpell(spell_id) &&
+		slot < EQ::spells::SPELL_GEM_COUNT
+	)  {			
+		target->MemSpell(spell_id, slot);
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"{} ({}) has been memorized to Spell Gem {} ({}) for {}.",
+				GetSpellName(spell_id),
+				spell_id,
+				spell_gem,
+				slot,
+				(
+					c == target ?
+					"yourself" :
+					fmt::format(
+						"{} ({})",
+						target->GetCleanName(),
+						target->GetID()
+					)
+				)
+			).c_str()
+		);
 	}
 }