Changeset 1212

Timestamp:

03/07/2010 04:04:26 PM (6 months ago)

Author:

Paroxysm

Message:

FIXED : Ok now i've really fixed LCF:RegisterLuaEvent issues. xD
ADDED : Some more work on auchindoun,

• Unit:GetSecondHated() method
  

Location:

Trunk

Files:

• lua/0Misc/0LCF_Includes/LCF_Creature.lua (modified) (3 diffs)
• lua/0Misc/0LCF_Includes/LCF_Extra.lua (modified) (2 diffs)
• lua/0Misc/0LCF_Includes/LCF_Gameobject.lua (modified) (1 diff)
• lua/AUCHINDOUN/AUCHENAI_CRYPTS (added)
• lua/AUCHINDOUN/AUCHENAI_CRYPTS/Instance_ACrypts.lua (added)
• lua/AUCHINDOUN/AUCHENAI_CRYPTS/maladaar.script (added)
• lua/AUCHINDOUN/AUCHENAI_CRYPTS/shirrak.script (added)
• lua/AUCHINDOUN/MANA_TOMBS/Pandemonius.script (modified) (1 diff)
• src/LuaEngine/FunctionTables.h (modified) (1 diff)
• src/LuaEngine/GlobalFunctions.h (modified) (3 diffs)
• src/LuaEngine/UnitFunctions.h (modified) (1 diff)

Trunk/lua/0Misc/0LCF_Includes/LCF_Creature.lua

@@ -52 +52 @@
         end
 end
+function CREATURE:SetChannelTarget(target)
+        local guid = nil
+        if(target) then 
+                guid = target:GetGUID()
+        end
+        self:SetUInt64Value(LCF.UNIT_FIELD_CHANNEL_OBJECT,guid)
+end
 function CREATURE:GetChannelTarget()
         local guid = self:GetUInt64Value(LCF.UNIT_FIELD_CHANNEL_OBJECT)
         if(guid) then
-                return self:GetUnitByGUID(guid)
+                return self:GetObject(guid)
         end
         return nil
@@ -79 +86 @@
         self:SendChatMessage(LCF.CHAT_MSG_MONSTER_WHISPER,LCF.LANG_UNIVERSAL,msg)
 end
+function CREATURE:BossRaidEmote(msg)
+        self:SendChatMessage(LCF.CHAT_MSG_RAID_BOSS_EMOTE,LCF.LANG_UNIVERSAL,msg)
+end
 function CREATURE:MoveToUnit(target)
         local x,y,z = target:GetLocation()
@@ -97 +107 @@
 end
 function CREATURE:SetCreator(creator)
-        self:SetUInt64Value(LCF.UNIT_FIELD_CREATEDBY,creator:GetGUID())
+        local guid = nil
+        if(creator) then
+                guid = creator:GetGUID()
+        end
+        self:SetUInt64Value(LCF.UNIT_FIELD_CREATEDBY,guid)
+        self:SetUInt64Value(LCF.UNIT_FIELD_SUMMONEDBY,guid)
 end
 function CREATURE:GetCreator()

Trunk/lua/0Misc/0LCF_Includes/LCF_Extra.lua

@@ -37 +37 @@
 end
 function LCF:HandleOnAreaTrigger(event,player,area_trig)
+        player:SendAreaTriggerMessage("[AREA TRIGGER] "..area_trig)
         local key = "area "..tostring(area_trig)
         local struct = self.areatrigger_hooks[key]
@@ -112 +113 @@
         assert(type(arg) == "table","Internal error, arg is not a table.")
         if(delay <= 0) then error("Invalid argument #2, delay must be greater than 0.") end
-        local struct = {evt_typ,{func,delay,repeats,repeats,arg} }
+        local struct = {evt_typ,{func,delay,delay,repeats,arg} }
         table.insert(self.call_backs,struct)
 end

Trunk/lua/0Misc/0LCF_Includes/LCF_Gameobject.lua

@@ -66 +66 @@
         self:SetUInt64Value(LCF.OBJECT_FIELD_CREATED_BY,guid)
 end
-function GAMEOBJECT:GetCreator()
-        local guid = self:GetUInt64Value(LCF.OBJECT_FIELD_CREATED_BY)
-        return self:GetObject(guid)
-end
 function GAMEOBJECT:GetLocalCreature(entry)
         local x,y,z = self:GetLocation()

Trunk/lua/AUCHINDOUN/MANA_TOMBS/Pandemonius.script

@@ -57 +57 @@
         
         if(ref.dark_shell <= 0) then
-                unit:MonsterEmote(unit:GetName().." casts dark shell!")
+                unit:BossRaidEmote(unit:GetName().." casts dark shell!")
                 if(ref.isHeroic) then
                         unit:FullCastSpell(38759)

Trunk/src/LuaEngine/FunctionTables.h

@@ -525 +525 @@
         { "GetPlayerMovementFlags", &luaUnit::GetPlayerMovementFlags},
         { "GetObject", &luaUnit::GetObject },
+        { "GetSecondHated", &luaUnit::GetSecondHated },
         { NULL, NULL },
 };

Trunk/src/LuaEngine/GlobalFunctions.h

@@ -506 +506 @@
                 if(top > 1)
                 {
-                        for(int i = 2; i < top; ++i)
+                        for(int i = 2; i <= top; ++i)
                         {
                                 if(lua_isnumber(L,i) )
@@ -520 +520 @@
                 if(top > 1)
                 {
-                        for(int i = 2; i < top; ++i)
+                        for(int i = 2; i <= top; ++i)
                         {
                                 if(lua_isnumber(L,i) )
@@ -534 +534 @@
                 if(top > 1)
                 {
-                        for(int i = 2; i < top; ++i)
+                        for(int i = 2; i <= top; ++i)
                         {
                                 if(lua_isnumber(L,i) )

Trunk/src/LuaEngine/UnitFunctions.h

@@ -5866 +5866 @@
                 return 1;
         }
+        int GetSecondHated(lua_State * L, Unit * ptr)
+        {
+                TEST_UNIT();
+                PUSH_UNIT(L,ptr->GetAIInterface()->GetSecondHated());
+                return 1;
+        }
 }
 #endif