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

Corrected Disarm StringID's

Browse Source
This commit is contained in:
Trust 2018-07-21 22:20:53 -04:00
parent 9251e6efd2
commit 9fa377303e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/eq_packet_structs.h
View File

@ -1784,7 +1784,6 @@ struct CombatAbility_Struct {
}; };
// Disarm Struct incoming from Client [Size: 16] // Disarm Struct incoming from Client [Size: 16]
// Haynar - 24 Jan 2011
struct Disarm_Struct struct Disarm_Struct
{ {
uint32 source; uint32 source;

8
zone/client.cpp
View File

@ -2718,18 +2718,16 @@ void Client::Disarm(Client* disarmer, int chance) {
if (matslot != -1) if (matslot != -1)
SendWearChange(matslot); SendWearChange(matslot);
} }
Message(MT_Skills, "You have been disarmed!"); Message_StringID(MT_Skills, DISARMED);
if (disarmer != this) if (disarmer != this)
disarmer->Message(MT_Skills, StringFormat("You have successfully disarmed %s", this->GetCleanName()).c_str()); disarmer->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
// Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
if (chance != 1000) if (chance != 1000)
disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4); disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
CalcBonuses(); CalcBonuses();
// CalcEnduranceWeightFactor(); // CalcEnduranceWeightFactor();
return; return;
} }
disarmer->Message(MT_Skills, StringFormat("You have failed to disarm your target").c_str()); disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
//disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
if (chance != 1000) if (chance != 1000)
disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2); disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
return; return;

3
zone/string_ids.h
View File

@ -446,6 +446,9 @@
#define TRY_ATTACKING_SOMEONE 12696 //Try attacking someone other than yourself, it's more productive #define TRY_ATTACKING_SOMEONE 12696 //Try attacking someone other than yourself, it's more productive
#define RANGED_TOO_CLOSE 12698 //Your target is too close to use a ranged weapon! #define RANGED_TOO_CLOSE 12698 //Your target is too close to use a ranged weapon!
#define BACKSTAB_WEAPON 12874 //You need a piercing weapon as your primary weapon in order to backstab #define BACKSTAB_WEAPON 12874 //You need a piercing weapon as your primary weapon in order to backstab
#define DISARMED 12889 //You have been disarmed!
#define DISARM_SUCCESS 12890 //You disarmed %1!
#define DISARM_FAILED 12891 //Your attempt to disarm failed.
#define MORE_SKILLED_THAN_I 12931 //%1 tells you, 'You are more skilled than I! What could I possibly teach you?' #define MORE_SKILLED_THAN_I 12931 //%1 tells you, 'You are more skilled than I! What could I possibly teach you?'
#define SURNAME_EXISTS 12939 //You already have a surname. Operation failed. #define SURNAME_EXISTS 12939 //You already have a surname. Operation failed.
#define SURNAME_LEVEL 12940 //You can only submit a surname upon reaching the 20th level. Operation failed. #define SURNAME_LEVEL 12940 //You can only submit a surname upon reaching the 20th level. Operation failed.