From 9fa377303e9c9a95e3197dbcb8672cefd97bc28d Mon Sep 17 00:00:00 2001
From: Trust <fryguy503@gmail.com>
Date: Sat, 21 Jul 2018 22:20:53 -0400
Subject: [PATCH] Corrected Disarm StringID's

---
 common/eq_packet_structs.h | 1 -
 zone/client.cpp            | 8 +++-----
 zone/string_ids.h          | 3 +++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h
index a7a2b8626..a35c264e0 100644
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@@ -1784,7 +1784,6 @@ struct CombatAbility_Struct {
 };
 
 // Disarm Struct incoming from Client [Size: 16]
-// Haynar - 24 Jan 2011
 struct Disarm_Struct
 {
 	uint32 source;
diff --git a/zone/client.cpp b/zone/client.cpp
index 3627149f3..e2b3b2496 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -2718,18 +2718,16 @@ void Client::Disarm(Client* disarmer, int chance) {
 					if (matslot != -1)
 						SendWearChange(matslot);
 				}
-				Message(MT_Skills, "You have been disarmed!");
+				Message_StringID(MT_Skills, DISARMED);
 				if (disarmer != this)
-					disarmer->Message(MT_Skills, StringFormat("You have successfully disarmed %s", this->GetCleanName()).c_str());
-				// Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
+					disarmer->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
 				if (chance != 1000)
 					disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
 				CalcBonuses();
 				// CalcEnduranceWeightFactor();
 				return;
 			}
-			disarmer->Message(MT_Skills, StringFormat("You have failed to disarm your target").c_str());
-			//disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
+			disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
 			if (chance != 1000)
 				disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
 			return;
diff --git a/zone/string_ids.h b/zone/string_ids.h
index a760f8bbe..7ebbbf874 100644
--- a/zone/string_ids.h
+++ b/zone/string_ids.h
@@ -446,6 +446,9 @@
 #define TRY_ATTACKING_SOMEONE		12696	//Try attacking someone other than yourself, it's more productive
 #define RANGED_TOO_CLOSE			12698	//Your target is too close to use a ranged weapon!
 #define BACKSTAB_WEAPON				12874	//You need a piercing weapon as your primary weapon in order to backstab
+#define DISARMED                    12889   //You have been disarmed!
+#define DISARM_SUCCESS              12890   //You disarmed %1!
+#define DISARM_FAILED               12891   //Your attempt to disarm failed.
 #define MORE_SKILLED_THAN_I			12931	//%1 tells you, 'You are more skilled than I! What could I possibly teach you?'
 #define SURNAME_EXISTS				12939	//You already have a surname. Operation failed.
 #define SURNAME_LEVEL				12940	//You can only submit a surname upon reaching the 20th level. Operation failed.