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

[Bots] Place BOT_COMMAND_CHAR inside messages (#3027)

Browse Source 
* Fix bot depart list

* Update bot_command.cpp

* Update bot_command.cpp

---------

Co-authored-by: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Trent 2023-03-04 18:02:04 -07:00 committed by GitHub
parent 65c14b160e
commit 034feb4ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
zone/bot_command.cpp
View File

@ -3179,7 +3179,14 @@ void bot_command_find_aliases(Client *c, const Seperator *sep)
if (strcasecmp(find_iter->second.c_str(), alias_iter.second.c_str()) || c->Admin() < command_iter->second->access) if (strcasecmp(find_iter->second.c_str(), alias_iter.second.c_str()) || c->Admin() < command_iter->second->access)
continue; continue;
c->Message(Chat::White, "%c%s", BOT_COMMAND_CHAR, alias_iter.first.c_str()); c->Message(
Chat::White,
fmt::format(
"^{}",
alias_iter.first
).c_str()
);
++bot_command_aliases_shown; ++bot_command_aliases_shown;
} }
c->Message(Chat::White, "%d bot command alias%s listed.", bot_command_aliases_shown, bot_command_aliases_shown != 1 ? "es" : ""); c->Message(Chat::White, "%d bot command alias%s listed.", bot_command_aliases_shown, bot_command_aliases_shown != 1 ? "es" : "");
@ -3413,7 +3420,15 @@ void bot_command_help(Client *c, const Seperator *sep)
if (c->Admin() < command_iter.second->access) if (c->Admin() < command_iter.second->access)
continue; continue;
c->Message(Chat::White, "%c%s - %s", BOT_COMMAND_CHAR, command_iter.first.c_str(), command_iter.second->desc == nullptr ? "[no description]" : command_iter.second->desc); c->Message(
Chat::White,
fmt::format(
"^{} - {}",
command_iter.first,
command_iter.second->desc ? command_iter.second->desc : "No Description"
).c_str()
);
++bot_commands_shown; ++bot_commands_shown;
} }
if (parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) { if (parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
@ -3654,8 +3669,14 @@ void bot_command_item_use(Client* c, const Seperator* sep)
continue; continue;
} }
msg = StringFormat("%cinventorygive byname %s", BOT_COMMAND_CHAR, bot_iter->GetCleanName()); text_link = bot_iter->CreateSayLink(
text_link = bot_iter->CreateSayLink(c, msg.c_str(), bot_iter->GetCleanName()); c,
fmt::format(
"^inventorygive byname {}",
bot_iter->GetCleanName()
).c_str(),
bot_iter->GetCleanName()
);
for (auto slot_iter : equipable_slot_list) { for (auto slot_iter : equipable_slot_list) {
// needs more failure criteria - this should cover the bulk for now // needs more failure criteria - this should cover the bulk for now
@ -10143,8 +10164,7 @@ void helper_command_depart_list(Client* bot_owner, Bot* druid_bot, Bot* wizard_b
} }
msg = fmt::format( msg = fmt::format(
"{}circle {}{}", "^circle {}{}",
std::to_string(BOT_COMMAND_CHAR),
spells[local_entry->spell_id].teleport_zone, spells[local_entry->spell_id].teleport_zone,
single_flag ? " single" : "" single_flag ? " single" : ""
); );
@ -10179,8 +10199,7 @@ void helper_command_depart_list(Client* bot_owner, Bot* druid_bot, Bot* wizard_b
} }
msg = fmt::format( msg = fmt::format(
"{}portal {}{}", "^portal {}{}",
std::to_string(BOT_COMMAND_CHAR),
spells[local_entry->spell_id].teleport_zone, spells[local_entry->spell_id].teleport_zone,
single_flag ? " single" : "" single_flag ? " single" : ""
); );
@ -10245,7 +10264,15 @@ void helper_send_available_subcommands(Client *bot_owner, const char* command_si
if (bot_owner->Admin() < find_iter->second->access) if (bot_owner->Admin() < find_iter->second->access)
continue; continue;
bot_owner->Message(Chat::White, "%c%s - %s", BOT_COMMAND_CHAR, subcommand_iter, ((find_iter != bot_command_list.end()) ? (find_iter->second->desc) : ("[no description]"))); bot_owner->Message(
Chat::White,
fmt::format(
"^{} - {}",
subcommand_iter,
find_iter != bot_command_list.end() ? find_iter->second->desc : "No Description"
).c_str()
);
++bot_subcommands_shown; ++bot_subcommands_shown;
} }