Merge branch 'lua_effect_icon' into 'master'

Add icon path to core.MagicEffect

See merge request OpenMW/openmw!3154

apps/openmw/mwlua/magicbindings.cpp

@@ -346,6 +346,10 @@ namespace MWLua
             auto name = ESM::MagicEffect::indexToName(rec.mIndex);
             return Misc::StringUtils::lowerCase(name);
         });
+        magicEffectT["icon"] = sol::readonly_property([](const ESM::MagicEffect& rec) -> std::string {
+            auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+            return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs);
+        });
         magicEffectT["name"] = sol::readonly_property([](const ESM::MagicEffect& rec) -> std::string_view {
             return MWBase::Environment::get()
                 .getWorld()

files/lua_api/openmw/core.lua

@@ -672,7 +672,8 @@
 
 ---
 -- @type MagicEffect
--- @field #string Effect id string
+-- @field #string id Effect ID
+-- @field #string icon Effect Icon Path
 -- @field #string name Localized name of the effect
 -- @field #number school @{#MagicSchool}
 -- @field #number baseCost