[Cleanup] Cleanup Deity Code (#4363)

* [Cleanup] Cleanup Deity-based Code

* Final push.

* Update deity.cpp

* Update deity.cpp

* Update deity.cpp

* Cleanup

* Cleanup

* [Cleanup] Cleanup Skill-based Code

* Update deity.cpp

* Update lua_client.cpp

zone/beacon.cpp

@@ -53,7 +53,7 @@ Beacon::Beacon(const glm::vec4 &in_pos, int lifetime) : Mob(
 	Race::InvisibleMan, // in_race
 	Class::None, // in_class
 	BT_NoTarget, // in_bodytype
-	0, // in_deity
+	Deity::Unknown, // in_deity
 	0, // in_level
 	0, // in_npctype_id
 	0.0f, // in_size

zone/bot.cpp

@@ -652,7 +652,7 @@ NPCType *Bot::FillNPCTypeStruct(
 	n->race = botRace;
 	n->class_ = botClass;
 	n->bodytype = 1;
-	n->deity = EQ::deity::DeityAgnostic;
+	n->deity = Deity::Agnostic1;
 	n->level = botLevel;
 	n->npc_spells_id = botSpellsID;
 	n->AC = ac;
@@ -712,7 +712,7 @@ NPCType *Bot::CreateDefaultNPCTypeStructForBot(
 	n->race = botRace;
 	n->class_ = botClass;
 	n->bodytype = 1;
-	n->deity = EQ::deity::DeityAgnostic;
+	n->deity = Deity::Agnostic1;
 	n->level = botLevel;
 	n->AC = 12;
 	n->ATK = 75;

zone/client.cpp

@@ -96,7 +96,7 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
 	Race::Doug, // in_race
 	Class::None, // in_class
 	BT_Humanoid, // in_bodytype
-	0, // in_deity
+	Deity::Unknown, // in_deity
 	0, // in_level
 	0, // in_npctype_id
 	0.0f, // in_size

zone/embparser_api.cpp

@@ -513,7 +513,7 @@ void Perl__sfollow()
 	quest_manager.sfollow();
 }
 
-void Perl__changedeity(int deity_id)
+void Perl__changedeity(uint32 deity_id)
 {
 	quest_manager.changedeity(deity_id);
 }
@@ -5850,9 +5850,9 @@ uint16 Perl__get_class_bitmask(uint8 class_id)
 	return GetPlayerClassBit(class_id);
 }
 
-uint32 Perl__get_deity_bitmask(uint16 deity_id)
+uint32 Perl__get_deity_bitmask(uint32 deity_id)
 {
-	return static_cast<uint32>(EQ::deity::GetDeityBitmask(static_cast<EQ::deity::DeityType>(deity_id)));
+	return Deity::GetBitmask(deity_id);
 }
 
 uint16 Perl__get_race_bitmask(uint16 race_id)

zone/encounter.cpp

@@ -41,7 +41,7 @@ Encounter::Encounter(const char *enc_name) : Mob(
 	Race::InvisibleMan, // in_race
 	Class::None, // in_class
 	BT_NoTarget, // in_bodytype
-	0, // in_deity
+	Deity::Unknown, // in_deity
 	0, // in_level
 	0, // in_npcype_id
 	0, // in_size

zone/gm_commands/find/deity.cpp

@@ -3,46 +3,45 @@
 void FindDeity(Client *c, const Seperator *sep)
 {
 	if (sep->IsNumber(2)) {
-		const auto  deity_id   = static_cast<EQ::deity::DeityType>(Strings::ToInt(sep->arg[2]));
-		const auto& deity_name = EQ::deity::GetDeityName(deity_id);
-		if (!deity_name.empty()) {
-			const auto deity_bit = EQ::deity::GetDeityBitmask(deity_id);
-
+		const uint32 deity_id = Strings::ToUnsignedInt(sep->arg[2]);
+		const std::string& deity_name = Deity::GetName(deity_id);
+		if (Strings::EqualFold(deity_name, "UNKNOWN DEITY")) {
 			c->Message(
 				Chat::White,
 				fmt::format(
-					"Deity {} | {} ({})",
-					deity_id,
-					deity_name,
-					Strings::Commify(deity_bit)
+					"Deity ID {} does not exist.",
+					deity_id
 				).c_str()
 			);
-
 			return;
 		}
 
+		const uint32 deity_bitmask = Deity::GetBitmask(deity_id);
+
 		c->Message(
 			Chat::White,
 			fmt::format(
-				"Deity ID {} was not found.",
-				deity_id
+				"Deity {} | {} ({})",
+				deity_id,
+				deity_name,
+				Strings::Commify(deity_bitmask)
 			).c_str()
 		);
 
 		return;
 	}
 
-	const auto& search_criteria = Strings::ToLower(sep->argplus[2]);
+	const std::string& search_criteria = Strings::ToLower(sep->argplus[2]);
 
-	auto found_count = 0;
+	uint32 found_count = 0;
 
-	for (const auto& d : EQ::deity::GetDeityMap()) {
-		const auto& deity_name_lower = Strings::ToLower(d.second);
+	for (const auto& d : deity_names) {
+		const std::string& deity_name_lower = Strings::ToLower(d.second);
 		if (!Strings::Contains(deity_name_lower, search_criteria)) {
 			continue;
 		}
 
-		const auto deity_bit = EQ::deity::GetDeityBitmask(d.first);
+		const uint32 deity_bitmask = Deity::GetBitmask(d.first);
 
 		c->Message(
 			Chat::White,
@@ -50,7 +49,7 @@ void FindDeity(Client *c, const Seperator *sep)
 				"Deity {} | {} ({})",
 				d.first,
 				d.second,
-				Strings::Commify(deity_bit)
+				Strings::Commify(deity_bitmask)
 			).c_str()
 		);
 

zone/lua_client.cpp

@@ -157,7 +157,7 @@ uint16 Lua_Client::GetClassBitmask() {
 
 uint32 Lua_Client::GetDeityBitmask() {
 	Lua_Safe_Call_Int();
-	return static_cast<uint32>(EQ::deity::GetDeityBitmask(static_cast<EQ::deity::DeityType>(GetDeity())));
+	return Deity::GetBitmask(GetDeity());
 }
 
 uint16 Lua_Client::GetRaceBitmask() {

zone/lua_general.cpp

@@ -5484,8 +5484,8 @@ uint16 lua_get_class_bitmask(uint8 class_id) {
 	return GetPlayerClassBit(class_id);
 }
 
-uint32 lua_get_deity_bitmask(uint16 deity_id) {
-	return static_cast<uint32>(EQ::deity::GetDeityBitmask(static_cast<EQ::deity::DeityType>(deity_id)));
+uint32 lua_get_deity_bitmask(uint32 deity_id) {
+	return Deity::GetBitmask(deity_id);
 }
 
 uint16 lua_get_race_bitmask(uint16 race_id) {

zone/lua_mob.cpp

@@ -3301,7 +3301,7 @@ bool Lua_Mob::IsAlwaysAggro()
 std::string Lua_Mob::GetDeityName()
 {
 	Lua_Safe_Call_String();
-	return EQ::deity::GetDeityName(static_cast<EQ::deity::DeityType>(self->GetDeity()));
+	return Deity::GetName(self->GetDeity());
 }
 
 luabind::object Lua_Mob::GetBuffs(lua_State* L)

zone/mob.h

@@ -556,7 +556,7 @@ public:
 	virtual inline uint8 GetBaseGender() const { return base_gender; }
 	virtual uint16 GetFactionRace();
 	virtual inline uint16 GetDeity() const { return deity; }
-	virtual EQ::deity::DeityTypeBit GetDeityBit() { return EQ::deity::GetDeityBitmask((EQ::deity::DeityType)deity); }
+	virtual uint32 GetDeityBit() { return Deity::GetBitmask(deity); }
 	inline uint16 GetRace() const { return race; }
 	inline uint16 GetModel() const { return (use_model == 0) ? race : use_model; }
 	inline uint8 GetGender() const { return gender; }

zone/perl_client.cpp

@@ -2014,7 +2014,7 @@ uint16_t Perl_Client_GetClassBitmask(Client* self)
 
 uint32_t Perl_Client_GetDeityBitmask(Client* self)
 {
-	return static_cast<uint32_t>(EQ::deity::GetDeityBitmask(static_cast<EQ::deity::DeityType>(self->GetDeity())));
+	return Deity::GetBitmask(self->GetDeity());
 }
 
 uint16_t Perl_Client_GetRaceBitmask(Client* self) // @categories Stats and Attributes

zone/perl_mob.cpp

@@ -3427,7 +3427,7 @@ bool Perl_Mob_IsAlwaysAggro(Mob* self)
 
 std::string Perl_Mob_GetDeityName(Mob* self)
 {
-	return EQ::deity::GetDeityName(static_cast<EQ::deity::DeityType>(self->GetDeity()));
+	return Deity::GetName(self->GetDeity());
 }
 
 perl::array Perl_Mob_GetBuffs(Mob* self)

zone/questmgr.cpp

@@ -1371,7 +1371,7 @@ void QuestManager::sfollow() {
 	owner->SetFollowID(0);
 }
 
-void QuestManager::changedeity(int deity_id) {
+void QuestManager::changedeity(uint32 deity_id) {
 	QuestManagerCurrentQuestVars();
 	//Changes the deity.
 	if(initiator)
@@ -4364,7 +4364,7 @@ std::string QuestManager::getgendername(uint32 gender_id) {
 }
 
 std::string QuestManager::getdeityname(uint32 deity_id) {
-	return EQ::deity::GetDeityName(static_cast<EQ::deity::DeityType>(deity_id));
+	return Deity::GetName(deity_id);
 }
 
 std::string QuestManager::getinventoryslotname(int16 slot_id) {

zone/questmgr.h

@@ -110,7 +110,7 @@ public:
 	void settarget(const char *type, int target_id);
 	void follow(int entity_id, int distance);
 	void sfollow();
-	void changedeity(int deity_id);
+	void changedeity(uint32 deity_id);
 	void exp(int amt);
 	void level(int newlevel);
 	void traindisc(uint32 discipline_tome_item_id);