pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-14 20:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Shielding now uses StringIDs

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-02-28 02:57:43 -05:00
parent c030cfe0ad
commit d525d23217
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/StringIDs.h
View File

@ -224,6 +224,9 @@
#define SUSPEND_MINION_SUSPEND 3268 //%1 tells you, 'By your command, master.' #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 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 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_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_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! #define TRADESKILL_LEARN_RECIPE 3457 //You have learned the recipe %1!

8
zone/client_packet.cpp
View File

@ -1615,7 +1615,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
if (shield_target) 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++) for (int y = 0; y < 2; y++)
{ {
if (shield_target->shielder[y].shielder_id == GetID()) 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) 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(); shield_target->shielder[x].shielder_id = GetID();
int shieldbonus = shield->AC*2; int shieldbonus = shield->AC*2;
switch (GetAA(197)) switch (GetAA(197))
@ -1677,7 +1679,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
} }
if (!ack) if (!ack)
{ {
Message(0, "No more than two warriors may shield the same being."); Message_StringID(0, ALREADY_SHIELDED);
shield_target = 0; shield_target = 0;
return; return;
} }

3
zone/client_process.cpp
View File

@ -581,7 +581,8 @@ bool Client::Process() {
{ {
if (!CombatRange(shield_target)) 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++) for (int y = 0; y < 2; y++)
{ {
if (shield_target->shielder[y].shielder_id == GetID()) if (shield_target->shielder[y].shielder_id == GetID())