yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eluna fix some methods

Browse Source
This commit is contained in:
Rochet2
2014-06-07 23:01:10 +03:00
committed by Foereaper
parent 143e81da07
commit eeb348e48a
6 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CreatureMethods.h
View File

@@ -243,7 +243,7 @@ namespace LuaCreature
{ {
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2); Unit* target = Eluna::CHECKOBJ<Unit>(L, 2);
Eluna::Push(L, creature->GetAttackDistance(target)); Eluna::Push(L, creature->GetAggroRange(target));
return 1; return 1;
} }

16
HookMgr.cpp
View File

@@ -1373,7 +1373,13 @@ struct ElunaCreatureAI : ScriptedAI
Eluna::Push(L, me); Eluna::Push(L, me);
Eluna::Push(L, attacker); Eluna::Push(L, attacker);
Eluna::Push(L, damage); Eluna::Push(L, damage);
ENTRY_EXECUTE(0); ENTRY_EXECUTE(1);
FOR_RETS(i)
{
if (lua_isnoneornil(L, i))
continue;
damage = Eluna::CHECKVAL<uint32>(L, i, damage);
}
ENDCALL(); ENDCALL();
} }
@@ -1507,7 +1513,13 @@ struct ElunaCreatureAI : ScriptedAI
ENTRY_BEGIN(CreatureEventBindings, me->GetEntry(), CREATURE_EVENT_ON_CORPSE_REMOVED, return); ENTRY_BEGIN(CreatureEventBindings, me->GetEntry(), CREATURE_EVENT_ON_CORPSE_REMOVED, return);
Eluna::Push(L, me); Eluna::Push(L, me);
Eluna::Push(L, respawnDelay); Eluna::Push(L, respawnDelay);
ENTRY_EXECUTE(0); ENTRY_EXECUTE(1);
FOR_RETS(i)
{
if (lua_isnoneornil(L, i))
continue;
respawnDelay = Eluna::CHECKVAL<uint32>(L, i, respawnDelay);
}
ENDCALL(); ENDCALL();
} }

8
HookMgr.h
View File

@@ -84,7 +84,7 @@ namespace HookMgr
AUCTION_EVENT_ON_EXPIRE = 29, // (event, AHObject) // Not Implemented AUCTION_EVENT_ON_EXPIRE = 29, // (event, AHObject) // Not Implemented
// AddOns // AddOns
ADDON_EVENT_ON_MESSAGE = 30, // (event, sender, type, prefix, msg, target) - target can be nil/whisper_target/guid/group/channel ADDON_EVENT_ON_MESSAGE = 30, // (event, sender, type, prefix, msg, target) - target can be nil/whisper_target/guild/group/channel
SERVER_EVENT_COUNT SERVER_EVENT_COUNT
}; };
@@ -197,7 +197,7 @@ namespace HookMgr
CREATURE_EVENT_ON_REACH_WP = 6, // (event, creature, type, id) CREATURE_EVENT_ON_REACH_WP = 6, // (event, creature, type, id)
CREATURE_EVENT_ON_AIUPDATE = 7, // (event, creature, diff) CREATURE_EVENT_ON_AIUPDATE = 7, // (event, creature, diff)
CREATURE_EVENT_ON_RECEIVE_EMOTE = 8, // (event, creature, player, emoteid) CREATURE_EVENT_ON_RECEIVE_EMOTE = 8, // (event, creature, player, emoteid)
CREATURE_EVENT_ON_DAMAGE_TAKEN = 9, // (event, creature, attacker, damage) CREATURE_EVENT_ON_DAMAGE_TAKEN = 9, // (event, creature, attacker, damage) - Can return new damage
CREATURE_EVENT_ON_PRE_COMBAT = 10, // (event, creature, target) CREATURE_EVENT_ON_PRE_COMBAT = 10, // (event, creature, target)
CREATURE_EVENT_ON_ATTACKED_AT = 11, // (event, creature, attacker) CREATURE_EVENT_ON_ATTACKED_AT = 11, // (event, creature, attacker)
CREATURE_EVENT_ON_OWNER_ATTACKED = 12, // (event, creature, target) // Not on mangos CREATURE_EVENT_ON_OWNER_ATTACKED = 12, // (event, creature, target) // Not on mangos
@@ -214,8 +214,8 @@ namespace HookMgr
CREATURE_EVENT_ON_RESET = 23, // (event, creature) CREATURE_EVENT_ON_RESET = 23, // (event, creature)
CREATURE_EVENT_ON_REACH_HOME = 24, // (event, creature) CREATURE_EVENT_ON_REACH_HOME = 24, // (event, creature)
// UNUSED = 25, // (event, creature) // UNUSED = 25, // (event, creature)
CREATURE_EVENT_ON_CORPSE_REMOVED = 26, // (event, creature, respawndelay) CREATURE_EVENT_ON_CORPSE_REMOVED = 26, // (event, creature, respawndelay) - Can return new respawndelay
CREATURE_EVENT_ON_MOVE_IN_LOS = 27, // (event, creature, unit) // Doesnt actually check LOS CREATURE_EVENT_ON_MOVE_IN_LOS = 27, // (event, creature, unit) - Does not actually check LOS. Just uses the sight range
// UNUSED = 28, // (event, creature) // UNUSED = 28, // (event, creature)
// UNUSED = 29, // (event, creature) // UNUSED = 29, // (event, creature)
CREATURE_EVENT_ON_DUMMY_EFFECT = 30, // (event, caster, spellid, effindex, creature) CREATURE_EVENT_ON_DUMMY_EFFECT = 30, // (event, caster, spellid, effindex, creature)

