From d525d23217f922e654da3387bf72cf605301782e Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 28 Feb 2014 02:57:43 -0500 Subject: [PATCH] Shielding now uses StringIDs --- zone/StringIDs.h | 3 +++ zone/client_packet.cpp | 8 +++++--- zone/client_process.cpp | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/zone/StringIDs.h b/zone/StringIDs.h index a09563274..5609ec2cd 100644 --- a/zone/StringIDs.h +++ b/zone/StringIDs.h @@ -224,6 +224,9 @@ #define SUSPEND_MINION_SUSPEND 3268 //%1 tells you, 'By your command, master.' #define ONLY_SUMMONED_PETS 3269 //3269 This effect only works with summoned pets. #define SUSPEND_MINION_FIGHTING 3270 //Your pet must be at peace, first. +#define ALREADY_SHIELDED 3279 //Either you or your target is already being shielded. +#define START_SHIELDING 3281 //%1 begins to use %2 as a living shield! +#define END_SHIELDING 3282 //%1 ceases protecting %2. #define TRADESKILL_MISSING_ITEM 3455 //You are missing a %1. #define TRADESKILL_MISSING_COMPONENTS 3456 //Sorry, but you don't have everything you need for this recipe in your general inventory. #define TRADESKILL_LEARN_RECIPE 3457 //You have learned the recipe %1! diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 1b3485ec8..f8d90f745 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1615,7 +1615,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app) if (shield_target) { - entity_list.MessageClose(this,false,100,0,"%s ceases shielding %s.",GetName(),shield_target->GetName()); + entity_list.MessageClose_StringID(this, false, 100, 0, + END_SHIELDING, GetName(), shield_target->GetName()); for (int y = 0; y < 2; y++) { if (shield_target->shielder[y].shielder_id == GetID()) @@ -1640,7 +1641,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app) { if (shield_target->shielder[x].shielder_id == 0) { - entity_list.MessageClose(this,false,100,0,"%s uses their shield to guard %s.",GetName(),shield_target->GetName()); + entity_list.MessageClose_StringID(this ,false, 100, 0, + START_SHIELDING, GetName(), shield_target->GetName()); shield_target->shielder[x].shielder_id = GetID(); int shieldbonus = shield->AC*2; switch (GetAA(197)) @@ -1677,7 +1679,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app) } if (!ack) { - Message(0, "No more than two warriors may shield the same being."); + Message_StringID(0, ALREADY_SHIELDED); shield_target = 0; return; } diff --git a/zone/client_process.cpp b/zone/client_process.cpp index dad18843d..f1e25226a 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -581,7 +581,8 @@ bool Client::Process() { { if (!CombatRange(shield_target)) { - entity_list.MessageClose(this,false,100,0,"%s ceases shielding %s.",GetCleanName(),shield_target->GetCleanName()); + entity_list.MessageClose_StringID(this, false, 100, 0, + END_SHIELDING, GetCleanName(), shield_target->GetCleanName()); for (int y = 0; y < 2; y++) { if (shield_target->shielder[y].shielder_id == GetID())