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

Update pet command messages

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-05-04 22:55:17 -04:00
parent 7e2136a5a8
commit fe9fb72dff
2 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
zone/client_packet.cpp
View File

@ -10233,11 +10233,20 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
if (mypet->IsHeld()) if (mypet->IsHeld())
{ {
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
mypet->SetHeld(false); mypet->SetHeld(false);
} }
else else
{ {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD); // they use new messages now, but only SoD+? if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater)
mypet->Say_StringID(MT_PetResponse, PET_NOW_HOLDING);
else
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD);
mypet->SetHeld(true); mypet->SetHeld(true);
} }
mypet->SetGHeld(false); mypet->SetGHeld(false);
@ -10247,7 +10256,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
} }
case PET_HOLD_ON: { case PET_HOLD_ON: {
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && !mypet->IsHeld()) { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && !mypet->IsHeld()) {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD); if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater)
mypet->Say_StringID(MT_PetResponse, PET_NOW_HOLDING);
else
mypet->Say_StringID(MT_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);
@ -10255,19 +10270,29 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
} }
case PET_HOLD_OFF: { case PET_HOLD_OFF: {
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsHeld()) if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsHeld()) {
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
mypet->SetHeld(false); mypet->SetHeld(false);
}
break; break;
} }
case PET_GHOLD: { case PET_GHOLD: {
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
if (mypet->IsGHeld()) if (mypet->IsGHeld())
{ {
if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater)
Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
mypet->SetGHeld(false); mypet->SetGHeld(false);
} }
else else
{ {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD); // message wrong if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater) {
Message_StringID(MT_PetResponse, PET_ON_GHOLD);
mypet->Say_StringID(MT_PetResponse, PET_GHOLD_ON_MSG);
} else {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD);
}
mypet->SetGHeld(true); mypet->SetGHeld(true);
} }
mypet->SetHeld(false); mypet->SetHeld(false);
@ -10277,7 +10302,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
} }
case PET_GHOLD_ON: { case PET_GHOLD_ON: {
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) { if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD); if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater) {
Message_StringID(MT_PetResponse, PET_ON_GHOLD);
mypet->Say_StringID(MT_PetResponse, PET_GHOLD_ON_MSG);
} else {
mypet->Say_StringID(MT_PetResponse, PET_ON_HOLD);
}
mypet->SetGHeld(true); mypet->SetGHeld(true);
mypet->SetHeld(false); mypet->SetHeld(false);
SetPetCommandState(PET_BUTTON_HOLD, 0); SetPetCommandState(PET_BUTTON_HOLD, 0);
@ -10285,8 +10315,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
} }
case PET_GHOLD_OFF: { case PET_GHOLD_OFF: {
if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsGHeld()) if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsGHeld()) {
if (m_ClientVersionBit & EQEmu::versions::bit_UFAndLater)
Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
mypet->SetGHeld(false); mypet->SetGHeld(false);
}
break; break;
} }
case PET_SPELLHOLD: { case PET_SPELLHOLD: {
@ -10295,10 +10328,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (mypet->IsNoCast()) { if (mypet->IsNoCast()) {
Message_StringID(MT_PetResponse, PET_CASTING); Message_StringID(MT_PetResponse, PET_CASTING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
mypet->SetNoCast(false); mypet->SetNoCast(false);
} }
else { else {
Message_StringID(MT_PetResponse, PET_NOT_CASTING); Message_StringID(MT_PetResponse, PET_NOT_CASTING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
mypet->SetNoCast(true); mypet->SetNoCast(true);
} }
} }
@ -10310,6 +10347,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (!mypet->IsNoCast()) { if (!mypet->IsNoCast()) {
Message_StringID(MT_PetResponse, PET_NOT_CASTING); Message_StringID(MT_PetResponse, PET_NOT_CASTING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
mypet->SetNoCast(true); mypet->SetNoCast(true);
} }
} }
@ -10321,6 +10360,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (mypet->IsNoCast()) { if (mypet->IsNoCast()) {
Message_StringID(MT_PetResponse, PET_CASTING); Message_StringID(MT_PetResponse, PET_CASTING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
mypet->SetNoCast(false); mypet->SetNoCast(false);
} }
} }
@ -10332,10 +10373,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (mypet->IsFocused()) { if (mypet->IsFocused()) {
Message_StringID(MT_PetResponse, PET_NOT_FOCUSING); Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
mypet->SetFocused(false); mypet->SetFocused(false);
} }
else { else {
Message_StringID(MT_PetResponse, PET_NOW_FOCUSING); Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
mypet->SetFocused(true); mypet->SetFocused(true);
} }
} }
@ -10347,6 +10392,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (!mypet->IsFocused()) { if (!mypet->IsFocused()) {
Message_StringID(MT_PetResponse, PET_NOW_FOCUSING); Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
mypet->SetFocused(true); mypet->SetFocused(true);
} }
} }
@ -10358,6 +10405,8 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
break; break;
if (mypet->IsFocused()) { if (mypet->IsFocused()) {
Message_StringID(MT_PetResponse, PET_NOT_FOCUSING); Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
if (m_ClientVersionBit & EQEmu::versions::bit_SoDAndLater)
Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
mypet->SetFocused(false); mypet->SetFocused(false);
} }
} }

