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

Fix build after e2a1ccd118

Browse Source
This commit is contained in:
Rochet2
2017-07-02 22:53:03 +03:00
parent 9aa048d78c
commit 6641f4a204
3 changed files with 119 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
CreatureMethods.h
View File

@@ -669,11 +669,11 @@ namespace LuaCreature
* *
* enum SelectAggroTarget * enum SelectAggroTarget
* { * {
* SELECT_TARGET_RANDOM = 0, //Just selects a random target * SELECT_TARGET_RANDOM = 0, // just pick a random target
* SELECT_TARGET_TOPAGGRO, //Selects targets from top aggro to bottom * SELECT_TARGET_MAXTHREAT, // prefer targets higher in the threat list
* SELECT_TARGET_BOTTOMAGGRO, //Selects targets from bottom aggro to top * SELECT_TARGET_MINTHREAT, // prefer targets lower in the threat list
* SELECT_TARGET_NEAREST, * SELECT_TARGET_MAXDISTANCE, // prefer targets further from us
* SELECT_TARGET_FARTHEST * SELECT_TARGET_MINDISTANCE // prefer targets closer to us
* }; * };
* *
* For example, if you wanted to select the third-farthest [Player] * For example, if you wanted to select the third-farthest [Player]
@@ -687,88 +687,133 @@ namespace LuaCreature
* @param uint32 position = 0 : used as an offset into the threat list. If `targetType` is random, used as the number of players from top of aggro to choose from * @param uint32 position = 0 : used as an offset into the threat list. If `targetType` is random, used as the number of players from top of aggro to choose from
* @param float distance = 0.0 : if positive, the maximum distance for the target. If negative, the minimum distance * @param float distance = 0.0 : if positive, the maximum distance for the target. If negative, the minimum distance
* @param int32 aura = 0 : if positive, the target must have this [Aura]. If negative, the the target must not have this Aura * @param int32 aura = 0 : if positive, the target must have this [Aura]. If negative, the the target must not have this Aura
* @param [Unit] except = nil : An unit that is excluded from the search
* @return [Unit] target : the target, or `nil` * @return [Unit] target : the target, or `nil`
*/ */
int GetAITarget(lua_State* L, Creature* creature) int GetAITarget(lua_State* L, Creature* creature)
{ {
uint32 targetType = Eluna::CHECKVAL<uint32>(L, 2); uint32 targetType = Eluna::CHECKVAL<uint32>(L, 2);
bool playerOnly = Eluna::CHECKVAL<bool>(L, 3, false); bool m_playerOnly = Eluna::CHECKVAL<bool>(L, 3, false);
uint32 position = Eluna::CHECKVAL<uint32>(L, 4, 0); uint32 offset = Eluna::CHECKVAL<uint32>(L, 4, 0);
float dist = Eluna::CHECKVAL<float>(L, 5, 0.0f); float m_dist = Eluna::CHECKVAL<float>(L, 5, 0.0f);
int32 aura = Eluna::CHECKVAL<int32>(L, 6, 0); int32 m_aura = Eluna::CHECKVAL<int32>(L, 6, 0);
Unit* except = Eluna::CHECKOBJ<Unit>(L, 7, false);
#ifdef MANGOS ThreatManager& mgr = creature->GetThreatManager();
ThreatList const& threatlist = creature->GetThreatManager().getThreatList(); // shortcut: if we ignore the first <offset> elements, and there are at most <offset> elements, then we ignore ALL elements
#else if (mgr.GetThreatListSize() <= offset)
ThreatList const& threatlist = creature->getThreatManager().getThreatList();
#endif
if (threatlist.empty())
return 1;
if (position >= threatlist.size())
return 1; return 1;
std::list<Unit*> targetList; std::list<Unit*> targetList;
for (ThreatList::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) if (targetType == SELECT_TARGET_MAXDISTANCE || targetType == SELECT_TARGET_MINDISTANCE)
{ {
Unit* target = (*itr)->getTarget(); for (ThreatReference* ref : mgr.GetUnsortedThreatList())
if (!target) {
continue; if (ref->IsOffline())
if (playerOnly && target->GetTypeId() != TYPEID_PLAYER) continue;
continue;
if (aura > 0 && !target->HasAura(aura)) targetList.push_back(ref->GetVictim());
continue; }
else if (aura < 0 && target->HasAura(-aura)) }
continue; else
if (dist > 0.0f && !creature->IsWithinDist(target, dist)) {
continue; Unit* currentVictim = mgr.GetCurrentVictim();
else if (dist < 0.0f && creature->IsWithinDist(target, -dist)) if (currentVictim)
continue; targetList.push_back(currentVictim);
targetList.push_back(target);
for (ThreatReference* ref : mgr.GetSortedThreatList())
{
if (ref->IsOffline())
continue;
Unit* thisTarget = ref->GetVictim();
if (thisTarget != currentVictim)
targetList.push_back(thisTarget);
}
} }
if (targetList.empty()) // filter by predicate
return 1; auto predicate = [&, me = creature](Unit* target)
if (position >= targetList.size()) {
if (!creature)
return false;
if (!target)
return false;
if (target == except)
return false;
if (m_playerOnly && (target->GetTypeId() != TYPEID_PLAYER))
return false;
if (m_dist > 0.0f && !me->IsWithinCombatRange(target, m_dist))
return false;
if (m_dist < 0.0f && me->IsWithinCombatRange(target, -m_dist))
return false;
if (m_aura)
{
if (m_aura > 0)
{
if (!target->HasAura(m_aura))
return false;
}
else
{
if (target->HasAura(-m_aura))
return false;
}
}
return true;
};
targetList.remove_if([&predicate](Unit* target) { return !predicate(target); });
// shortcut: the list certainly isn't gonna get any larger after this point
if (targetList.size() <= offset)
return 1; return 1;
if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST) // right now, list is unsorted for DISTANCE types - re-sort by MAXDISTANCE
targetList.sort(ElunaUtil::ObjectDistanceOrderPred(creature)); if (targetType == SELECT_TARGET_MAXDISTANCE || targetType == SELECT_TARGET_MINDISTANCE)
targetList.sort([creature, targetType](WorldObject const* left, WorldObject const* right) { return creature->GetDistanceOrder(left, right) == (targetType == SELECT_TARGET_MINDISTANCE);
});
// then reverse the sorting for MIN sortings
if (targetType == SELECT_TARGET_MINTHREAT)
targetList.reverse();
// now pop the first <offset> elements
while (offset)
{
targetList.pop_front();
--offset;
}
// maybe nothing fulfills the predicate
if (targetList.empty())
return 1;
switch (targetType) switch (targetType)
{ {
case SELECT_TARGET_NEAREST: case SELECT_TARGET_MAXTHREAT:
case SELECT_TARGET_TOPAGGRO: case SELECT_TARGET_MINTHREAT:
{ case SELECT_TARGET_MAXDISTANCE:
std::list<Unit*>::const_iterator itr = targetList.begin(); case SELECT_TARGET_MINDISTANCE:
if (position) Eluna::Push(L, targetList.front());
std::advance(itr, position); return 1;
Eluna::Push(L, *itr);
}
break;
case SELECT_TARGET_FARTHEST:
case SELECT_TARGET_BOTTOMAGGRO:
{
std::list<Unit*>::reverse_iterator ritr = targetList.rbegin();
if (position)
std::advance(ritr, position);
Eluna::Push(L, *ritr);
}
break;
case SELECT_TARGET_RANDOM: case SELECT_TARGET_RANDOM:
{ {
std::list<Unit*>::const_iterator itr = targetList.begin(); auto it = std::begin(targetList);
if (position) std::advance(it, urand(0, uint32(targetList.size()) - 1));
std::advance(itr, urand(0, position)); Eluna::Push(L, *it);
else return 1;
std::advance(itr, urand(0, targetList.size() - 1)); }
Eluna::Push(L, *itr);
}
break;
default: default:
luaL_argerror(L, 2, "SelectAggroTarget expected"); luaL_argerror(L, 2, "SelectAggroTarget expected");
break; return 1;
} }
return 1; return 1;
} }
@@ -779,11 +824,7 @@ namespace LuaCreature
*/ */
int GetAITargets(lua_State* L, Creature* creature) int GetAITargets(lua_State* L, Creature* creature)
{ {
#ifdef MANGOS
ThreatList const& threatlist = creature->GetThreatManager().getThreatList(); ThreatList const& threatlist = creature->GetThreatManager().getThreatList();
#else
ThreatList const& threatlist = creature->getThreatManager().getThreatList();
#endif
lua_createtable(L, threatlist.size(), 0); lua_createtable(L, threatlist.size(), 0);
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 i = 0; uint32 i = 0;
@@ -807,11 +848,7 @@ namespace LuaCreature
*/ */
int GetAITargetsCount(lua_State* L, Creature* creature) int GetAITargetsCount(lua_State* L, Creature* creature)
{ {
#ifdef MANGOS
Eluna::Push(L, creature->GetThreatManager().getThreatList().size()); Eluna::Push(L, creature->GetThreatManager().getThreatList().size());
#else
Eluna::Push(L, creature->getThreatManager().getThreatList().size());
#endif
return 1; return 1;
} }

10
ElunaIncludes.h
View File

@@ -141,11 +141,11 @@ typedef TemporarySummon TempSummon;
typedef SpellEntry SpellInfo; typedef SpellEntry SpellInfo;
enum SelectAggroTarget enum SelectAggroTarget
{ {
SELECT_TARGET_RANDOM = 0, // Just selects a random target SELECT_TARGET_RANDOM = 0, // just pick a random target
SELECT_TARGET_TOPAGGRO, // Selects targes from top aggro to bottom SELECT_TARGET_MAXTHREAT, // prefer targets higher in the threat list
SELECT_TARGET_BOTTOMAGGRO, // Selects targets from bottom aggro to top SELECT_TARGET_MINTHREAT, // prefer targets lower in the threat list
SELECT_TARGET_NEAREST, SELECT_TARGET_MAXDISTANCE, // prefer targets further from us
SELECT_TARGET_FARTHEST SELECT_TARGET_MINDISTANCE // prefer targets closer to us
}; };
#endif // TRINITY #endif // TRINITY

16
UnitMethods.h
View File

@@ -1892,11 +1892,7 @@ namespace LuaUnit
*/ */
int ClearThreatList(lua_State* /*L*/, Unit* unit) int ClearThreatList(lua_State* /*L*/, Unit* unit)
{ {
#ifdef MANGOS
unit->GetThreatManager().clearReferences(); unit->GetThreatManager().clearReferences();
#else
unit->getThreatManager().clearReferences();
#endif
return 0; return 0;
} }
@@ -2737,23 +2733,17 @@ namespace LuaUnit
{ {
Unit* victim = Eluna::CHECKOBJ<Unit>(L, 2); Unit* victim = Eluna::CHECKOBJ<Unit>(L, 2);
float threat = Eluna::CHECKVAL<float>(L, 3, true); float threat = Eluna::CHECKVAL<float>(L, 3, true);
uint32 schoolMask = Eluna::CHECKVAL<uint32>(L, 4, 0); uint32 spell = Eluna::CHECKVAL<uint32>(L, 4, 0);
uint32 spell = Eluna::CHECKVAL<uint32>(L, 5, 0);
if (schoolMask > SPELL_SCHOOL_MASK_ALL)
{
return luaL_argerror(L, 4, "valid SpellSchoolMask expected");
}
#ifdef TRINITY #ifdef TRINITY
unit->AddThreat(victim, threat, (SpellSchoolMask)schoolMask, spell ? sSpellMgr->GetSpellInfo(spell) : NULL); unit->GetThreatManager().AddThreat(victim, threat, spell ? sSpellMgr->GetSpellInfo(spell) : NULL, true, true);
#else #else
#ifdef CMANGOS #ifdef CMANGOS
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else #else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif #endif
unit->AddThreat(victim, threat, false, (SpellSchoolMask)schoolMask, spellEntry); unit->AddThreat(victim, threat, false, spellEntry ? spellEntry->SchoolMask : SPELL_SCHOOL_MASK_NONE, spellEntry);
#endif #endif
return 0; return 0;
} }