Command help cleanup

common/ruletypes.h

@@ -872,6 +872,7 @@ RULE_INT(Bots, MaxFollowDistance, 300, "Default 300. Max distance a bot can be s
 RULE_INT(Bots, MaxDistanceRanged, 300, "Default 300. Max distance a bot can be set to ranged.")
 RULE_BOOL(Bots, AllowAIMez, true, "If enabled bots will automatically mez/AE mez eligible targets.")
 RULE_INT(Bots, CampTimer, 25, "Number of seconds after /camp has begun before bots camp out.")
+RULE_BOOL(Bots, SendClassRaceOnHelp, true, "If enabled a reminder of how to check class/race IDs will be sent when using compatible commands.")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Chat)

zone/bot.h

@@ -518,8 +518,6 @@ public:
 	void SetHasLoS(bool hasLoS) { _hasLoS = hasLoS; }
 	bool HasLoS() const { return _hasLoS; }
 
-	void SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, std::string arg2, bool helpPrompt = false);
-
 	std::list<BotSpellTypeOrder> GetSpellTypesPrioritized(uint8 priorityType);
 	uint16 GetSpellListSpellType(uint16 spellType);
 	bool IsValidSpellTypeBySpellID(uint16 spellType, uint16 spell_id);

zone/bot_command.cpp

@@ -1375,6 +1375,8 @@ int bot_command_init(void)
 		bot_command_add("spellsettingstoggle", "Toggle a bot spell use", AccountStatus::Player, bot_command_spell_settings_toggle) ||
 		bot_command_add("spellsettingsupdate", "Update a bot spell setting entry", AccountStatus::Player, bot_command_spell_settings_update) ||
 		bot_command_add("summoncorpse", "Orders a bot to summon a corpse to its feet", AccountStatus::Player, bot_command_summon_corpse) ||
+		bot_command_add("spelltypeids", "Lists spelltypes by ID", AccountStatus::Player, bot_command_spelltype_ids) ||
+		bot_command_add("spelltypenames", "Lists spelltypes by shortname", AccountStatus::Player, bot_command_spelltype_names) ||
 		bot_command_add("suspend", "Suspends a bot's AI processing until released", AccountStatus::Player, bot_command_suspend) ||
 		bot_command_add("taunt", "Toggles taunt use by a bot", AccountStatus::Player, bot_command_taunt) ||
 		bot_command_add("timer", "Checks or clears timers of the chosen type.", AccountStatus::GMMgmt, bot_command_timer) ||
@@ -2115,43 +2117,54 @@ bool helper_spell_list_fail(Client *bot_owner, bcst_list* spell_list, BCEnum::Sp
 	return false;
 }
 
