pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More function name refactoring

Browse Source
This commit is contained in:
Akkadius 2019-08-11 01:09:11 -05:00
parent 665efe09f3
commit 20bd37dde7
13 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eq_constants.h
View File

@ -71,7 +71,7 @@
//#define AT_Trader 300 // Bazaar Trader Mode (not present in SoF or RoF2) //#define AT_Trader 300 // Bazaar Trader Mode (not present in SoF or RoF2)
// animations for AT_Anim // animations for AT_Anim
#define ANIM_FREEZE 102 #define ANIM_FREEZE 102
#define ANIM_STAND 0x64 #define ANIM_STAND 0x64
#define ANIM_SIT 0x6e #define ANIM_SIT 0x6e
#define ANIM_CROUCH 0x6f #define ANIM_CROUCH 0x6f

2
zone/attack.cpp
View File

@ -1914,7 +1914,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
//Check that we can attack before we calc heading and face our target //Check that we can attack before we calc heading and face our target
if (!IsAttackAllowed(other)) { if (!IsAttackAllowed(other)) {
if (this->GetOwnerID()) if (this->GetOwnerID())
this->Say_StringID(NOT_LEGAL_TARGET); this->SayString(NOT_LEGAL_TARGET);
if (other) { if (other) {
if (other->IsClient()) if (other->IsClient())
other->CastToClient()->RemoveXTarget(this, false); other->CastToClient()->RemoveXTarget(this, false);

8
zone/bot.cpp
View File

@ -2276,12 +2276,12 @@ void Bot::AI_Process() {
// Berserk updates should occur if primary AI criteria are met // Berserk updates should occur if primary AI criteria are met
if (GetClass() == WARRIOR || GetClass() == BERSERKER) { if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
if (!berserk && GetHP() > 0 && GetHPRatio() < 30.0f) { if (!berserk && GetHP() > 0 && GetHPRatio() < 30.0f) {
entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName()); entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
berserk = true; berserk = true;
} }
if (berserk && GetHPRatio() >= 30.0f) { if (berserk && GetHPRatio() >= 30.0f) {
entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName()); entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
berserk = false; berserk = false;
} }
} }
@ -5364,7 +5364,7 @@ bool Bot::TryFinishingBlow(Mob *defender, int &damage)
if (defender->GetLevel() <= levelreq && (chance >= zone->random.Int(1, 1000))) { if (defender->GetLevel() <= levelreq && (chance >= zone->random.Int(1, 1000))) {
Log(Logs::Detail, Logs::Combat, "Landed a finishing blow: levelreq at %d, other level %d", Log(Logs::Detail, Logs::Combat, "Landed a finishing blow: levelreq at %d, other level %d",
levelreq, defender->GetLevel()); levelreq, defender->GetLevel());
entity_list.MessageClose_StringID(this, false, 200, Chat::MeleeCrit, FINISHING_BLOW, GetName()); entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, FINISHING_BLOW, GetName());
damage = fb_damage; damage = fb_damage;
return true; return true;
} else { } else {
@ -5572,7 +5572,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) {
if (bIsBehind || bCanFrontalBS) { if (bIsBehind || bCanFrontalBS) {
int chance = (10 + (GetDEX() / 10) + (itembonuses.HeroicDEX / 10)); int chance = (10 + (GetDEX() / 10) + (itembonuses.HeroicDEX / 10));
if(level >= 60 && other->GetLevel() <= 45 && !other->CastToNPC()->IsEngaged() && other->GetHP()<= 32000 && other->IsNPC() && zone->random.Real(0, 99) < chance) { if(level >= 60 && other->GetLevel() <= 45 && !other->CastToNPC()->IsEngaged() && other->GetHP()<= 32000 && other->IsNPC() && zone->random.Real(0, 99) < chance) {
entity_list.MessageClose_StringID(this, false, 200, Chat::MeleeCrit, ASSASSINATES, GetName()); entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, ASSASSINATES, GetName());
RogueAssassinate(other); RogueAssassinate(other);
} else { } else {
RogueBackstab(other); RogueBackstab(other);

4
zone/bot_command.cpp
View File

@ -7454,7 +7454,7 @@ void bot_subcommand_pet_get_lost(Client *c, const Seperator *sep)
if (!bot_iter->GetPet() || bot_iter->GetPet()->IsCharmed()) if (!bot_iter->GetPet() || bot_iter->GetPet()->IsCharmed())
continue; continue;
bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING); bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
bot_iter->GetPet()->Depop(false); bot_iter->GetPet()->Depop(false);
bot_iter->SetPetID(0); bot_iter->SetPetID(0);
database.botdb.DeletePetItems(bot_iter->GetBotID()); database.botdb.DeletePetItems(bot_iter->GetBotID());
@ -7500,7 +7500,7 @@ void bot_subcommand_pet_remove(Client *c, const Seperator *sep)
} }
if (bot_iter->GetPet()) { if (bot_iter->GetPet()) {
bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING); bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
bot_iter->GetPet()->Depop(false); bot_iter->GetPet()->Depop(false);
bot_iter->SetPetID(0); bot_iter->SetPetID(0);
} }

10
zone/client.cpp
View File

@ -7948,7 +7948,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
} }
// If no primary faction or biggest influence is your faction hit // If no primary faction or biggest influence is your faction hit
if (primaryfaction <= 0 || lowestvalue == tmpFactionValue) { if (primaryfaction <= 0 || lowestvalue == tmpFactionValue) {
merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6)); merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6));
} else if (lowestvalue == fmod.race_mod) { // race biggest } else if (lowestvalue == fmod.race_mod) { // race biggest
// Non-standard race (ex. illusioned to wolf) // Non-standard race (ex. illusioned to wolf)
if (GetRace() > PLAYER_RACE_COUNT) { if (GetRace() > PLAYER_RACE_COUNT) {
@ -7967,7 +7967,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
messageid = WONT_SELL_NONSTDRACE1; messageid = WONT_SELL_NONSTDRACE1;
break; break;
} }
merchant->Say_StringID(messageid); merchant->SayString(messageid);
} else { // normal player races } else { // normal player races
messageid = zone->random.Int(1, 4); messageid = zone->random.Int(1, 4);
switch (messageid) { switch (messageid) {
@ -7987,15 +7987,15 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
messageid = WONT_SELL_RACE1; messageid = WONT_SELL_RACE1;
break; break;
} }
merchant->Say_StringID(messageid, itoa(GetRace())); merchant->SayString(messageid, itoa(GetRace()));
} }
} else if (lowestvalue == fmod.class_mod) { } else if (lowestvalue == fmod.class_mod) {
merchant->Say_StringID(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass())); merchant->SayString(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass()));
} else { } else {
// Must be deity - these two sound the best for that. // Must be deity - these two sound the best for that.
// Can't use a message with a field, GUI wants class/race names. // Can't use a message with a field, GUI wants class/race names.
// for those message IDs. These are straight text. // for those message IDs. These are straight text.
merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2)); merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2));
} }
return; return;
} }

