pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-28 00:57:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some commands

Browse Source
This commit is contained in:
nytmyr
2025-01-28 22:08:20 -06:00
parent 60d96d6ac6
commit 548e3ca81b
13 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot_commands/spell_aggro_checks.cpp
+10 -2
View File
@@ -94,8 +94,16 @@ void bot_command_spell_aggro_checks(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(
Chat::Yellow,
fmt::format(
"You must choose a valid spell type. Use {} for information regarding this command.",
Saylink::Silent(
fmt::format("{} help", sep->arg[0])
)
).c_str()
);
return; return;
} }
zone/bot_commands/spell_delays.cpp
+8 -4
View File
@@ -106,13 +106,17 @@ void bot_command_spell_delays(Client* c, const Seperator* sep) {
if ( if (
(clientSetting && !IsClientBotSpellType(spell_type)) || (clientSetting && !IsClientBotSpellType(spell_type)) ||
(!clientSetting && (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END)) (!clientSetting && !EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END))
) { ) {
c->Message( c->Message(
Chat::Yellow, Chat::Yellow,
clientSetting ? "Invalid spell type for clients." : "You must choose a valid spell type. Spell types range from %i to %i", fmt::format(
BotSpellTypes::START, "{}. Use {} for information regarding this command.",
BotSpellTypes::END (!clientSetting ? "You must choose a valid spell type" : "You must choose a valid client spell type"),
Saylink::Silent(
fmt::format("{} help", sep->arg[0])
)
).c_str()
); );
if (clientSetting) { if (clientSetting) {
zone/bot_commands/spell_engaged_priority.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void bot_command_spell_engaged_priority(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_holds.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void bot_command_spell_holds(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_idle_priority.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void bot_command_spell_idle_priority(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_max_hp_pct.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void bot_command_spell_max_hp_pct(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_max_mana_pct.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void bot_command_spell_max_mana_pct(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_max_thresholds.cpp
+8 -4
View File
@@ -102,13 +102,17 @@ void bot_command_spell_max_thresholds(Client* c, const Seperator* sep) {
if ( if (
(clientSetting && !IsClientBotSpellType(spell_type)) || (clientSetting && !IsClientBotSpellType(spell_type)) ||
(!clientSetting && (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END)) (!clientSetting && !EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END))
) { ) {
c->Message( c->Message(
Chat::Yellow, Chat::Yellow,
clientSetting ? "Invalid spell type for clients." : "You must choose a valid spell type. Spell types range from %i to %i", fmt::format(
BotSpellTypes::START, "{}. Use {} for information regarding this command.",
BotSpellTypes::END (!clientSetting ? "You must choose a valid spell type" : "You must choose a valid client spell type"),
Saylink::Silent(
fmt::format("{} help", sep->arg[0])
)
).c_str()
); );
if (clientSetting) { if (clientSetting) {
zone/bot_commands/spell_min_hp_pct.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void bot_command_spell_min_hp_pct(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_min_mana_pct.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void bot_command_spell_min_mana_pct(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_min_thresholds.cpp
+8 -4
View File
@@ -104,13 +104,17 @@ void bot_command_spell_min_thresholds(Client* c, const Seperator* sep) {
if ( if (
(clientSetting && !IsClientBotSpellType(spell_type)) || (clientSetting && !IsClientBotSpellType(spell_type)) ||
(!clientSetting && (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END)) (!clientSetting && !EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END))
) { ) {
c->Message( c->Message(
Chat::Yellow, Chat::Yellow,
clientSetting ? "Invalid spell type for clients." : "You must choose a valid spell type. Spell types range from %i to %i", fmt::format(
BotSpellTypes::START, "{}. Use {} for information regarding this command.",
BotSpellTypes::END (!clientSetting ? "You must choose a valid spell type" : "You must choose a valid client spell type"),
Saylink::Silent(
fmt::format("{} help", sep->arg[0])
)
).c_str()
); );
if (clientSetting) { if (clientSetting) {
zone/bot_commands/spell_pursue_priority.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void bot_command_spell_pursue_priority(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;
zone/bot_commands/spell_target_count.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void bot_command_spell_target_count(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) { if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]); spell_type = atoi(sep->arg[1]);
if (spell_type < BotSpellTypes::START || spell_type > BotSpellTypes::END) { if (!EQ::ValueWithin(spell_type, BotSpellTypes::START, BotSpellTypes::END)) {
c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END); c->Message(Chat::Yellow, "You must choose a valid spell type. Spell types range from %i to %i", BotSpellTypes::START, BotSpellTypes::END);
return; return;