7
zone/string_ids.h
View File

@ -164,6 +164,12 @@
#define PVP_ON 552 //You are now player kill and follow the ways of Discord. #define PVP_ON 552 //You are now player kill and follow the ways of Discord.
#define GENERIC_STRINGID_SAY 554 //%1 says '%T2' #define GENERIC_STRINGID_SAY 554 //%1 says '%T2'
#define CANNOT_WAKE 555 //%1 tells you, 'I am unable to wake %2, master.' #define CANNOT_WAKE 555 //%1 tells you, 'I am unable to wake %2, master.'
#define PET_HOLD_SET_ON 698 //The pet hold mode has been set to on.
#define PET_HOLD_SET_OFF 699 //The pet hold mode has been set to off.
#define PET_FOCUS_SET_ON 700 //The pet focus mode has been set to on.
#define PET_FOCUS_SET_OFF 701 //The pet focus mode has been set to off.
#define PET_SPELLHOLD_SET_ON 702 //The pet spellhold mode has been set to on.
#define PET_SPELLHOLD_SET_OFF 703 //The pet spellhold mode has been set to off.
#define GUILD_NAME_IN_USE 711 //You cannot create a guild with that name, that guild already exists on this server. #define GUILD_NAME_IN_USE 711 //You cannot create a guild with that name, that guild already exists on this server.
#define GM_GAINXP 1002 //[GM] You have gained %1 AXP and %2 EXP (%3). #define GM_GAINXP 1002 //[GM] You have gained %1 AXP and %2 EXP (%3).
#define MALE_SLAYUNDEAD 1007 //%1's holy blade cleanses his target!(%2) #define MALE_SLAYUNDEAD 1007 //%1's holy blade cleanses his target!(%2)
@ -322,6 +328,7 @@
#define SENTINEL_TRIG_YOU 6724 //You have triggered your sentinel. #define SENTINEL_TRIG_YOU 6724 //You have triggered your sentinel.
#define SENTINEL_TRIG_OTHER 6725 //%1 has triggered your sentinel. #define SENTINEL_TRIG_OTHER 6725 //%1 has triggered your sentinel.
#define IDENTIFY_SPELL 6765 //Item Lore: %1. #define IDENTIFY_SPELL 6765 //Item Lore: %1.
#define PET_NOW_HOLDING 6834 //Now holding, Master. I will not start attacks until ordered.
#define PET_ON_GHOLD 6843 //Pet greater hold has been set to on. #define PET_ON_GHOLD 6843 //Pet greater hold has been set to on.
#define PET_OFF_GHOLD 6846 //Pet greater hold has been set to off. #define PET_OFF_GHOLD 6846 //Pet greater hold has been set to off.
#define PET_GHOLD_ON_MSG 6847 //Now greater holding master. I will only attack something new if ordered. #define PET_GHOLD_ON_MSG 6847 //Now greater holding master. I will only attack something new if ordered.