-void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, std::string arg2, bool helpPrompt) {
+void SendSpellTypePrompts(Client *c, bool commandedTypes) {
-	if (helpPrompt) {
+	c->Message(
+		Chat::Yellow,
+		fmt::format(
+			"You can view spell types by ID or shortname: {}, {}, {} / {}, {}, {}",
+			Saylink::Silent(
+				fmt::format("^spelltypeids 0-19"), "ID 0-19"
+			),
+			Saylink::Silent(
+				fmt::format("^spelltypeids 20-39"), "20-39"
+			),
+			Saylink::Silent(
+				fmt::format("^spelltypeids 40+"), "40+"
+			),
+			Saylink::Silent(
+				fmt::format("^spelltypenames 0-19"), "Shortname 0-19"
+			),
+			Saylink::Silent(
+				fmt::format("^spelltypenames 20-39"), "20-39"
+			),
+			Saylink::Silent(
+				fmt::format("^spelltypenames 40+"), "40+"
+			)
+		).c_str()
+	);
+
+	if (commandedTypes) {
 		c->Message(
 			Chat::Yellow,
 			fmt::format(
-				"Use {}, {}, {} for a list of spell types by ID",
+				"You can view commanded spell types by ID or shortname: {} / {}",
 				Saylink::Silent(
-					fmt::format("{} listid 0-19", arg0)
+					fmt::format("^spelltypeids commanded"), "ID"
 				),
 				Saylink::Silent(
-					fmt::format("{} listid 20-39", arg0)
+					fmt::format("^spelltypenames commanded"), "Shortname"
-				),
-				Saylink::Silent(
-					fmt::format("{} listid 40+", arg0)
 				)
 			).c_str()
 		);
-
-		c->Message(
-			Chat::Yellow,
-			fmt::format(
-				"Use {}, {}, {} for a list of spell types by short name",
-				Saylink::Silent(
-					fmt::format("{} listname 0-19", arg0)
-				),
-				Saylink::Silent(
-					fmt::format("{} listname 20-39", arg0)
-				),
-				Saylink::Silent(
-					fmt::format("{} listname 40+", arg0)
-				)
-			).c_str()
-		);
-
-		return;
 	}
 
+	return;
+}
+
+void SendSpellTypeWindow(Client *c, const Seperator* sep) {
+	std::string arg0 = sep->arg[0];
+	std::string arg1 = sep->arg[1];
+
 	uint8 minCount = 0;
 	uint8 maxCount = 0;
 
@@ -2159,18 +2172,22 @@ void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, st
 		minCount = BotSpellTypes::START;
 		maxCount = BotSpellTypes::END;
 	}
-	else if (!arg2.compare("0-19")) {
+	else if (!arg1.compare("0-19")) {
 		minCount = BotSpellTypes::START;
 		maxCount = 19;
 	}
-	else if (!arg2.compare("20-39")) {
+	else if (!arg1.compare("20-39")) {
 		minCount = std::min(static_cast<uint8_t>(20), static_cast<uint8_t>(BotSpellTypes::END));
 		maxCount = std::min(static_cast<uint8_t>(39), static_cast<uint8_t>(BotSpellTypes::END));
 	}
-	else if (!arg2.compare("40+")) {
+	else if (!arg1.compare("40+")) {
 		minCount = std::min(static_cast<uint8_t>(40), static_cast<uint8_t>(BotSpellTypes::END));
 		maxCount = BotSpellTypes::END;
 	}
+	else if (!arg1.compare("commanded")) {
+		minCount = BotSpellTypes::COMMANDED_START;
+		maxCount = BotSpellTypes::COMMANDED_END;
+	}
 	else {
 		c->Message(Chat::Yellow, "You must choose a valid range option");
 
@@ -2199,7 +2216,7 @@ void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, st
 		DialogueWindow::TableCell(
 			fmt::format(
 				"{}",
-				(!arg1.compare("listid") ? DialogueWindow::ColorMessage(goldenrod, idField) : DialogueWindow::ColorMessage(goldenrod, shortnameField))
+				(!arg0.compare("^spelltypeids") ? DialogueWindow::ColorMessage(goldenrod, idField) : DialogueWindow::ColorMessage(goldenrod, shortnameField))
 			)
 		)
 	);
@@ -2231,7 +2248,7 @@ void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, st
 			DialogueWindow::TableCell(
 				fmt::format(
 					"{}",
-					(!arg1.compare("listid") ? DialogueWindow::ColorMessage(slate_blue, std::to_string(i)) : DialogueWindow::ColorMessage(slate_blue, c->GetSpellTypeShortNameByID(i)))
+					(!arg0.compare("^spelltypeids") ? DialogueWindow::ColorMessage(slate_blue, std::to_string(i)) : DialogueWindow::ColorMessage(slate_blue, c->GetSpellTypeShortNameByID(i)))
 				)
 			)
 		);
@@ -2242,7 +2259,6 @@ void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, st
 	c->SendPopupToClient("Spell Types", popup_text.c_str());
 }
 
-
 #include "bot_commands/actionable.cpp"
 #include "bot_commands/aggressive.cpp"
 #include "bot_commands/appearance.cpp"
@@ -2310,6 +2326,7 @@ void Bot::SendSpellTypesWindow(Client* c, std::string arg0, std::string arg1, st
 #include "bot_commands/spell_min_thresholds.cpp"
 #include "bot_commands/spell_pursue_priority.cpp"
 #include "bot_commands/spell_target_count.cpp"
+#include "bot_commands/spelltypes.cpp"
 #include "bot_commands/summon.cpp"
 #include "bot_commands/summon_corpse.cpp"
 #include "bot_commands/suspend.cpp"

zone/bot_command.h

@@ -1733,6 +1733,8 @@ void bot_command_spell_settings_delete(Client* c, const Seperator *sep);
 void bot_command_spell_settings_list(Client* c, const Seperator *sep);
 void bot_command_spell_settings_toggle(Client* c, const Seperator *sep);
 void bot_command_spell_settings_update(Client* c, const Seperator *sep);
+void bot_command_spelltype_ids(Client* c, const Seperator* sep);
+void bot_command_spelltype_names(Client* c, const Seperator* sep);
 void bot_spell_info_dialogue_window(Client* c, const Seperator *sep);
 void bot_command_enforce_spell_list(Client* c, const Seperator* sep);
 void bot_command_summon_corpse(Client *c, const Seperator *sep);
@@ -1820,4 +1822,6 @@ void helper_send_available_subcommands(Client *bot_owner, const char* command_si
 void helper_send_usage_required_bots(Client *bot_owner, BCEnum::SpType spell_type, uint8 bot_class = Class::None);
 bool helper_spell_check_fail(STBaseEntry* local_entry);
 bool helper_spell_list_fail(Client *bot_owner, bcst_list* spell_list, BCEnum::SpType spell_type);
+void SendSpellTypePrompts(Client *c, bool commandedTypes = false);
+void SendSpellTypeWindow(Client *c, const Seperator* sep);
 #endif

zone/bot_commands/behind_mob.cpp

@@ -64,24 +64,22 @@ void bot_command_behind_mob(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/cast.cpp

@@ -94,7 +94,8 @@ void bot_command_cast(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c, true);
+
 		c->Message(
 			Chat::Yellow,
 			fmt::format(
@@ -103,6 +104,16 @@ void bot_command_cast(Client* c, const Seperator* sep)
 			).c_str()
 		);
 
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
+			c->Message(
+				Chat::Yellow,
+				fmt::format(
+					"Use {} for information about race/class IDs.",
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
+
 		return;
 	}
 

zone/bot_commands/copy_settings.cpp

@@ -97,25 +97,23 @@ void bot_command_copy_settings(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 2;
 	bool validOption = false;
 	uint16 spellType = UINT16_MAX;

zone/bot_commands/default_settings.cpp

@@ -91,25 +91,23 @@ void bot_command_default_settings(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 2;
 	bool validOption = false;
 	uint16 spellType = UINT16_MAX;

zone/bot_commands/illusion_block.cpp

@@ -63,13 +63,16 @@ void bot_command_illusion_block(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 
 		return;
@@ -77,11 +80,6 @@ void bot_command_illusion_block(Client* c, const Seperator* sep)
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/max_melee_range.cpp

@@ -63,24 +63,22 @@ void bot_command_max_melee_range(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/sit_hp_percent.cpp

@@ -63,24 +63,22 @@ void bot_command_sit_hp_percent(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/sit_in_combat.cpp

@@ -63,24 +63,22 @@ void bot_command_sit_in_combat(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/sit_mana_percent.cpp

@@ -63,24 +63,22 @@ void bot_command_sit_mana_percent(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
 
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	int ab_arg = 1;
 	bool current_check = false;
 	uint32 typeValue = 0;

zone/bot_commands/spell_aggro_checks.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_aggro_checks(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_delays.cpp

@@ -98,25 +98,22 @@ void bot_command_spell_delays(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_engaged_priority.cpp

@@ -96,25 +96,22 @@ void bot_command_spell_engaged_priority(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_holds.cpp

@@ -82,25 +82,22 @@ void bot_command_spell_holds(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_idle_priority.cpp

@@ -96,25 +96,22 @@ void bot_command_spell_idle_priority(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_max_hp_pct.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_max_hp_pct(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_max_mana_pct.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_max_mana_pct(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_max_thresholds.cpp

@@ -98,25 +98,22 @@ void bot_command_spell_max_thresholds(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_min_hp_pct.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_min_hp_pct(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_min_mana_pct.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_min_mana_pct(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_min_thresholds.cpp

@@ -100,25 +100,22 @@ void bot_command_spell_min_thresholds(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_pursue_priority.cpp

@@ -96,25 +96,22 @@ void bot_command_spell_pursue_priority(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spell_target_count.cpp

@@ -92,25 +92,22 @@ void bot_command_spell_target_count(Client* c, const Seperator* sep)
 		popup_text = DialogueWindow::Table(popup_text);
 
 		c->SendPopupToClient(sep->arg[0], popup_text.c_str());
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], "", "", true);
+		SendSpellTypePrompts(c);
-		c->Message(
+
-			Chat::Yellow,
+		if (RuleB(Bots, SendClassRaceOnHelp)) {
-			fmt::format(
+			c->Message(
-				"Use {} for information about race/class IDs.",
+				Chat::Yellow,
-				Saylink::Silent("^classracelist")
+				fmt::format(
-			).c_str()
+					"Use {} for information about race/class IDs.",
-		);
+					Saylink::Silent("^classracelist")
+				).c_str()
+			);
+		}
 
 		return;
 	}
 
 	std::string arg1 = sep->arg[1];
-
-	if (!arg1.compare("listid") || !arg1.compare("listname")) {
-		c->CastToBot()->SendSpellTypesWindow(c, sep->arg[0], sep->arg[1], sep->arg[2]);
-		return;
-	}
-
 	std::string arg2 = sep->arg[2];
 	int ab_arg = 2;
 	bool current_check = false;

zone/bot_commands/spelltypes.cpp

@@ -0,0 +1,9 @@
+void bot_command_spelltype_ids(Client* c, const Seperator* sep)
+{
+	SendSpellTypeWindow(c, sep);
+}
+
+void bot_command_spelltype_names(Client* c, const Seperator* sep)
+{
+	SendSpellTypeWindow(c, sep);
+}