code cleanup 4

zone/bot.cpp

@@ -9562,7 +9562,7 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool precheck
 		return false;
 	}
 
-	if (!AECheck && !IsValidSpellRange(spell_id, tar)) {
+	if (!ae_check && !IsValidSpellRange(spell_id, tar)) {
 		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IsValidSpellRange.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName());
 		return false;
 	}

zone/bot_command.cpp

@@ -2037,7 +2037,7 @@ bool helper_no_available_bots(Client *bot_owner, Bot *my_bot)
 	return false;
 }
 
-void helper_send_available_subcommands(Client *bot_owner, const char* command_simile, const std::list<const char*>& subcommand_list)
+void helper_send_available_subcommands(Client* bot_owner, const char* command_simile, std::vector<const char*> subcommand_list)
 {
 	bot_owner->Message(Chat::White, "Available %s management subcommands:", command_simile);
 

zone/bot_command.h

@@ -1802,7 +1802,7 @@ bool helper_command_alias_fail(Client *bot_owner, const char* command_handler, c
 void helper_command_depart_list(Client* bot_owner, Bot* druid_bot, Bot* wizard_bot, bcst_list* local_list, bool single_flag = false);
 bool helper_is_help_or_usage(const char* arg);
 bool helper_no_available_bots(Client *bot_owner, Bot *my_bot = nullptr);
-void helper_send_available_subcommands(Client *bot_owner, const char* command_simile, const std::list<const char*>& subcommand_list);
+void helper_send_available_subcommands(Client *bot_owner, const char* command_simile, std::vector<const char*> subcommand_list);
 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);

zone/bot_commands/appearance.cpp

@@ -2,19 +2,19 @@
 
 void bot_command_appearance(Client *c, const Seperator *sep)
 {
-
+	std::vector<const char*> subcommand_list = {
-	std::list<const char*> subcommand_list;
+		"botbeardcolor",
-	subcommand_list.push_back("botbeardcolor");
+		"botbeardstyle",
-	subcommand_list.push_back("botbeardstyle");
+		"botdetails",
-	subcommand_list.push_back("botdetails");
+		"botdyearmor",
-	subcommand_list.push_back("botdyearmor");
+		"boteyes",
-	subcommand_list.push_back("boteyes");
+		"botface",
-	subcommand_list.push_back("botface");
+		"bothaircolor",
-	subcommand_list.push_back("bothaircolor");
+		"bothairstyle",
-	subcommand_list.push_back("bothairstyle");
+		"botheritage",
-	subcommand_list.push_back("botheritage");
+		"bottattoo",
-	subcommand_list.push_back("bottattoo");
+		"botwoad"
-	subcommand_list.push_back("botwoad");
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_appearance", sep->arg[0], "botappearance"))
 		return;

zone/bot_commands/bot.cpp

@@ -2,25 +2,25 @@
 
 void bot_command_bot(Client *c, const Seperator *sep)
 {
-
+	std::vector<const char*> subcommand_list = {
-	std::list<const char*> subcommand_list;
+		"botappearance",
-	subcommand_list.push_back("botappearance");
+		"botcamp",
-	subcommand_list.push_back("botcamp");
+		"botclone",
-	subcommand_list.push_back("botclone");
+		"botcreate",
-	subcommand_list.push_back("botcreate");
+		"botdelete",
-	subcommand_list.push_back("botdelete");
+		"botfollowdistance",
-	subcommand_list.push_back("botfollowdistance");
+		"botinspectmessage",
-	subcommand_list.push_back("botinspectmessage");
+		"botlist",
-	subcommand_list.push_back("botlist");
+		"botoutofcombat",
-	subcommand_list.push_back("botoutofcombat");
+		"botreport",
-	subcommand_list.push_back("botreport");
+		"botspawn",
-	subcommand_list.push_back("botspawn");
+		"botstance",
-	subcommand_list.push_back("botstance");
+		"botstopmeleelevel",
-	subcommand_list.push_back("botstopmeleelevel");
+		"botsummon",
-	subcommand_list.push_back("botsummon");
+		"bottoggleranged",
-	subcommand_list.push_back("bottoggleranged");
+		"bottogglehelm",
-	subcommand_list.push_back("bottogglehelm");
+		"botupdate"
-	subcommand_list.push_back("botupdate");
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_bot", sep->arg[0], "bot"))
 		return;

zone/bot_commands/default_settings.cpp

@@ -374,7 +374,7 @@ void bot_command_default_settings(Client* c, const Seperator* sep)
 		}
 		else if (!strcasecmp(sep->arg[1], "spelltypesettings")) {
 			if (spell_type != UINT16_MAX) {
-				my_bot->SetSpellHold(spell_type, my_bot->GetDefaultSpellHold(SpellType, bot_stance));
+				my_bot->SetSpellHold(spell_type, my_bot->GetDefaultSpellHold(spell_type, bot_stance));
 				my_bot->SetSpellDelay(spell_type, my_bot->GetDefaultSpellDelay(spell_type, bot_stance));
 				my_bot->SetSpellMinThreshold(spell_type, my_bot->GetDefaultSpellMinThreshold(spell_type, bot_stance));
 				my_bot->SetSpellMaxThreshold(spell_type, my_bot->GetDefaultSpellMaxThreshold(spell_type, bot_stance));

zone/bot_commands/heal_rotation.cpp

@@ -2,28 +2,28 @@
 
 void bot_command_heal_rotation(Client *c, const Seperator *sep)
 {
-
+	std::vector<const char*> subcommand_list = {
-	std::list<const char*> subcommand_list;
+		"healrotationadaptivetargeting",
-	subcommand_list.push_back("healrotationadaptivetargeting");
+		"healrotationaddmember",
-	subcommand_list.push_back("healrotationaddmember");
+		"healrotationaddtarget",
-	subcommand_list.push_back("healrotationaddtarget");
+		"healrotationadjustcritical",
-	subcommand_list.push_back("healrotationadjustcritical");
+		"healrotationadjustsafe",
-	subcommand_list.push_back("healrotationadjustsafe");
+		"healrotationcastoverride",
-	subcommand_list.push_back("healrotationcastoverride");
+		"healrotationchangeinterval",
-	subcommand_list.push_back("healrotationchangeinterval");
+		"healrotationclearhot",
-	subcommand_list.push_back("healrotationclearhot");
+		"healrotationcleartargets",
-	subcommand_list.push_back("healrotationcleartargets");
+		"healrotationcreate",
-	subcommand_list.push_back("healrotationcreate");
+		"healrotationdelete",
-	subcommand_list.push_back("healrotationdelete");
+		"healrotationfastheals",
-	subcommand_list.push_back("healrotationfastheals");
+		"healrotationlist",
-	subcommand_list.push_back("healrotationlist");
+		"healrotationremovemember",
-	subcommand_list.push_back("healrotationremovemember");
+		"healrotationremovetarget",
-	subcommand_list.push_back("healrotationremovetarget");
+		"healrotationresetlimits",
-	subcommand_list.push_back("healrotationresetlimits");
+		"healrotationsave",
-	subcommand_list.push_back("healrotationsave");
+		"healrotationsethot",
-	subcommand_list.push_back("healrotationsethot");
+		"healrotationstart",
-	subcommand_list.push_back("healrotationstart");
+		"healrotationstop"
-	subcommand_list.push_back("healrotationstop");
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_heal_rotation", sep->arg[0], "healrotation"))
 		return;

zone/bot_commands/inventory.cpp

@@ -2,12 +2,12 @@
 
 void bot_command_inventory(Client *c, const Seperator *sep)
 {
-
+	std::vector<const char*> subcommand_list = {
-	std::list<const char*> subcommand_list;
+		"inventorygive",
-	subcommand_list.push_back("inventorygive");
+		"inventorylist",
-	subcommand_list.push_back("inventorylist");
+		"inventoryremove",
-	subcommand_list.push_back("inventoryremove");
+		"inventorywindow"
-	subcommand_list.push_back("inventorywindow");
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_inventory", sep->arg[0], "inventory"))
 		return;

zone/bot_commands/pet.cpp

@@ -3,11 +3,11 @@
 
 void bot_command_pet(Client *c, const Seperator *sep)
 {
-
+	std::vector<const char*> subcommand_list = {
-	std::list<const char*> subcommand_list;
+		"petgetlost",
-	subcommand_list.push_back("petgetlost");
+		"petremove",
-	subcommand_list.push_back("petremove");
+		"petsettype"
-	subcommand_list.push_back("petsettype");
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_pet", sep->arg[0], "pet"))
 		return;

zone/bot_commands/sit_mana_percent.cpp

@@ -167,7 +167,7 @@ void bot_command_sit_mana_percent(Client* c, const Seperator* sep)
 				fmt::format(
 					"{} of your bots will now sit in combat whem at or below [{}%%] mana.'",
 					success_count,
-					TypeValue
+					type_value
 				).c_str()
 			);
 		}

zone/bot_database.cpp

@@ -1161,8 +1161,8 @@ bool BotDatabase::SaveEquipmentColor(const uint32 bot_id, const int16 slot_id, c
 	if (all_flag) {
 		where_clause = fmt::format(
 			"IN ({}, {}, {}, {}, {}, {}, {})",
-			EQ::invslot::SlotHead,
+			EQ::invslot::slotHead,
-			EQ::invslot::SlotArms,
+			EQ::invslot::slotArms,
 			EQ::invslot::slotWrist1,
 			EQ::invslot::slotHands,
 			EQ::invslot::slotChest,