From 731095831d7ab5394bf006ad213243d56510e0e4 Mon Sep 17 00:00:00 2001
From: Zackhasacat <tobias@tribble.dev>
Date: Sun, 18 Feb 2024 13:15:56 -0600
Subject: [PATCH 1/3] Add missing function types.Item.isCarriable()

---
 apps/openmw/mwlua/types/item.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/openmw/mwlua/types/item.cpp b/apps/openmw/mwlua/types/item.cpp
index d1f80e44f4..ff05c3f232 100644
--- a/apps/openmw/mwlua/types/item.cpp
+++ b/apps/openmw/mwlua/types/item.cpp
@@ -1,3 +1,4 @@
+#include <components/esm3/loadligh.hpp>
 #include <sol/sol.hpp>
 
 #include "../../mwmechanics/spellutil.hpp"
@@ -24,6 +25,15 @@ namespace MWLua
         item["isRestocking"]
             = [](const Object& object) -> bool { return object.ptr().getCellRef().getCount(false) < 0; };
 
+        item["isCarriable"] = [](const Object& object) -> bool {
+            if (object.ptr().getClass().isItem(object.ptr()))
+            {
+                return true;
+            }
+            return object.ptr().mRef->getType() == ESM::REC_LIGH
+                && (object.ptr().get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) != 0;
+        };
+
         addItemDataBindings(item, context);
     }
 }

From 92242a3d5420dd08e2900921d704d625ccce0cc5 Mon Sep 17 00:00:00 2001
From: Zackhasacat <tobias@tribble.dev>
Date: Sun, 18 Feb 2024 13:20:58 -0600
Subject: [PATCH 2/3] Simplify

---
 apps/openmw/mwlua/types/item.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/openmw/mwlua/types/item.cpp b/apps/openmw/mwlua/types/item.cpp
index ff05c3f232..7d6a5975e2 100644
--- a/apps/openmw/mwlua/types/item.cpp
+++ b/apps/openmw/mwlua/types/item.cpp
@@ -25,14 +25,7 @@ namespace MWLua
         item["isRestocking"]
             = [](const Object& object) -> bool { return object.ptr().getCellRef().getCount(false) < 0; };
 
-        item["isCarriable"] = [](const Object& object) -> bool {
-            if (object.ptr().getClass().isItem(object.ptr()))
-            {
-                return true;
-            }
-            return object.ptr().mRef->getType() == ESM::REC_LIGH
-                && (object.ptr().get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry) != 0;
-        };
+        item["isCarriable"] = [](const Object& object) -> bool { return object.ptr().getClass().isItem(object.ptr()); };
 
         addItemDataBindings(item, context);
     }

From fed62a851753b491be12e6be003b0173f4d8960b Mon Sep 17 00:00:00 2001
From: Zackhasacat <tobias@tribble.dev>
Date: Sun, 18 Feb 2024 15:58:18 -0600
Subject: [PATCH 3/3] Remove unneeded line

---
 apps/openmw/mwlua/types/item.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwlua/types/item.cpp b/apps/openmw/mwlua/types/item.cpp
index 7d6a5975e2..8f05ce8e93 100644
--- a/apps/openmw/mwlua/types/item.cpp
+++ b/apps/openmw/mwlua/types/item.cpp
@@ -1,4 +1,3 @@
-#include <components/esm3/loadligh.hpp>
 #include <sol/sol.hpp>
 
 #include "../../mwmechanics/spellutil.hpp"