Merge branch 'master' into FixElunaConf

azerothcore · Jan 26, 2025 · 6fbdcbf · 6fbdcbf
2 parents 376e36b + 32d15a0
commit 6fbdcbf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/LuaEngine/LuaFunctions.cpp b/src/LuaEngine/LuaFunctions.cpp
@@ -855,6 +855,7 @@ ElunaRegister<GameObject> GameObjectMethods[] =
     { "SetGoState", &LuaGameObject::SetGoState },
     { "SetLootState", &LuaGameObject::SetLootState },
     { "SetRespawnTime", &LuaGameObject::SetRespawnTime },
+    { "SetRespawnDelay", &LuaGameObject::SetRespawnDelay },
 
     // Boolean
     { "IsTransport", &LuaGameObject::IsTransport },

diff --git a/src/LuaEngine/methods/GameObjectMethods.h b/src/LuaEngine/methods/GameObjectMethods.h
@@ -353,5 +353,20 @@ namespace LuaGameObject
         go->SetRespawnTime(respawn);
         return 0;
     }
+
+    /**
+     * Sets the respawn or despawn time for the gameobject.
+     *
+     * Respawn time is also used as despawn time depending on gameobject settings
+     *
+     * @param int32 delay = 0 : cooldown time in seconds to respawn or despawn the object. 0 means never
+     */
+    int SetRespawnDelay(lua_State* L, GameObject* go)
+    {
+        int32 respawn = Eluna::CHECKVAL<int32>(L, 2);
+
+        go->SetRespawnDelay(respawn);
+        return 0;
+    }
 };
 #endif
diff --git a/src/LuaEngine/methods/ItemTemplateMethods.h b/src/LuaEngine/methods/ItemTemplateMethods.h
@@ -45,13 +45,23 @@ namespace LuaItemTemplate
     }
 
     /**
-     * Returns the [ItemTemplate]'s name.
+     * Returns the [ItemTemplate]'s name in the [Player]'s locale.
      *
+     * @param [LocaleConstant] locale = DEFAULT_LOCALE : locale to return the [ItemTemplate] name in (it's optional default: LOCALE_enUS)
+     * 
      * @return string name
      */
     int GetName(lua_State* L, ItemTemplate* itemTemplate)
     {
-        Eluna::Push(L, itemTemplate->Name1);
+        uint32 loc_idx = Eluna::CHECKVAL<uint32>(L, 2, LocaleConstant::LOCALE_enUS);
+
+        const ItemLocale* itemLocale = eObjectMgr->GetItemLocale(itemTemplate->ItemId);
+        std::string name = itemTemplate->Name1;
+
+        if (itemLocale && !itemLocale->Name[loc_idx].empty())
+            name = itemLocale->Name[loc_idx];
+
+        Eluna::Push(L, name);
         return 1;
     }