Changeset 1153

Timestamp:

02/10/2010 09:11:35 PM (7 months ago)

Author:

Paroxysm

Message:

ADDED :

• New function for both go's and units. GetLocation?() - this returns the x,y,z,o coords as multiple results. Usage : x,y,z,o = unit:GetLocation()
  
• LCF(Lua's Convinient Functions) - This one is similar to LSL for those who remember except these functions are treated as if they are part of the wow object functions. For example, to execute one of LCF's functions, you simply invoke it through a wow object : player:GetStrength/IsAlliance()/IsHorde().
  

Each function is stored based on the wow object type(players have their own, creatures have their own, gos...)

I will continue to expand these functions but feel free to contribute by writing your own wrappers that will aid in scripting.

Location:

Trunk

Files:

• lua/Misc/0LCF_Includes (added)
• lua/Misc/0LCF_Includes/0LCF.lua (added)
• lua/Misc/0LCF_Includes/LCF_Creature.lua (added)
• lua/Misc/0LCF_Includes/LCF_Gameobject.lua (added)
• lua/Misc/0LCF_Includes/LCF_Player.lua (added)
• src/LuaEngine/FunctionTables.h (modified) (2 diffs)
• src/LuaEngine/GameobjectFunctions.h (modified) (1 diff)
• src/LuaEngine/GlobalFunctions.h (modified) (2 diffs)
• src/LuaEngine/LUAEngine.cpp (modified) (2 diffs)
• src/LuaEngine/LUAEngine.h (modified) (2 diffs)
• src/LuaEngine/UnitFunctions.h (modified) (1 diff)

Trunk/src/LuaEngine/FunctionTables.h

@@ -518 +518 @@
         { "DisableTargeting", &luaUnit::DisableTargeting },
         { "IsInGroup", &luaUnit::IsInGroup },
+        { "GetLocation", &luaUnit::GetLocation },
         { NULL, NULL },
 };
@@ -615 +616 @@
         { "FullCastSpellOnTarget", &luaGameObject::FullCastSpellOnTarget },
         { "CustomAnimate", &luaGameObject::CustomAnimate },
+        { "GetLocation", &luaGameObject::GetLocation },
         { NULL, NULL },
 };

Trunk/src/LuaEngine/GameobjectFunctions.h

@@ -1053 +1053 @@
                 RET_BOOL(false);
         }
+        int GetLocation(lua_State * L, GameObject * ptr)
+        {
+                CHECK_TYPEID(TYPEID_GAMEOBJECT)
+
+                lua_pushnumber(L,ptr->GetPositionX());
+                lua_pushnumber(L,ptr->GetPositionZ());
+                lua_pushnumber(L,ptr->GetPositionZ());
+                lua_pushnumber(L,ptr->GetOrientation());
+                return 4;
+        }
 }
 #endif

Trunk/src/LuaEngine/GlobalFunctions.h

@@ -500 +500 @@
                 return 1;
         }
