Perk filters

SPID/include/Cache.h

@@ -13,7 +13,8 @@ namespace FormType
 		RE::FormType::FormList,
 		RE::FormType::Spell,
 		RE::FormType::Armor,
-		RE::FormType::Location
+		RE::FormType::Location,
+		RE::FormType::Perk
 	};
 
 	bool GetWhitelisted(RE::FormType a_type);

SPID/src/Distribute.cpp

@@ -24,6 +24,12 @@ namespace Distribute
 			},
 			accumulatedForms);
 
+		for_each_form<RE::BGSPerk>(
+			npcData, forms.perks, input, [&](const std::vector<RE::BGSPerk*>& a_perks) {
+				npc->AddPerks(a_perks, 1);
+			},
+			accumulatedForms);
+
 		for_each_form<RE::SpellItem>(
 			npcData, forms.spells, input, [&](const std::vector<RE::SpellItem*>& a_spells) {
 				npc->GetSpellList()->AddSpells(a_spells);
@@ -36,12 +42,6 @@ namespace Distribute
 			},
 			accumulatedForms);
 
-		for_each_form<RE::BGSPerk>(
-			npcData, forms.perks, input, [&](const std::vector<RE::BGSPerk*>& a_perks) {
-				npc->AddPerks(a_perks, 1);
-			},
-			accumulatedForms);
-
 		for_each_form<RE::TESShout>(
 			npcData, forms.shouts, input, [&](const std::vector<RE::TESShout*>& a_shouts) {
 				npc->GetSpellList()->AddShouts(a_shouts);

SPID/src/LookupNPC.cpp

@@ -146,6 +146,11 @@ namespace NPC
 				const auto location = a_form->As<RE::BGSLocation>();
 				return actor->GetEditorLocation() == location;
 			}
+		case RE::FormType::Perk:
+			{
+				const auto perk = a_form->As<RE::BGSPerk>();
+				return actor->HasPerk(perk);
+			}
 		case RE::FormType::FormList:
 			{
 				bool result = false;