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

Fixed more Message_StringID

Browse Source
This commit is contained in:
Trust 2018-07-21 23:22:14 -04:00
parent 9fa377303e
commit 2fe923457b
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.cpp
View File

@ -2733,7 +2733,7 @@ void Client::Disarm(Client* disarmer, int chance) {
return; 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) bool Client::BindWound(Mob *bindmob, bool start, bool fail)

3
zone/client_packet.cpp
View File

@ -5411,8 +5411,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) {
return; return;
} }
// Trying to disarm something we can't disarm // Trying to disarm something we can't disarm
Message(13, "Your attempt to disarm your target has failed."); Message_StringID(MT_Skills, DISARM_NO_TARGET);
// Message_StringID(MT_Skills, DISARM_FAILED);
return; return;
} }

7
zone/npc.cpp
View File

@ -1737,18 +1737,17 @@ void NPC::Disarm(Client* client, int chance) {
SendWearChange(matslot); SendWearChange(matslot);
if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary) if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary)
Say("Ahh! My weapon!"); 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) if (chance != 1000)
client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4); client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
return; 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) if (chance != 1000)
client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2); client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
return; 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) { void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool remove) {

1
zone/string_ids.h
View File

@ -301,6 +301,7 @@
#define CORPSEDRAG_STOPALL 4065 //You stop dragging the corpses. #define CORPSEDRAG_STOPALL 4065 //You stop dragging the corpses.
#define CORPSEDRAG_STOP 4066 //You stop dragging the corpse. #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 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 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 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' #define TELL_QUEUED_MESSAGE 5045 //You told %1 '%T2. %3'