add getElementBaseModel

Fernando-A-Rocha · Aug 1, 2024 · 6fe0f45 · 6fe0f45
1 parent 6a82134
commit 6fe0f45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/newmodels_reborn/meta.xml b/newmodels_reborn/meta.xml
@@ -22,6 +22,7 @@
     <export function="setPickupType" type="shared"/>
     <export function="setElementModel" type="shared"/>
     <export function="getElementModel" type="shared"/>
+    <export function="getElementBaseModel" type="shared"/>
     <export function="getBaseModelIdFromCustomModelId" type="shared"/>
     <export function="import" type="shared"/>
 

diff --git a/newmodels_reborn/scripts/core/shared_exported.lua b/newmodels_reborn/scripts/core/shared_exported.lua
@@ -215,7 +215,19 @@ end
 function getElementModel(element)
     assert(isElement(element), "Invalid element passed: " .. tostring(element))
     assert(isValidElement(element), "Invalid element type passed: " .. getElementType(element))
-    return getElementData(element, getCustomModelDataKey(element)) or _getElementModel(element)
+    return tonumber(getElementData(element, getCustomModelDataKey(element))) or _getElementModel(element)
+end
+
+function getElementBaseModel(element)
+    if not isClientsideScript then
+        return getElementModel(element)
+    end
+    local customModel = tonumber(getElementData(element, getCustomModelDataKey(element)))
+    if not customModel then
+        return getElementModel(element)
+    end
+    local customModelInfo = getSharedCustomModelsTable()[customModel]
+    return customModelInfo and customModelInfo.baseModel or nil
 end
 
 -- PS. You can't set element model on a pickup

diff --git a/newmodels_reborn/scripts/optional/compatibility/shared_exported.lua b/newmodels_reborn/scripts/optional/compatibility/shared_exported.lua
@@ -77,17 +77,7 @@ function getModList()
 end
 
 function getBaseModel(element)
-    if not isClientsideScript then
-        return getElementModel(element)
-    else
-        local customModel = tonumber(getElementData(element, getCustomModelDataKey(element)))
-        if customModel then
-            local customModelInfo = getSharedCustomModelsTable()[customModel]
-            return customModelInfo and customModelInfo.baseModel or nil
-        else
-            return getElementModel(element)
-        end
-    end
+    return getElementBaseModel(element)
 end
 
 function isCustomModID(id)