diff --git a/common/servertalk.h b/common/servertalk.h index 6fb03a987..98cb8c141 100644 --- a/common/servertalk.h +++ b/common/servertalk.h @@ -43,7 +43,7 @@ #define ServerOP_OnlineGuildMembersResponse 0x0016 #define ServerOP_LFGuildUpdate 0x0017 -#define ServerOP_FlagUpdate 0x0018 // GM Flag updated for character, refresh the memory cache +#define ServerOP_FlagUpdate 0x0018 // GM flag updated for character, refresh the memory cache #define ServerOP_GMGoto 0x0019 #define ServerOP_MultiLineMsg 0x001A #define ServerOP_Lock 0x001B // For #lock/#unlock inside server diff --git a/world/shared_task_manager.cpp b/world/shared_task_manager.cpp index dab7ca6b8..15925daed 100644 --- a/world/shared_task_manager.cpp +++ b/world/shared_task_manager.cpp @@ -1356,7 +1356,7 @@ bool SharedTaskManager::CanRequestSharedTask(uint32_t task_id, const SharedTaskR } if (is_gm) { - client_list.SendCharacterMessage(requester->CharID(), Chat::White, "Your GM Flag allows you to bypass shared task minimum player requirements."); + client_list.SendCharacterMessage(requester->CharID(), Chat::White, "Your GM flag allows you to bypass shared task minimum player requirements."); } // check if party member count is above the maximum diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index cd3a599b1..ea96e5726 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -543,7 +543,7 @@ void Client::CompleteConnect() LoadZoneFlags(); LoadAccountFlags(); - /* Sets GM Flag if needed & Sends Petition Queue */ + /* Sets GM flag if needed & Sends Petition Queue */ UpdateAdmin(false); // Task Packets @@ -717,7 +717,7 @@ void Client::CompleteConnect() break; } - Message(Chat::White, "Your GM Flag allows you to levitate in this zone."); + Message(Chat::White, "Your GM flag allows you to levitate in this zone."); } SendAppearancePacket( @@ -2141,7 +2141,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app) Message( Chat::White, fmt::format( - "Your GM Flag prevents {} from being added to discovered items.", + "Your GM flag prevents {} from being added to discovered items.", item_link ).c_str() ); @@ -2707,7 +2707,7 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app) Message( Chat::White, fmt::format( - "Your GM Flag prevents {} from being added to discovered items.", + "Your GM flag prevents {} from being added to discovered items.", item_link ).c_str() ); @@ -14251,7 +14251,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app) Message( Chat::White, fmt::format( - "Your GM Flag prevents {} from being added to discovered items.", + "Your GM flag prevents {} from being added to discovered items.", item_link ).c_str() ); diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 2ab3fbe0c..b31ceb711 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -1919,7 +1919,7 @@ void Client::DoStaminaHungerUpdate() sta->food = 6000; sta->water = 6000; - Message(Chat::White, "Your GM Flag prevents you from consuming food or water."); + Message(Chat::White, "Your GM flag prevents you from consuming food or water."); } } else { // No auto food/drink consumption in the Bazaar sta->food = 6000; diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 11dbb0782..4bc8a3163 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -1162,7 +1162,7 @@ void Corpse::MakeLootRequestPackets(Client *c, const EQApplicationPacket *app) c->Message(Chat::White, "Your GM Status allows you to loot any items on this corpse."); } else { m_loot_request_type = LootRequestType::GMPeek; - c->Message(Chat::White, "Your GM Flag allows you to look at the items on this corpse."); + c->Message(Chat::White, "Your GM flag allows you to look at the items on this corpse."); } } else { @@ -1624,7 +1624,7 @@ void Corpse::LootCorpseItem(Client *c, const EQApplicationPacket *app) c->Message( Chat::White, fmt::format( - "Your GM Flag prevents {} from being added to discovered items.", + "Your GM flag prevents {} from being added to discovered items.", item_link ).c_str() ); @@ -2301,7 +2301,7 @@ void Corpse::CastRezz(uint16 spell_id, Mob *caster) return; } - caster->Message(Chat::White, "Your GM Flag allows you to resurrect this corpse."); + caster->Message(Chat::White, "Your GM flag allows you to resurrect this corpse."); } } @@ -2314,7 +2314,7 @@ void Corpse::CastRezz(uint16 spell_id, Mob *caster) m_rezzed_experience = m_gm_rezzed_experience; m_gm_rezzed_experience = 0; - c->Message(Chat::White, "Your GM Flag allows you to resurrect this corpse and return experience."); + c->Message(Chat::White, "Your GM flag allows you to resurrect this corpse and return experience."); } } } diff --git a/zone/doors.cpp b/zone/doors.cpp index a98f90af0..c5364c0fd 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -295,7 +295,7 @@ void Doors::HandleClick(Client *sender, uint8 trigger) ); sender->MessageString(Chat::LightBlue, DOORS_LOCKED); } else { - sender->Message(Chat::White, "Your GM Flag allows you to use this door."); + sender->Message(Chat::White, "Your GM flag allows you to use this door."); } } } @@ -344,7 +344,7 @@ void Doors::HandleClick(Client *sender, uint8 trigger) sender->Message( Chat::White, fmt::format( - "Your GM Flag allows you to use this door{}.", + "Your GM flag allows you to use this door{}.", ( has_guild_name ? fmt::format( @@ -544,7 +544,7 @@ void Doors::HandleClick(Client *sender, uint8 trigger) if (sender->GetGM() && has_key_required) { has_key_required = false; - sender->Message(Chat::White, "Your GM Flag allows you to open this door without a key."); + sender->Message(Chat::White, "Your GM flag allows you to open this door without a key."); } if (IsDestinationZoneSame() && (!required_key_item)) { diff --git a/zone/entity.cpp b/zone/entity.cpp index 44a93453f..2ccb7dc58 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1655,7 +1655,7 @@ void EntityList::QueueClientsByTarget(Mob *sender, const EQApplicationPacket *ap Send = clear_target_window; if (c->GetGM() || RuleB(Spells, AlwaysSendTargetsBuffs)) { if (c->GetGM()) { - c->Message(Chat::White, "Your GM Flag allows you to always see your targets' buffs."); + c->Message(Chat::White, "Your GM flag allows you to always see your targets' buffs."); } Send = !clear_target_window; diff --git a/zone/object.cpp b/zone/object.cpp index c92406ca7..5e0337853 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -650,7 +650,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) sender->Message( Chat::White, fmt::format( - "Your GM Flag prevents {} from being added to discovered items.", + "Your GM flag prevents {} from being added to discovered items.", item_link ).c_str() ); diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 615d563bf..02ff5bbc5 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -2977,7 +2977,7 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level initiator->Message(Chat::White, message.c_str()); return false; } else { - initiator->Message(Chat::White, "Your GM Flag allows you to bypass bot spawn limits."); + initiator->Message(Chat::White, "Your GM flag allows you to bypass bot spawn limits."); } } @@ -3003,7 +3003,7 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level initiator->Message(Chat::White, message.c_str()); return false; } else { - initiator->Message(Chat::White, "Your GM Flag allows you to bypass bot class-based spawn limits."); + initiator->Message(Chat::White, "Your GM flag allows you to bypass bot class-based spawn limits."); } } diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 85b21a318..9d43af69a 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -947,7 +947,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (IsClient()) { if (CastToClient()->GetGM() || RuleB(Character, BindAnywhere)) { if (CastToClient()->GetGM()) { - Message(Chat::White, "Your GM Flag allows you to bind anywhere."); + Message(Chat::White, "Your GM flag allows you to bind anywhere."); } auto action_packet = diff --git a/zone/spells.cpp b/zone/spells.cpp index f03fd6bbd..0895709b2 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -693,7 +693,7 @@ bool Mob::DoCastingChecksZoneRestrictions(bool check_on_casting, int32 spell_id) Message( Chat::White, fmt::format( - "Your GM Flag allows you to bypass zone casting restrictions and cast {} in this zone.", + "Your GM flag allows you to bypass zone casting restrictions and cast {} in this zone.", Saylink::Silent( fmt::format( "#castspell {}", @@ -728,7 +728,7 @@ bool Mob::DoCastingChecksZoneRestrictions(bool check_on_casting, int32 spell_id) Message( Chat::White, fmt::format( - "Your GM Flag allows you to bypass zone blocked spells and cast {} in this zone.", + "Your GM flag allows you to bypass zone blocked spells and cast {} in this zone.", Saylink::Silent( fmt::format( "#castspell {}", @@ -783,7 +783,7 @@ bool Mob::DoCastingChecksZoneRestrictions(bool check_on_casting, int32 spell_id) LogSpells("Spell casting canceled [{}] : can not cast outdoors.", spell_id); return false; } else { - Message(Chat::White, "Your GM Flag allows you to cast outdoor spells when indoors."); + Message(Chat::White, "Your GM flag allows you to cast outdoor spells when indoors."); } } } @@ -1101,7 +1101,7 @@ bool Client::CheckFizzle(uint16 spell_id) { // GMs don't fizzle if (GetGM()) { - Message(Chat::White, "Your GM Flag prevents you from fizzling."); + Message(Chat::White, "Your GM flag prevents you from fizzling."); return true; } @@ -1687,7 +1687,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo if (c->GetGM()) { c->Message( Chat::White, - "Your GM Flag allows you to finish casting even though you're missing a required instrument." + "Your GM flag allows you to finish casting even though you're missing a required instrument." ); } else { InterruptSpell(); @@ -1728,7 +1728,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo if (c->GetGM()) { c->Message( Chat::White, - "Your GM Flag allows you to finish casting even though you're missing required components." + "Your GM flag allows you to finish casting even though you're missing required components." ); } else { InterruptSpell(); diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 4562497d7..f0619db9c 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -124,7 +124,7 @@ bool Client::HasTaskRequestCooldownTimer() } if (GetGM()) { - Message(Chat::White, "Your GM Flag prevents you from having a task request cooldown."); + Message(Chat::White, "Your GM flag prevents you from having a task request cooldown."); } return (!GetGM() && task_request_timer.Enabled()); diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 8b4c35d16..f44ce19d6 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -1096,7 +1096,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) { zone->random.Roll(aa_chance) ) { if (GetGM()) { - Message(Chat::White, "Your GM Flag gives you a 100% chance to succeed in combining this tradeskill."); + Message(Chat::White, "Your GM flag gives you a 100% chance to succeed in combining this tradeskill."); } success_modifier = 1; diff --git a/zone/trading.cpp b/zone/trading.cpp index b932e8a0d..697c9556b 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -819,7 +819,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st Message( Chat::White, fmt::format( - "Your GM Flag allows you to give {} to {}.", + "Your GM flag allows you to give {} to {}.", item_link, GetTargetDescription(tradingWith) ).c_str() diff --git a/zone/trap.cpp b/zone/trap.cpp index fb72dc38f..78865d46d 100644 --- a/zone/trap.cpp +++ b/zone/trap.cpp @@ -99,7 +99,7 @@ bool Trap::Process() } if (is_gm_client) { - m->Message(Chat::White, "Your GM Flag prevents you from triggering a trap."); + m->Message(Chat::White, "Your GM flag prevents you from triggering a trap."); } } else if (reset_timer.Enabled() && reset_timer.Check()) @@ -321,7 +321,7 @@ Mob* EntityList::GetTrapTrigger(Trap* trap) } if (cur->GetGM()) { - cur->Message(Chat::White, "Your GM Flag prevents you from triggering a trap."); + cur->Message(Chat::White, "Your GM flag prevents you from triggering a trap."); } } else diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 5de4dba6c..ef7256cc5 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -373,8 +373,8 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) { } if (content_service.GetCurrentExpansion() >= Expansion::Classic && GetGM()) { - LogInfo("[{}] Bypassing zone expansion checks because GM Flag is set", GetCleanName()); - Message(Chat::White, "Your GM Flag allows you to bypass zone expansion checks."); + LogInfo("[{}] Bypassing zone expansion checks because GM flag is set", GetCleanName()); + Message(Chat::White, "Your GM flag allows you to bypass zone expansion checks."); } if (zoning_message == ZoningMessage::ZoneSuccess) {