-
-        void Register(lua_State *L) {
-                lua_pushcfunction(L, &PerformIngameSpawn);
-                lua_setglobal(L, "PerformIngameSpawn");
-
-                lua_pushcfunction(L, &GetPlayer);
-                lua_setglobal(L, "GetPlayer");
-
-                lua_pushcfunction(L, &GetLUAEngine);
-                lua_setglobal(L, "GetLUAEngine");
-
-                lua_pushcfunction(L, &GetLUAEngine);
-                lua_setglobal(L, "GetLuaEngine");
-
-                lua_pushcfunction(L, &GetLuaEngineVersion);
-                lua_setglobal(L, "GetLuaEngineVersion");
-
-                lua_pushcfunction(L, &GetGameTime);
-                lua_setglobal(L, "GetGameTime");
-                
-                lua_pushcfunction(L, &WorldDBQuery);
-                lua_setglobal(L, "WorldDBQuery");
-
-                lua_pushcfunction(L, &CharDBQuery);
-                lua_setglobal(L, "CharDBQuery");
-
-                lua_pushcfunction(L, &WorldDBQueryTable);
-                lua_setglobal(L, "WorldDBQueryTable");
-
-                lua_pushcfunction(L, &CharDBQueryTable);
-                lua_setglobal(L, "CharDBQueryTable");
-                
-                lua_pushcfunction(L, &SendWorldMessage);
-                lua_setglobal(L, "SendWorldMessage");
-
-                lua_pushcfunction(L, &ReloadTable);
-                lua_setglobal(L, "ReloadTable");
-
-                lua_pushcfunction(L, &ReloadLuaEngine);
-                lua_setglobal(L, "ReloadLuaEngine");
-
-                lua_pushcfunction(L, &Rehash);
-                lua_setglobal(L, "Rehash");
-
-                lua_pushcfunction(L, &logcol);
-                lua_setglobal(L, "logcol");
-
-                lua_pushcfunction(L, &GetPlayersInWorld);
-                lua_setglobal(L, "GetPlayersInWorld");
-
-                lua_pushcfunction(L, &GetArcemuRevision);
-                lua_setglobal(L, "GetArcemuRevision");
-
-                /*lua_pushcfunction(L, &GetInstanceIdsByMap);
-                lua_setglobal(L, "GetInstanceIdsByMap");*/
-
-                /*
-                lua_pushcfunction(L, &SendPvPCaptureMessage);
-                lua_setglobal(L, "SendPvPCaptureMessage");
-                */
-                lua_pushcfunction(L, &GetPlayersInMap);
-                lua_setglobal(L, "GetPlayersInMap");
-
-                lua_pushcfunction(L, &GetPlayersInZone);
-                lua_setglobal(L, "GetPlayersInZone");
-
-                /*lua_pushcfunction(L, &RegisterTimedEvent);
-                lua_setglobal(L, "RemoveTimedEvent");*/
-
-                lua_pushcfunction(L, &SendMail);
-                lua_setglobal(L, "SendMail");
-
-                lua_register(L, "GetTaxiPath", &GetTaxiPath);
-                lua_register(L, "SetDBCSpellVar", &SetDBCSpellVar);
-                lua_register(L, "GetDBCSpellVar", &GetDBCSpellVar);
+        int bit_and(lua_State *L)
+        {
+                uint32 left = CHECK_ULONG(L,1);
+                uint32 right = CHECK_ULONG(L,2);
+                lua_pushnumber(L,(left & right));
+                return 1;
+        }
+        int bit_or(lua_State * L)
+        {
+                uint32 left = CHECK_ULONG(L,1);
+                uint32 right = CHECK_ULONG(L,2);
+                lua_pushnumber(L,(left | right));
+                return 1;
+        }
+        int bit_xor(lua_State * L)
+        {
+                uint32 left = CHECK_ULONG(L,1);
+                uint32 right = CHECK_ULONG(L,2);
+                lua_pushnumber(L,(left ^ right));
+                return 1;
+        }
+        int bit_not(lua_State * L)
+        {
+                uint32 left = CHECK_ULONG(L,1);
+                lua_pushnumber(L,(~left));
+                return 1;
         }
 }
@@ -652 +603 @@
         lua_register(L, "SetDBCSpellVar", &luaGlobalFunctions::SetDBCSpellVar);
         lua_register(L, "GetDBCSpellVar", &luaGlobalFunctions::GetDBCSpellVar);
+        //Lua's bit instructions
+        lua_register(L, "bit_and", &luaGlobalFunctions::bit_and);
+        lua_register(L, "bit_or", &luaGlobalFunctions::bit_or);
+        lua_register(L, "bit_xor", &luaGlobalFunctions::bit_xor);
+        lua_register(L, "bit_not", &luaGlobalFunctions::bit_not);
 }
 #endif

Trunk/src/LuaEngine/LUAEngine.cpp

@@ -1542 +1542 @@
         LuaCreature(Creature* creature) : CreatureAIScript(creature) {};
         ~LuaCreature()
