|
|
|
@ -132,7 +132,7 @@ namespace Papyrus::ArtifactTracker |
|
|
|
|
a_exform.formType == RE::FormType::Armor |
|
|
|
|
|| (a_exform.formType == RE::FormType::Weapon && a_exform.formID != 0x000001F4) |
|
|
|
|
|| a_exform.formType == RE::FormType::Misc |
|
|
|
|
|| (a_exform.formType == RE::FormType::Book && !a_exform.As<RE::TESObjectBOOK>()->TeachesSpell() && (a_exform.As<RE::BGSKeywordForm>()->HasKeyword(recipeKeyword) || BookCheck::IsBook(a_exform.As<RE::TESObjectBOOK>()))) |
|
|
|
|
|| (a_exform.formType == RE::FormType::Book && BookCheck::GetBookList().contains(a_exform.formID)) |
|
|
|
|
) |
|
|
|
|
&& (excludeOnlyMisc ? (a_exform.formType != RE::FormType::Misc || !is_excluded(&a_exform, a_excludeForm)) : !is_excluded(&a_exform, a_excludeForm)); |
|
|
|
|
}); |
|
|
|
@ -307,14 +307,14 @@ namespace Papyrus::ArtifactTracker |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (a_excludeForm) { |
|
|
|
|
for (const auto& book : BookCheck::GetBookList()) { |
|
|
|
|
if (!is_excluded(book, a_excludeForm)) { |
|
|
|
|
a_targetList->AddForm(book); |
|
|
|
|
for (auto const& item : BookCheck::GetBookList()) { |
|
|
|
|
if (!is_excluded(item.second, a_excludeForm)) { |
|
|
|
|
a_targetList->AddForm(item.second); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
for (const auto& book : BookCheck::GetBookList()) { |
|
|
|
|
a_targetList->AddForm(book); |
|
|
|
|
for (const auto& item : BookCheck::GetBookList()) { |
|
|
|
|
a_targetList->AddForm(item.second); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|