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

[Cleanup] Update to EQEmu #2253 to clean up message strings (#2279)

Browse Source 
Added message string 1393 // You have been summoned!
This commit is contained in:
Michael 2022-07-03 18:57:33 -04:00 committed by GitHub
parent 66d6d523cf
commit 2829d21057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/spell_effects.cpp
View File

@ -2137,7 +2137,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
if (IsClient()) { if (IsClient()) {
if (caster->IsClient()) { if (caster->IsClient()) {
if (!entity_list.IsInSameGroupOrRaidGroup(caster->CastToClient(), CastToClient())) { if (!entity_list.IsInSameGroupOrRaidGroup(caster->CastToClient(), CastToClient())) {
caster->Message(Chat::Red, "Your target must be a group member for this spell."); caster->MessageString(Chat::SpellFailure, TARGET_GROUP_MEMBER);
break; break;
} }
@ -2150,7 +2150,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), caster->GetX(), CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), caster->GetX(),
caster->GetY(), caster->GetZ(), caster->GetHeading(), 2, caster->GetY(), caster->GetZ(), caster->GetHeading(), 2,
SummonPC); SummonPC);
Message(Chat::Yellow, "You have been summoned!"); MessageString(Chat::Spells, PLAYER_SUMMONED);
} else { } else {
caster->Message(Chat::Red, "This spell can only be cast on players."); caster->Message(Chat::Red, "This spell can only be cast on players.");
} }

1
zone/string_ids.h
View File

@ -265,6 +265,7 @@
#define DUEL_DECLINE 1383 //%1 has declined your challenge to duel to the death. #define DUEL_DECLINE 1383 //%1 has declined your challenge to duel to the death.
#define DUEL_ACCEPTED 1384 //%1 has already accepted a duel with someone else. #define DUEL_ACCEPTED 1384 //%1 has already accepted a duel with someone else.
#define DUEL_CONSIDERING 1385 //%1 is considering a duel with someone else. #define DUEL_CONSIDERING 1385 //%1 is considering a duel with someone else.
#define PLAYER_SUMMONED 1393 //You have been summoned!
#define PLAYER_REGAIN 1394 //You have control of yourself again. #define PLAYER_REGAIN 1394 //You have control of yourself again.
#define REZZ_ALREADY_PENDING 1379 //You were unable to restore the corpse to life, but you may have success with a later attempt. #define REZZ_ALREADY_PENDING 1379 //You were unable to restore the corpse to life, but you may have success with a later attempt.
#define IN_USE 1406 //Someone else is using that. Try again later. #define IN_USE 1406 //Someone else is using that. Try again later.