diff --git a/zone/client.cpp b/zone/client.cpp index e2b3b2496..6acd203f4 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -2733,7 +2733,7 @@ void Client::Disarm(Client* disarmer, int chance) { return; } } - disarmer->Message(MT_Skills, StringFormat("You have failed to disarm your target").c_str()); + disarmer->Message_StringID(MT_Skills, DISARM_FAILED); } bool Client::BindWound(Mob *bindmob, bool start, bool fail) diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 754d9d9cd..58ea34e32 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -5411,8 +5411,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) { return; } // Trying to disarm something we can't disarm - Message(13, "Your attempt to disarm your target has failed."); - // Message_StringID(MT_Skills, DISARM_FAILED); + Message_StringID(MT_Skills, DISARM_NO_TARGET); return; } diff --git a/zone/npc.cpp b/zone/npc.cpp index af5f8da54..e77ae0618 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -1737,18 +1737,17 @@ void NPC::Disarm(Client* client, int chance) { SendWearChange(matslot); if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary) Say("Ahh! My weapon!"); - client->Message(MT_Skills, "You have successfully disarmed your target."); - //client->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName()); + client->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName()); if (chance != 1000) client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4); return; } - client->Message(MT_Skills, StringFormat("You have failed to disarm your target").c_str()); + client->Message_StringID(MT_Skills, DISARM_FAILED); if (chance != 1000) client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2); return; } - client->Message(MT_Skills, StringFormat("You have failed to disarm your target").c_str()); + client->Message_StringID(MT_Skills, DISARM_FAILED); } void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool remove) { diff --git a/zone/string_ids.h b/zone/string_ids.h index 7ebbbf874..2c223ffbd 100644 --- a/zone/string_ids.h +++ b/zone/string_ids.h @@ -301,6 +301,7 @@ #define CORPSEDRAG_STOPALL 4065 //You stop dragging the corpses. #define CORPSEDRAG_STOP 4066 //You stop dragging the corpse. #define SOS_KEEPS_HIDDEN 4086 //Your Shroud of Stealth keeps you hidden from watchful eyes.␣␣ +#define DISARM_NO_TARGET 4583 //You can't use disarm on that. #define TARGET_TOO_CLOSE 4602 //You are too close to your target. Get farther away. #define WHOALL_NO_RESULTS 5029 //There are no players in EverQuest that match those who filters. #define TELL_QUEUED_MESSAGE 5045 //You told %1 '%T2. %3'