-        {
-                typedef std::multimap<uint32,LuaCreature*> CMAP;
-                CMAP & cMap = sLuaMgr.getLuCreatureMap();
-                CMAP::iterator itr = cMap.find(_unit->GetEntry());
-                CMAP::iterator itend = cMap.upper_bound(_unit->GetEntry());
-                CMAP::iterator it;
-                for(;itr != cMap.end() && itr != itend;)
-                {
-                        it = itr++;
-                        if(it->second != NULL && it->second == this)
-                                cMap.erase(it);
-                }
-        }
+        {}
         ARCEMU_INLINE void SetUnit(Creature * ncrc) { _unit = ncrc; }
         void OnCombatStart(Unit* mTarget)
@@ -1946 +1934 @@
                 sLuaMgr.ExecuteCall(args);
                 RELEASE_LOCK
+        }
+        void Destroy()
+        {
+                typedef std::multimap<uint32,LuaCreature*> CMAP;
+                CMAP & cMap = sLuaMgr.getLuCreatureMap();
+                CMAP::iterator itr = cMap.find(_unit->GetEntry());
+                CMAP::iterator itend = cMap.upper_bound(_unit->GetEntry());
+                CMAP::iterator it;
+                for(;itr != cMap.end() && itr != itend;)
+                {
+                        it = itr++;
+                        if(it->second != NULL && it->second == this)
+                                cMap.erase(it);
+                }
+                delete this;
         }
         LuaUnitBinding * m_binding;

Trunk/src/LuaEngine/LUAEngine.h

@@ -446 +446 @@
                         lua_setfield(L, metatable, "__metatable");
 
-                        lua_pushvalue(L, methods);
+                        lua_pushcfunction(L,index);
                         lua_setfield(L, metatable, "__index");
 
@@ -558 +558 @@
                         sprintf(buff,"%p",obj);
                 }
+                static int index(lua_State * L) 
+                {
+                        /*Paroxysm : the table obj and the missing key are currently on the stack(index 1 & 2) */
+                        lua_getglobal(L,GetTClassName<T>());
+                        // string form of the key.
+                        const char * key = lua_tostring(L,2);
+                        if(lua_istable(L,-1) )
+                        {
+                                lua_pushvalue(L,2);
+                                lua_rawget(L,-2);
+                                //If the key were looking for is not in the table, retrieve its' metatables' index value.
+                                if(lua_isnil(L,-1))
+                                {
+                                        lua_getmetatable(L,-2);
+                                        if(lua_istable(L,-1) )
+                                        {
+                                                lua_getfield(L,-1,"__index");
+                                                if(lua_isfunction(L,-1) )
+                                                {
+                                                        lua_pushvalue(L,1);
+                                                        lua_pushvalue(L,2);
+                                                        lua_pcall(L,2,1,0);
+                                                }
+                                                else if(lua_istable(L,-1) )
+                                                        lua_getfield(L,-1,key);
+                                                else
+                                                        lua_pushnil(L);
+                                        }
+                                        else
+                                                lua_pushnil(L);
+                                }
+                                else if(lua_istable(L,-1) )
+                                {
+                                        lua_pushvalue(L,2);
+                                        lua_rawget(L,-2);
+                                }
+                        }
+                        else
+                                lua_pushnil(L);
+
+                        lua_insert(L,1);
+                        lua_settop(L,1);
+                        return 1;
+                }
         };
         class GUID_MGR 

Trunk/src/LuaEngine/UnitFunctions.h

@@ -5912 +5912 @@
                 RET_BOOL(false);
         }
+        int GetLocation(lua_State * L, Unit * ptr)
+        {
+                if(ptr != NULL)
+                {
+                        lua_pushnumber(L,ptr->GetPositionX());
+                        lua_pushnumber(L,ptr->GetPositionY());
+                        lua_pushnumber(L,ptr->GetPositionY());
+                        lua_pushnumber(L,ptr->GetOrientation());
+                        return 4;
+                }
+                lua_pushnil(L);
+                return 1;
+        }
 }
 #endif