[Bots] Add Rule Allowing Bots to Equip Any Race Items (#2578)

* [Bots] Add Rule AllowBotEquipAnyRaceGear

* Fix formatting

* Update item_instance.cpp

* Update bot.cpp

* Update item_data.h

Co-authored-by: Alex King <89047260+Kinglykrab@users.noreply.github.com>

common/item_data.cpp

@@ -169,11 +169,33 @@ uint8 EQ::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit)
 
 bool EQ::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const
 {
-	if (!(Races & GetPlayerRaceBit(race_id)))
+	if (!(Races & GetPlayerRaceBit(race_id))) {
 		return false;
+	}
 
-	if (!(Classes & GetPlayerClassBit(GetPlayerClassValue(class_id))))
+	if (!(Classes & GetPlayerClassBit(GetPlayerClassValue(class_id)))) {
 		return false;
+	}
+
+	return true;
+}
+
+bool EQ::ItemData::IsClassEquipable(uint16 class_id) const
+{
+
+	if (!(Classes & GetPlayerClassBit(GetPlayerClassValue(class_id)))) {
+		return false;
+	}
+
+	return true;
+}
+
+bool EQ::ItemData::IsRaceEquipable(uint16 race_id) const
+{
+
+	if (!(Races & GetPlayerRaceBit(race_id))) {
+		return false;
+	}
 
 	return true;
 }

common/item_data.h

@@ -533,6 +533,8 @@ namespace EQ
 		//BardName
 
 		bool IsEquipable(uint16 Race, uint16 Class) const;
+		bool IsClassEquipable(uint16 Class) const;
+		bool IsRaceEquipable(uint16 Race) const;
 		bool IsClassCommon() const;
 		bool IsClassBag() const;
 		bool IsClassBook() const;

common/item_instance.cpp

@@ -263,20 +263,43 @@ bool EQ::ItemInstance::IsCharged() const
 // Can item be equipped?
 bool EQ::ItemInstance::IsEquipable(uint16 race, uint16 class_) const
 {
-	if (!m_item || (m_item->Slots == 0))
+	if (!m_item || !m_item->Slots) {
 		return false;
+	}
 
 	return m_item->IsEquipable(race, class_);
 }
 
+// Can item be equipped by Class?
+bool EQ::ItemInstance::IsClassEquipable(uint16 class_) const
+{
+	if (!m_item || !m_item->Slots) {
+		return false;
+	}
+
+	return m_item->IsClassEquipable(class_);
+}
+
+// Can item be equipped by Race?
+bool EQ::ItemInstance::IsRaceEquipable(uint16 race) const
+{
+	if (!m_item || !m_item->Slots) {
+		return false;
+	}
+
+	return m_item->IsRaceEquipable(race);
+}
+
 // Can equip at this slot?
 bool EQ::ItemInstance::IsEquipable(int16 slot_id) const
 {
-	if (!m_item)
+	if (!m_item || !m_item->Slots) {
 		return false;
+	}
 
-	if (slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END)
+	if (slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END) {
 		return false;
+	}
 
 	return ((m_item->Slots & (1 << slot_id)) != 0);
 }

common/item_instance.h

@@ -92,6 +92,8 @@ namespace EQ
 
 		// Can item be equipped by/at?
 		bool IsEquipable(uint16 race, uint16 class_) const;
+		bool IsClassEquipable(uint16 class_) const;
+		bool IsRaceEquipable(uint16 race) const;
 		bool IsEquipable(int16 slot_id) const;
 
 		//

common/ruletypes.h

@@ -580,6 +580,7 @@ RULE_CATEGORY_END()
 RULE_CATEGORY(Bots)
 RULE_INT(Bots, BotExpansionSettings, 16383, "Sets the expansion settings for bot use. Defaults to all expansions enabled up to TSS")
 RULE_BOOL(Bots, AllowCamelCaseNames, false, "Allows the use of 'MyBot' type names")
+RULE_BOOL(Bots, AllowBotEquipAnyRaceGear, false, "Allows Bots to wear Equipment even if their race is not valid")
 RULE_INT(Bots, CommandSpellRank, 1, "Filters bot command spells by rank. 1, 2 and 3 are valid filters - any other number allows all ranks")
 RULE_INT(Bots, CreationLimit, 150, "Number of bots that each account can create")
 RULE_BOOL(Bots, FinishBuffing, false, "Allow for buffs to complete even if the bot caster is out of mana. Only affects buffing out of combat")

zone/bot.cpp

@@ -4728,8 +4728,12 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
 				return;
 			}
 		}
-
+		
-		if (!trade_instance->IsEquipable(GetBaseRace(), GetClass()) || (GetLevel() < trade_instance->GetItem()->ReqLevel)) { // deity checks will be handled within IsEquipable()
+		if (
+			!trade_instance->IsClassEquipable(GetClass()) ||
+			GetLevel() < trade_instance->GetItem()->ReqLevel ||
+			(!trade_instance->IsRaceEquipable(GetRace()) && !RuleB(Bot, AllowBotEquipAnyRaceGear))
+		) {
 			if (trade_event_exists) {
 				event_trade.push_back(ClientTrade(trade_instance, trade_index));
 				continue;