From 2829d2105751c6fe27fbe2e637029b4c74551369 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 3 Jul 2022 18:57:33 -0400 Subject: [PATCH] [Cleanup] Update to EQEmu #2253 to clean up message strings (#2279) Added message string 1393 // You have been summoned! --- zone/spell_effects.cpp | 4 ++-- zone/string_ids.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 096b6cd48..25dac7a25 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -2137,7 +2137,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (IsClient()) { if (caster->IsClient()) { 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; } @@ -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(), caster->GetY(), caster->GetZ(), caster->GetHeading(), 2, SummonPC); - Message(Chat::Yellow, "You have been summoned!"); + MessageString(Chat::Spells, PLAYER_SUMMONED); } else { caster->Message(Chat::Red, "This spell can only be cast on players."); } diff --git a/zone/string_ids.h b/zone/string_ids.h index d64a36f51..f147dde70 100644 --- a/zone/string_ids.h +++ b/zone/string_ids.h @@ -265,6 +265,7 @@ #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_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 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.