From dc0819c2c60d52ce31decfdc55141046015934c9 Mon Sep 17 00:00:00 2001
From: nytmyr <53322305+nytmyr@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:33:30 -0600
Subject: [PATCH] misc cleanup

---
 common/spdat.cpp | 23 -----------------------
 common/version.h |  2 +-
 zone/bot.cpp     |  8 ++++----
 zone/bot.h       |  1 -
 zone/entity.h    |  2 +-
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/common/spdat.cpp b/common/spdat.cpp
index 32782c3c2..50b7651f4 100644
--- a/common/spdat.cpp
+++ b/common/spdat.cpp
@@ -678,29 +678,6 @@ bool IsAnyNukeOrStunSpell(uint16 spell_id) {
 }
 
 bool IsAnyAESpell(uint16 spell_id) {
-	//if (
-	//	spells[spell_id].target_type == ST_Target ||
-	//	spells[spell_id].target_type == ST_Self ||
-	//	spells[spell_id].target_type == ST_Animal ||
-	//	spells[spell_id].target_type == ST_Undead ||
-	//	spells[spell_id].target_type == ST_Summoned ||
-	//	spells[spell_id].target_type == ST_Tap ||
-	//	spells[spell_id].target_type == ST_Pet ||
-	//	spells[spell_id].target_type == ST_Corpse ||
-	//	spells[spell_id].target_type == ST_Plant ||
-	//	spells[spell_id].target_type == ST_Giant ||
-	//	spells[spell_id].target_type == ST_Dragon ||
-	//	spells[spell_id].target_type == ST_HateList ||
-	//	spells[spell_id].target_type == ST_LDoNChest_Cursed ||
-	//	spells[spell_id].target_type == ST_Muramite ||
-	//	spells[spell_id].target_type == ST_SummonedPet ||
-	//	spells[spell_id].target_type == ST_TargetsTarget ||
-	//	spells[spell_id].target_type == ST_PetMaster //||
-	//	//spells[spell_id].target_type == ST_AEBard //TODO needed?
-	//) {
-	//	return false;
-	//}
-
 	if (IsAESpell(spell_id) || IsPBAENukeSpell(spell_id) || IsPBAESpell(spell_id) || IsAERainSpell(spell_id) || IsAERainNukeSpell(spell_id) || IsAEDurationSpell(spell_id)) {
 		return true;
 	}
diff --git a/common/version.h b/common/version.h
index 800ee365d..92982a1fa 100644
--- a/common/version.h
+++ b/common/version.h
@@ -43,7 +43,7 @@
  */
 
 #define CURRENT_BINARY_DATABASE_VERSION 9284
-#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9051 //TODO update as needed
+#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9051 //TODO bot rewrite - update as needed
 
 #endif
 
diff --git a/zone/bot.cpp b/zone/bot.cpp
index 28f9cb549..ae915ed80 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -1613,7 +1613,7 @@ bool Bot::Process()
 	}
 
 	ScanCloseMobProcess();
-	CheckScanCloseMobsMovingTimer(); // TODO bot rewrite -- necessary for bots?
+	CheckScanCloseMobsMovingTimer();
 	SpellProcess();
 
 	if (tic_timer.Check()) {
@@ -1661,7 +1661,7 @@ bool Bot::Process()
 		}
 	}
 
-	if (viral_timer.Check()) { // TODO bot rewrite -- necessary for bots?
+	if (viral_timer.Check()) {
 		VirusEffectProcess();
 	}
 
@@ -7160,7 +7160,7 @@ bool Bot::CheckLoreConflict(const EQ::ItemData* item) {
 	return (m_inv.HasItemByLoreGroup(item->LoreGroup, invWhereWorn) != INVALID_INDEX);
 }
 
-bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 spellType) {
+bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, uint16 spellType) {
 
 	if (BOT_SPELL_TYPES_DETRIMENTAL(spellType, caster->GetClass())) {
 		LogError("[EntityList::Bot_AICheckCloseBeneficialSpells] detrimental spells requested");
@@ -10927,7 +10927,7 @@ bool Bot::AttemptAICastSpell(uint16 spellType) {
 			}
 
 			if (!tar || !PrecastChecks(tar, spellType) || !AICastSpell(tar, GetChanceToCastBySpellType(spellType), spellType)) {
-				if (!entity_list.Bot_AICheckCloseBeneficialSpells(this, GetChanceToCastBySpellType(spellType), BotAISpellRange, spellType)) {
+				if (!entity_list.Bot_AICheckCloseBeneficialSpells(this, GetChanceToCastBySpellType(spellType), spellType)) {
 					return result;
 				}
 			}
diff --git a/zone/bot.h b/zone/bot.h
index 2360d73b4..8d1a60047 100644
--- a/zone/bot.h
+++ b/zone/bot.h
@@ -46,7 +46,6 @@ constexpr uint32 MAG_EPIC_1_0 = 28034;
 
 extern WorldServer worldserver;
 
-constexpr int BotAISpellRange = 100; // TODO: Write a method that calcs what the bot's spell range is based on spell, equipment, AA, whatever and replace this
 constexpr int NegativeItemReuse = -1; // Unlinked timer for items
 
 constexpr uint8 SumWater = 1;
diff --git a/zone/entity.h b/zone/entity.h
index 814a5feb5..b55c1c7a6 100644
--- a/zone/entity.h
+++ b/zone/entity.h
@@ -628,7 +628,7 @@ private:
 		Client* GetBotOwnerByBotID(const uint32 bot_id);
 		std::list<Bot*> GetBotsByBotOwnerCharacterID(uint32 botOwnerCharacterID);
 
-		bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint16 spellType); // TODO: Evaluate this closesly in hopes to eliminate
+		bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, uint16 spellType); // TODO: Evaluate this closesly in hopes to eliminate
 		void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff
 
 		void ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob);