From 2413de38b52d6c6184f5b393f800d20086345b37 Mon Sep 17 00:00:00 2001
From: jefetienne <etienneayoub@gmail.com>
Date: Tue, 17 Nov 2020 19:47:56 -0500
Subject: [PATCH 1/2] Extend spell/item search to search by magic effect name

---
 apps/openmw/mwgui/spellmodel.cpp | 46 +++++++++++++++++++++++++++++---
 apps/openmw/mwgui/spellmodel.hpp |  3 +++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 1dedfa10b..2ae92e33f 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -42,6 +42,44 @@ namespace MWGui
     {
     }
 
+    bool SpellModel::matchingEffectExists(std::string filter, const ESM::EffectList &effects)
+    {
+        auto wm = MWBase::Environment::get().getWindowManager();
+        const MWWorld::ESMStore &store =
+            MWBase::Environment::get().getWorld()->getStore();
+
+        for (unsigned int i = 0; i < effects.mList.size(); ++i)
+        {
+            short effectId = effects.mList[i].mEffectID;
+            const ESM::MagicEffect *magicEffect =
+                store.get<ESM::MagicEffect>().search(effectId);
+
+            if (effectId != -1)
+            {
+                std::string effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
+                std::string fullEffectName = wm->getGameSettingString(effectIDStr, "");
+
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill && effects.mList[i].mSkill != -1)
+                {
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Skill::sSkillNameIds[effects.mList[i].mSkill], "");
+                }
+
+                if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute && effects.mList[i].mAttribute != -1)
+                {
+                    fullEffectName += " " + wm->getGameSettingString(ESM::Attribute::sGmstAttributeIds[effects.mList[i].mAttribute], "");
+                }
+
+                std::string convert = Misc::StringUtils::lowerCaseUtf8(fullEffectName);
+                if (convert.find(filter) != std::string::npos)
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     void SpellModel::update()
     {
         mSpells.clear();
@@ -61,8 +99,9 @@ namespace MWGui
                 continue;
 
             std::string name = Misc::StringUtils::lowerCaseUtf8(spell->mName);
-
-            if (name.find(filter) == std::string::npos)
+ 
+            if (name.find(filter) == std::string::npos 
+                && !matchingEffectExists(filter, spell->mEffects))
                 continue;
 
             Spell newSpell;
@@ -103,7 +142,8 @@ namespace MWGui
 
             std::string name = Misc::StringUtils::lowerCaseUtf8(item.getClass().getName(item));
 
-            if (name.find(filter) == std::string::npos)
+            if (name.find(filter) == std::string::npos
+                && !matchingEffectExists(filter, enchant->mEffects))
                 continue;
 
             Spell newSpell;
diff --git a/apps/openmw/mwgui/spellmodel.hpp b/apps/openmw/mwgui/spellmodel.hpp
index d191cba0e..2404610bf 100644
--- a/apps/openmw/mwgui/spellmodel.hpp
+++ b/apps/openmw/mwgui/spellmodel.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_GUI_SPELLMODEL_H
 
 #include "../mwworld/ptr.hpp"
+#include <components/esm/effectlist.hpp>
 
 namespace MWGui
 {
@@ -57,6 +58,8 @@ namespace MWGui
         std::vector<Spell> mSpells;
 
         std::string mFilter;
+
+        bool matchingEffectExists(std::string filter, const ESM::EffectList &effects);
     };
 
 }

From bc6f46465f9d3bf09aebbd44689898673998efe4 Mon Sep 17 00:00:00 2001
From: jefetienne <etienneayoub@gmail.com>
Date: Wed, 18 Nov 2020 14:30:41 -0500
Subject: [PATCH 2/2] Add to changelog, authors. Move variable declaration
 inside block

---
 AUTHORS.md                       | 1 +
 CHANGELOG.md                     | 1 +
 apps/openmw/mwgui/spellmodel.cpp | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 25004078e..09ab78412 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -96,6 +96,7 @@ Programmers
     Jan Borsodi (am0s)
     Jason Hooks (jhooks)
     jeaye
+    jefetienne
     Jeffrey Haines (Jyby)
     Jengerer
     Jiří Kuneš (kunesj)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51babd907..8f909a19f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
     Feature #5642: Ability to attach arrows to actor skeleton instead of bow mesh
     Feature #5649: Skyrim SE compressed BSA format support
     Feature #5672: Make stretch menu background configuration more accessible
+    Feature #5692: Improve spell/magic item search to factor in magic effect names
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 
diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp
index 2ae92e33f..136547c4c 100644
--- a/apps/openmw/mwgui/spellmodel.cpp
+++ b/apps/openmw/mwgui/spellmodel.cpp
@@ -51,11 +51,11 @@ namespace MWGui
         for (unsigned int i = 0; i < effects.mList.size(); ++i)
         {
             short effectId = effects.mList[i].mEffectID;
-            const ESM::MagicEffect *magicEffect =
-                store.get<ESM::MagicEffect>().search(effectId);
 
             if (effectId != -1)
             {
+                const ESM::MagicEffect *magicEffect =
+                    store.get<ESM::MagicEffect>().search(effectId);
                 std::string effectIDStr = ESM::MagicEffect::effectIdToString(effectId);
                 std::string fullEffectName = wm->getGameSettingString(effectIDStr, "");