64
zone/client_packet.cpp
View File

@ -8727,7 +8727,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
#endif #endif
// This Seems to be handled in OP_DeleteItem handling // This Seems to be handled in OP_DeleteItem handling
//DeleteItemInInventory(slot_id, 1, false); //DeleteItemInInventory(slot_id, 1, false);
//entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name); //entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
//Should add intoxication level to the PP at some point //Should add intoxication level to the PP at some point
//CheckIncreaseSkill(ALCOHOL_TOLERANCE, nullptr, 25); //CheckIncreaseSkill(ALCOHOL_TOLERANCE, nullptr, 25);
} }
@ -9953,11 +9953,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (target) { if (target) {
auto owner = target->GetOwner(); auto owner = target->GetOwner();
if (owner) if (owner)
target->Say_StringID(PET_LEADERIS, owner->GetCleanName()); target->SayString(PET_LEADERIS, owner->GetCleanName());
else else
target->Say_StringID(I_FOLLOW_NOONE); target->SayString(I_FOLLOW_NOONE);
} else if (mypet) { } else if (mypet) {
mypet->Say_StringID(PET_LEADERIS, GetName()); mypet->SayString(PET_LEADERIS, GetName());
} }
} }
@ -9996,7 +9996,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; //prevent pet from attacking stuff while feared break; //prevent pet from attacking stuff while feared
if (!mypet->IsAttackAllowed(target)) { if (!mypet->IsAttackAllowed(target)) {
mypet->SayTo_StringID(this, NOT_LEGAL_TARGET); mypet->SayString(this, NOT_LEGAL_TARGET);
break; break;
} }
@ -10045,7 +10045,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
} }
if (!mypet->IsAttackAllowed(GetTarget())) { if (!mypet->IsAttackAllowed(GetTarget())) {
mypet->SayTo_StringID(this, NOT_LEGAL_TARGET); mypet->SayString(this, NOT_LEGAL_TARGET);
break; break;
} }
@ -10070,7 +10070,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsFeared()) break; //keeps pet running while feared if (mypet->IsFeared()) break; //keeps pet running while feared
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_CALMING); mypet->SayString(this, Chat::PetResponse, PET_CALMING);
mypet->WipeHateList(); mypet->WipeHateList();
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
@ -10101,13 +10101,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
SetPet(nullptr); SetPet(nullptr);
} }
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GETLOST_STRING); mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
mypet->CastToNPC()->Depop(); mypet->CastToNPC()->Depop();
//Oddly, the client (Titanium) will still allow "/pet get lost" command despite me adding the code below. If someone can figure that out, you can uncomment this code and use it. //Oddly, the client (Titanium) will still allow "/pet get lost" command despite me adding the code below. If someone can figure that out, you can uncomment this code and use it.
/* /*
if((mypet->GetPetType() == petAnimation && GetAA(aaAnimationEmpathy) >= 2) || mypet->GetPetType() != petAnimation) { if((mypet->GetPetType() == petAnimation && GetAA(aaAnimationEmpathy) >= 2) || mypet->GetPetType() != petAnimation) {
mypet->Say_StringID(PET_GETLOST_STRING); mypet->SayString(PET_GETLOST_STRING);
mypet->CastToNPC()->Depop(); mypet->CastToNPC()->Depop();
} }
*/ */
@ -10119,7 +10119,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
if (mypet->IsNPC()) { if (mypet->IsNPC()) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GUARDINGLIFE); mypet->SayString(this, Chat::PetResponse, PET_GUARDINGLIFE);
mypet->SetPetOrder(SPO_Guard); mypet->SetPetOrder(SPO_Guard);
mypet->CastToNPC()->SaveGuardSpot(mypet->GetPosition()); mypet->CastToNPC()->SaveGuardSpot(mypet->GetPosition());
if (!mypet->GetTarget()) // want them to not twitch if they're chasing something down if (!mypet->GetTarget()) // want them to not twitch if they're chasing something down
@ -10136,7 +10136,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_FOLLOWING); mypet->SayString(this, Chat::PetResponse, PET_FOLLOWING);
mypet->SetPetOrder(SPO_Follow); mypet->SetPetOrder(SPO_Follow);
mypet->SendAppearancePacket(AT_Anim, ANIM_STAND); mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
@ -10179,7 +10179,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GUARDME_STRING); mypet->SayString(this, Chat::PetResponse, PET_GUARDME_STRING);
mypet->SetPetOrder(SPO_Follow); mypet->SetPetOrder(SPO_Follow);
mypet->SendAppearancePacket(AT_Anim, ANIM_STAND); mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
@ -10195,13 +10195,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
if (mypet->GetPetOrder() == SPO_Sit) if (mypet->GetPetOrder() == SPO_Sit)
{ {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_SIT_STRING); mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
mypet->SetPetOrder(SPO_Follow); mypet->SetPetOrder(SPO_Follow);
mypet->SendAppearancePacket(AT_Anim, ANIM_STAND); mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
} }
else else
{ {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_SIT_STRING); mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
mypet->SetPetOrder(SPO_Sit); mypet->SetPetOrder(SPO_Sit);
mypet->SetRunAnimSpeed(0); mypet->SetRunAnimSpeed(0);
if (!mypet->UseBardSpellLogic()) //maybe we can have a bard pet if (!mypet->UseBardSpellLogic()) //maybe we can have a bard pet
@ -10215,7 +10215,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_SIT_STRING); mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
mypet->SetPetOrder(SPO_Follow); mypet->SetPetOrder(SPO_Follow);
mypet->SendAppearancePacket(AT_Anim, ANIM_STAND); mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
} }
@ -10225,7 +10225,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_SIT_STRING); mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
mypet->SetPetOrder(SPO_Sit); mypet->SetPetOrder(SPO_Sit);
mypet->SetRunAnimSpeed(0); mypet->SetRunAnimSpeed(0);
if (!mypet->UseBardSpellLogic()) //maybe we can have a bard pet if (!mypet->UseBardSpellLogic()) //maybe we can have a bard pet
@ -10248,9 +10248,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
MessageString(Chat::PetResponse, PET_HOLD_SET_ON); MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
mypet->SayTo_StringID(this, Chat::PetResponse, PET_NOW_HOLDING); mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
else else
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
mypet->SetHeld(true); mypet->SetHeld(true);
} }
@ -10265,9 +10265,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
MessageString(Chat::PetResponse, PET_HOLD_SET_ON); MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
mypet->SayTo_StringID(this, Chat::PetResponse, PET_NOW_HOLDING); mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
else else
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
mypet->SetHeld(true); mypet->SetHeld(true);
mypet->SetGHeld(false); mypet->SetGHeld(false);
SetPetCommandState(PET_BUTTON_GHOLD, 0); SetPetCommandState(PET_BUTTON_GHOLD, 0);
@ -10294,9 +10294,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
{ {
if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
MessageString(Chat::PetResponse, PET_ON_GHOLD); MessageString(Chat::PetResponse, PET_ON_GHOLD);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GHOLD_ON_MSG); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
} else { } else {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
} }
mypet->SetGHeld(true); mypet->SetGHeld(true);
} }
@ -10309,9 +10309,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) { if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
MessageString(Chat::PetResponse, PET_ON_GHOLD); MessageString(Chat::PetResponse, PET_ON_GHOLD);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GHOLD_ON_MSG); mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
} else { } else {
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_HOLD); mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
} }
mypet->SetGHeld(true); mypet->SetGHeld(true);
mypet->SetHeld(false); mypet->SetHeld(false);
@ -10432,7 +10432,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
SetPetCommandState(PET_BUTTON_REGROUP, 0); SetPetCommandState(PET_BUTTON_REGROUP, 0);
} }
} }
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GETLOST_STRING); mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
} }
break; break;
} }
@ -10443,7 +10443,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
mypet->SetPetStop(true); mypet->SetPetStop(true);
mypet->StopNavigation(); mypet->StopNavigation();
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GETLOST_STRING); mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
if (mypet->IsPetRegroup()) { if (mypet->IsPetRegroup()) {
mypet->SetPetRegroup(false); mypet->SetPetRegroup(false);
SetPetCommandState(PET_BUTTON_REGROUP, 0); SetPetCommandState(PET_BUTTON_REGROUP, 0);
@ -10456,7 +10456,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SetPetStop(false); mypet->SetPetStop(false);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_GETLOST_STRING); mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
} }
break; break;
} }
@ -10466,11 +10466,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (aabonuses.PetCommands[PetCommand]) { if (aabonuses.PetCommands[PetCommand]) {
if (mypet->IsPetRegroup()) { if (mypet->IsPetRegroup()) {
mypet->SetPetRegroup(false); mypet->SetPetRegroup(false);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_OFF_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
} else { } else {
mypet->SetPetRegroup(true); mypet->SetPetRegroup(true);
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
mypet->SetPetStop(false); mypet->SetPetStop(false);
SetPetCommandState(PET_BUTTON_STOP, 0); SetPetCommandState(PET_BUTTON_STOP, 0);
@ -10485,7 +10485,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (aabonuses.PetCommands[PetCommand]) { if (aabonuses.PetCommands[PetCommand]) {
mypet->SetPetRegroup(true); mypet->SetPetRegroup(true);
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_ON_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
if (mypet->IsPetStop()) { if (mypet->IsPetStop()) {
mypet->SetPetStop(false); mypet->SetPetStop(false);
SetPetCommandState(PET_BUTTON_STOP, 0); SetPetCommandState(PET_BUTTON_STOP, 0);
@ -10498,7 +10498,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (aabonuses.PetCommands[PetCommand]) { if (aabonuses.PetCommands[PetCommand]) {
mypet->SetPetRegroup(false); mypet->SetPetRegroup(false);
mypet->SayTo_StringID(this, Chat::PetResponse, PET_OFF_REGROUPING); mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
} }
break; break;
} }
@ -13043,7 +13043,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
// 1199 I don't have time for that now. etc // 1199 I don't have time for that now. etc
if (!tmp->CastToNPC()->IsMerchantOpen()) { if (!tmp->CastToNPC()->IsMerchantOpen()) {
tmp->Say_StringID(zone->random.Int(1199, 1202)); tmp->SayString(zone->random.Int(1199, 1202));
action = 0; action = 0;
} }

4
zone/client_process.cpp
View File

@ -1527,7 +1527,7 @@ void Client::OPGMTraining(const EQApplicationPacket *app)
// welcome message // welcome message
if (pTrainer && pTrainer->IsNPC()) if (pTrainer && pTrainer->IsNPC())
{ {
pTrainer->Say_StringID(zone->random.Int(1204, 1207), GetCleanName()); pTrainer->SayString(zone->random.Int(1204, 1207), GetCleanName());
} }
} }
@ -1556,7 +1556,7 @@ void Client::OPGMEndTraining(const EQApplicationPacket *app)
// goodbye message // goodbye message
if (pTrainer->IsNPC()) if (pTrainer->IsNPC())
{ {
pTrainer->Say_StringID(zone->random.Int(1208, 1211), GetCleanName()); pTrainer->SayString(zone->random.Int(1208, 1211), GetCleanName());
} }
} }

4
zone/merc.cpp
View File

@ -1637,11 +1637,11 @@ void Merc::AI_Process() {
// TODO: Do mercs berserk? Find this out on live... // TODO: Do mercs berserk? Find this out on live...
//if (GetClass() == WARRIOR || GetClass() == BERSERKER) { //if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
// if(GetHP() > 0 && !berserk && this->GetHPRatio() < 30) { // if(GetHP() > 0 && !berserk && this->GetHPRatio() < 30) {
// entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName()); // entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
// this->berserk = true; // this->berserk = true;
// } // }
// if (berserk && this->GetHPRatio() > 30) { // if (berserk && this->GetHPRatio() > 30) {
// entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName()); // entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
// this->berserk = false; // this->berserk = false;
// } // }
//} //}

8
zone/mob.cpp
View File

@ -2844,7 +2844,7 @@ void Mob::Say(const char *format, ...)
// //
// this is like the above, but the first parameter is a string id // this is like the above, but the first parameter is a string id
// //
void Mob::Say_StringID(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9) void Mob::SayString(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
{ {
char string_id_str[10]; char string_id_str[10];
@ -2857,7 +2857,7 @@ void Mob::Say_StringID(uint32 string_id, const char *message3, const char *messa
); );
} }
void Mob::Say_StringID(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9) void Mob::SayString(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
{ {
char string_id_str[10]; char string_id_str[10];
@ -2870,7 +2870,7 @@ void Mob::Say_StringID(uint32 type, uint32 string_id, const char *message3, cons
); );
} }
void Mob::SayTo_StringID(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9) void Mob::SayString(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
{ {
if (!to) if (!to)
return; return;
@ -2880,7 +2880,7 @@ void Mob::SayTo_StringID(Client *to, uint32 string_id, const char *message3, con
to->MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9); to->MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
} }
void Mob::SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9) void Mob::SayString(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
{ {
if (!to) if (!to)
return; return;

8
zone/mob.h
View File

@ -734,13 +734,13 @@ public:
const char *message7 = nullptr, const char *message8 = nullptr, const char *message7 = nullptr, const char *message8 = nullptr,
const char *message9 = nullptr) { } const char *message9 = nullptr) { }
void Say(const char *format, ...); void Say(const char *format, ...);
void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, void SayString(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, void SayString(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
void SayTo_StringID(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, void SayString(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
void SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0, void SayString(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0); const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
void Shout(const char *format, ...); void Shout(const char *format, ...);
void Emote(const char *format, ...); void Emote(const char *format, ...);

2
zone/oldcode.cpp
View File

@ -1233,7 +1233,7 @@ Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0]
return; return;
duration = 11; duration = 11;
reuse = 60*60; reuse = 60*60;
entity_list.MessageClose_StringID(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName()); entity_list.MessageCloseString(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName());
//entity_list.MessageClose(this, false, 100, 0, "%s becomes fearless!", GetName()); //entity_list.MessageClose(this, false, 100, 0, "%s becomes fearless!", GetName());
break; break;
} }

2
zone/special_attacks.cpp
View File

@ -1953,7 +1953,7 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
} }
if (who->CanTalk()) if (who->CanTalk())
who->Say_StringID(SUCCESSFUL_TAUNT, GetCleanName()); who->SayString(SUCCESSFUL_TAUNT, GetCleanName());
} else { } else {
MessageString(Chat::SpellFailure, FAILED_TAUNT); MessageString(Chat::SpellFailure, FAILED_TAUNT);
} }

6
zone/tasks.cpp
View File

@ -1001,7 +1001,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
return; return;
if (TaskSets[TaskSetID].empty()) { if (TaskSets[TaskSetID].empty()) {
mob->SayTo_StringID(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow
return; return;
} }
@ -1033,7 +1033,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
if (TaskListIndex > 0) { if (TaskListIndex > 0) {
SendTaskSelector(c, mob, TaskListIndex, TaskList); SendTaskSelector(c, mob, TaskListIndex, TaskList);
} else { } else {
mob->SayTo_StringID(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
} }
return; return;
@ -1065,7 +1065,7 @@ void TaskManager::TaskQuestSetSelector(Client *c, ClientTaskState *state, Mob *m
if (TaskListIndex > 0) { if (TaskListIndex > 0) {
SendTaskSelector(c, mob, TaskListIndex, TaskList); SendTaskSelector(c, mob, TaskListIndex, TaskList);
} else { } else {
mob->SayTo_StringID(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
} }
return; return;