23
LuaFunctions.cpp
View File

@@ -294,7 +294,7 @@ ElunaRegister<Unit> UnitMethods[] =
{ "IsTaxi", &LuaUnit::IsTaxi }, // :IsTaxi() { "IsTaxi", &LuaUnit::IsTaxi }, // :IsTaxi()
{ "IsSpiritHealer", &LuaUnit::IsSpiritHealer }, // :IsSpiritHealer() { "IsSpiritHealer", &LuaUnit::IsSpiritHealer }, // :IsSpiritHealer()
{ "IsSpiritGuide", &LuaUnit::IsSpiritGuide }, // :IsSpiritGuide() { "IsSpiritGuide", &LuaUnit::IsSpiritGuide }, // :IsSpiritGuide()
{ "IsTabardDesigner", &LuaUnit::IsTabardDesigner }, // :IsSpiritGuide() { "IsTabardDesigner", &LuaUnit::IsTabardDesigner }, // :IsTabardDesigner()
{ "IsServiceProvider", &LuaUnit::IsServiceProvider }, // :IsServiceProvider() { "IsServiceProvider", &LuaUnit::IsServiceProvider }, // :IsServiceProvider()
{ "IsSpiritService", &LuaUnit::IsSpiritService }, // :IsSpiritService() { "IsSpiritService", &LuaUnit::IsSpiritService }, // :IsSpiritService()
{ "HealthBelowPct", &LuaUnit::HealthBelowPct }, // :HealthBelowPct(int32 pct) { "HealthBelowPct", &LuaUnit::HealthBelowPct }, // :HealthBelowPct(int32 pct)
@@ -321,9 +321,9 @@ ElunaRegister<Unit> UnitMethods[] =
#endif #endif
// Other // Other
{ "RegisterEvent", &LuaUnit::RegisterEvent }, // :RegisterEvent(function, delay, calls) { "RegisterEvent", &LuaUnit::RegisterEvent }, // :RegisterEvent(function, delay, repeats) - The timer ticks if this unit is visible to someone. The function is called with arguments (eventid, delay, repeats, unit) after the time has passed if the unit exists. Returns EventId
{ "RemoveEventById", &LuaUnit::RemoveEventById }, // :RemoveEventById(eventID) { "RemoveEventById", &LuaUnit::RemoveEventById }, // :RemoveEventById(eventID) - Removes a Registered (timed) event by it's ID.
{ "RemoveEvents", &LuaUnit::RemoveEvents }, // :RemoveEvents() { "RemoveEvents", &LuaUnit::RemoveEvents }, // :RemoveEvents() - Removes all registered timed events
{ "AddAura", &LuaUnit::AddAura }, // :AddAura(spellId, target) - Adds an aura to the specified target { "AddAura", &LuaUnit::AddAura }, // :AddAura(spellId, target) - Adds an aura to the specified target
{ "RemoveAura", &LuaUnit::RemoveAura }, // :RemoveAura(spellId[, casterGUID]) - Removes an aura from the unit by the spellId, casterGUID(Original caster) is optional { "RemoveAura", &LuaUnit::RemoveAura }, // :RemoveAura(spellId[, casterGUID]) - Removes an aura from the unit by the spellId, casterGUID(Original caster) is optional
{ "RemoveAllAuras", &LuaUnit::RemoveAllAuras }, // :RemoveAllAuras() - Removes all the unit's auras { "RemoveAllAuras", &LuaUnit::RemoveAllAuras }, // :RemoveAllAuras() - Removes all the unit's auras
@@ -337,7 +337,7 @@ ElunaRegister<Unit> UnitMethods[] =
{ "CastSpellAoF", &LuaUnit::CastSpellAoF }, // :CastSpellAoF(x, y, z, spellID[, triggered]) - Casts the spell on coordinates, if triggered is false has mana cost and cast time { "CastSpellAoF", &LuaUnit::CastSpellAoF }, // :CastSpellAoF(x, y, z, spellID[, triggered]) - Casts the spell on coordinates, if triggered is false has mana cost and cast time
{ "PlayDirectSound", &LuaUnit::PlayDirectSound }, // :PlayDirectSound(soundId, player) - Unit plays soundID to player, or everyone around if no player { "PlayDirectSound", &LuaUnit::PlayDirectSound }, // :PlayDirectSound(soundId, player) - Unit plays soundID to player, or everyone around if no player
{ "PlayDistanceSound", &LuaUnit::PlayDistanceSound }, // :PlayDistanceSound(soundId, player) - Unit plays soundID to player, or everyone around if no player. The sound fades the further you are { "PlayDistanceSound", &LuaUnit::PlayDistanceSound }, // :PlayDistanceSound(soundId, player) - Unit plays soundID to player, or everyone around if no player. The sound fades the further you are
// {"Kill", &LuaUnit::Kill}, // :Kill(target, durabilityLoss) - Unit kills the target. Durabilityloss is true by default { "Kill", &LuaUnit::Kill }, // :Kill(target, durabilityLoss) - Unit kills the target. Durabilityloss is true by default
{ "StopSpellCast", &LuaUnit::StopSpellCast }, // :StopSpellCast(spellId(optional)) - Stops the unit from casting a spell. If a spellId is defined, it will stop that unit from casting that spell { "StopSpellCast", &LuaUnit::StopSpellCast }, // :StopSpellCast(spellId(optional)) - Stops the unit from casting a spell. If a spellId is defined, it will stop that unit from casting that spell
{ "InterruptSpell", &LuaUnit::InterruptSpell }, // :InterruptSpell(spellType, delayed(optional)) - Interrupts the unit's spell by the spellType. If delayed is true it will skip if the spell is delayed. { "InterruptSpell", &LuaUnit::InterruptSpell }, // :InterruptSpell(spellType, delayed(optional)) - Interrupts the unit's spell by the spellType. If delayed is true it will skip if the spell is delayed.
{ "SendChatMessageToPlayer", &LuaUnit::SendChatMessageToPlayer }, // :SendChatMessageToPlayer(type, lang, msg, target) - Unit sends a chat message to the given target player { "SendChatMessageToPlayer", &LuaUnit::SendChatMessageToPlayer }, // :SendChatMessageToPlayer(type, lang, msg, target) - Unit sends a chat message to the given target player
@@ -370,6 +370,8 @@ ElunaRegister<Unit> UnitMethods[] =
{ "MoveStop", &LuaUnit::MoveStop }, // :MoveStop() { "MoveStop", &LuaUnit::MoveStop }, // :MoveStop()
{ "MoveExpire", &LuaUnit::MoveExpire }, // :MoveExpire([reset]) { "MoveExpire", &LuaUnit::MoveExpire }, // :MoveExpire([reset])
{ "MoveClear", &LuaUnit::MoveClear }, // :MoveClear([reset]) { "MoveClear", &LuaUnit::MoveClear }, // :MoveClear([reset])
{ "DealDamage", &LuaUnit::DealDamage }, // :DealDamage(target, amount[, durabilityloss]) - Deals damage to target, durabilityloss is true by default
{ "DealHeal", &LuaUnit::DealHeal }, // :DealDamage(target, amount, spell[, critical]) - Heals target by given amount. This will be logged as being healed by spell as critical if true.
{ NULL, NULL }, { NULL, NULL },
}; };
@@ -762,7 +764,6 @@ ElunaRegister<Creature> CreatureMethods[] =
{ "CanFly", &LuaCreature::CanFly }, // :CanFly() - Returns true if the creature can fly { "CanFly", &LuaCreature::CanFly }, // :CanFly() - Returns true if the creature can fly
// Other // Other
// {"Despawn", &LuaCreature::Despawn}, // :Despawn([despawnDelay]) - Creature despawns after given time
{ "FleeToGetAssistance", &LuaCreature::FleeToGetAssistance }, // :FleeToGetAssistance() - Creature flees for assistance { "FleeToGetAssistance", &LuaCreature::FleeToGetAssistance }, // :FleeToGetAssistance() - Creature flees for assistance
{ "CallForHelp", &LuaCreature::CallForHelp }, // :CallForHelp(radius) - Creature calls for help from units in radius { "CallForHelp", &LuaCreature::CallForHelp }, // :CallForHelp(radius) - Creature calls for help from units in radius
{ "CallAssistance", &LuaCreature::CallAssistance }, // :CallAssistance() - Creature calls for assistance { "CallAssistance", &LuaCreature::CallAssistance }, // :CallAssistance() - Creature calls for assistance
@@ -770,7 +771,6 @@ ElunaRegister<Creature> CreatureMethods[] =
{ "DespawnOrUnsummon", &LuaCreature::DespawnOrUnsummon }, // :DespawnOrUnsummon([Delay]) - Despawns the creature after delay if given { "DespawnOrUnsummon", &LuaCreature::DespawnOrUnsummon }, // :DespawnOrUnsummon([Delay]) - Despawns the creature after delay if given
{ "Respawn", &LuaCreature::Respawn }, // :Respawn([force]) - Respawns the creature { "Respawn", &LuaCreature::Respawn }, // :Respawn([force]) - Respawns the creature
// {"AddLootMode", &LuaCreature::AddLootMode}, // :AddLootMode(lootMode) // {"AddLootMode", &LuaCreature::AddLootMode}, // :AddLootMode(lootMode)
// {"DealDamage", &LuaCreature::DealDamage}, // :DealDamage(target, amount) - Deals damage to target (if target) : if no target, unit will damage self
// {"SendCreatureTalk", &LuaCreature::SendCreatureTalk}, // :SendCreatureTalk(id, playerGUID) - Sends a chat message to a playerGUID (player) by id. Id can be found in creature_text under the 'group_id' column // {"SendCreatureTalk", &LuaCreature::SendCreatureTalk}, // :SendCreatureTalk(id, playerGUID) - Sends a chat message to a playerGUID (player) by id. Id can be found in creature_text under the 'group_id' column
{ "AttackStart", &LuaCreature::AttackStart }, // :AttackStart(target) - Creature attacks the specified target { "AttackStart", &LuaCreature::AttackStart }, // :AttackStart(target) - Creature attacks the specified target
// {"ResetLootMode", &LuaCreature::ResetLootMode}, // {"ResetLootMode", &LuaCreature::ResetLootMode},
@@ -801,9 +801,9 @@ ElunaRegister<GameObject> GameObjectMethods[] =
{ "IsSpawned", &LuaGameObject::IsSpawned }, // :IsSpawned() { "IsSpawned", &LuaGameObject::IsSpawned }, // :IsSpawned()
// Other // Other
{ "RegisterEvent", &LuaGameObject::RegisterEvent }, // :RegisterEvent(function, delay, calls) { "RegisterEvent", &LuaGameObject::RegisterEvent }, // :RegisterEvent(function, delay, calls) - The timer ticks if this gameobject is visible to someone. The function is called with arguments (eventid, delay, repeats, gameobject) after the time has passed if the gameobject exists. Returns EventId
{ "RemoveEventById", &LuaGameObject::RemoveEventById }, // :RemoveEventById(eventID) { "RemoveEventById", &LuaGameObject::RemoveEventById }, // :RemoveEventById(eventID) - Removes a Registered (timed) event by it's ID.
{ "RemoveEvents", &LuaGameObject::RemoveEvents }, // :RemoveEvents() { "RemoveEvents", &LuaGameObject::RemoveEvents }, // :RemoveEvents() - Removes all registered timed events
{ "RemoveFromWorld", &LuaGameObject::RemoveFromWorld }, // :RemoveFromWorld(del) { "RemoveFromWorld", &LuaGameObject::RemoveFromWorld }, // :RemoveFromWorld(del)
{ "UseDoorOrButton", &LuaGameObject::UseDoorOrButton }, // :UseDoorOrButton(delay) - Activates/closes/opens after X delay UNDOCUMENTED { "UseDoorOrButton", &LuaGameObject::UseDoorOrButton }, // :UseDoorOrButton(delay) - Activates/closes/opens after X delay UNDOCUMENTED
{ "Despawn", &LuaGameObject::Despawn }, // :Despawn([delay]) - Despawns the object after delay { "Despawn", &LuaGameObject::Despawn }, // :Despawn([delay]) - Despawns the object after delay
@@ -1076,7 +1076,8 @@ ElunaRegister<QueryResult> QueryMethods[] =
{ "GetInt64", &LuaQuery::GetInt64 }, // :GetInt64(column) - returns the value of a bigint column as string { "GetInt64", &LuaQuery::GetInt64 }, // :GetInt64(column) - returns the value of a bigint column as string
{ "GetFloat", &LuaQuery::GetFloat }, // :GetFloat(column) - returns the value of a float column { "GetFloat", &LuaQuery::GetFloat }, // :GetFloat(column) - returns the value of a float column
{ "GetDouble", &LuaQuery::GetDouble }, // :GetDouble(column) - returns the value of a double column { "GetDouble", &LuaQuery::GetDouble }, // :GetDouble(column) - returns the value of a double column
{ "GetString", &LuaQuery::GetString }, // :GetString(column) - returns the value of a string column { "GetString", &LuaQuery::GetString }, // :GetString(column) - returns the value of a string column, always returns a string
{ "GetCString", &LuaQuery::GetCString }, // :GetCString(column) - returns the value of a string column, can return nil
{ "IsNull", &LuaQuery::IsNull }, // :IsNull(column) - returns true if the column is null { "IsNull", &LuaQuery::IsNull }, // :IsNull(column) - returns true if the column is null
{ NULL, NULL }, { NULL, NULL },

8
QueryMethods.h
View File

@@ -140,6 +140,14 @@ namespace LuaQuery
return 1; return 1;
} }
int GetCString(lua_State* L, QueryResult* result)
{
uint32 col = Eluna::CHECKVAL<uint32>(L, 2);
if (col < RESULT->GetFieldCount())
Eluna::Push(L, RESULT->Fetch()[col].GetCString());
return 1;
}
/* OTHER */ /* OTHER */
int NextRow(lua_State* L, QueryResult* result) int NextRow(lua_State* L, QueryResult* result)
{ {

47
UnitMethods.h
View File

@@ -1618,22 +1618,45 @@ namespace LuaUnit
return 1; return 1;
} }
/*int DealDamage(lua_State* L, Unit* unit) int DealDamage(lua_State* L, Unit* unit)
{ {
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2); Unit* target = Eluna::CHECKOBJ<Unit>(L, 2);
uint32 amount = Eluna::CHECKVAL<uint32>(L, 3); uint32 amount = Eluna::CHECKVAL<uint32>(L, 3);
bool durabilityloss = Eluna::CHECKVAL<bool>(L, 4, true);
unit->DealDamage(target, amount); unit->DealDamage(target, amount, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, durabilityloss);
return 0; return 0;
}*/ }
/*int Kill(lua_State* L, Unit* unit) int DealHeal(lua_State* L, Unit* unit)
{ {
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2); Unit* target = Eluna::CHECKOBJ<Unit>(L, 2);
bool durLoss = Eluna::CHECKVAL<bool>(L, 3, true); uint32 spell = Eluna::CHECKVAL<uint32>(L, 3);
unit->Kill(target, durLoss); uint32 amount = Eluna::CHECKVAL<uint32>(L, 4);
return 0; uint32 critical = Eluna::CHECKVAL<uint32>(L, 5, false);
}*/
#ifdef MANGOS
if (const SpellInfo* info = sSpellStore.LookupEntry(spell))
unit->DealHeal(target, amount, info, critical);
#else
if (const SpellInfo* info = sSpellMgr->GetSpellInfo(spell))
unit->HealBySpell(target, info, amount, critical);
#endif
return 0;
}
int Kill(lua_State* L, Unit* unit)
{
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2);
bool durLoss = Eluna::CHECKVAL<bool>(L, 3, true);
#ifdef MANGOS
unit->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, durLoss);
#else
unit->Kill(target, durLoss);
#endif
return 0;
}
/*int RestoreDisplayId(lua_State* L, Unit* unit) /*int RestoreDisplayId(lua_State* L, Unit* unit)
{ {