nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 10:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Misc): acore to Acore (#6043)

Browse Source
This commit is contained in:
Kitzunu
2021-05-31 14:21:54 +02:00
committed by GitHub
parent 7eeae6866e
commit 897a02bb75
224 changed files with 942 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -1359,7 +1359,7 @@ public:
FinishCast(SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
return;
}
target = acore::Containers::SelectRandomContainerElement(targets);
target = Acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
@@ -2240,7 +2240,7 @@ public:
return;
}
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
WorldObject* target = Acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
_corpse = true;

8
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -1050,7 +1050,7 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
acore::Containers::RandomResize(targets, 2);
Acore::Containers::RandomResize(targets, 2);
}
void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -1276,7 +1276,7 @@ public:
return;
}
tempTargets.sort(acore::HealthPctOrderPred());
tempTargets.sort(Acore::HealthPctOrderPred());
targets.clear();
targets.push_back(tempTargets.front());
}
@@ -1313,13 +1313,13 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::RaidCheck(GetCaster(), false));
targets.remove_if(Acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = GetCaster()->HasAura(SPELL_DRUID_GLYPH_OF_WILD_GROWTH) ? 6 : 5;
if (targets.size() > maxTargets)
{
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
targets.resize(maxTargets);
}

10
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -768,7 +768,7 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove(GetCaster());
acore::Containers::RandomResize(targets, _count);
Acore::Containers::RandomResize(targets, _count);
}
void Register() override
@@ -1719,8 +1719,8 @@ public:
float max_range = GetSpellInfo()->GetMaxRange(false);
WorldObject* result = nullptr;
// search for nearby enemy corpse in range
acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE);
acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
Acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE);
Acore::WorldObjectSearcher<Acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher);
if (!result)
return SPELL_FAILED_NO_EDIBLE_CORPSES;
@@ -4812,13 +4812,13 @@ public:
}
}
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
targets.remove_if(Acore::PowerCheck(POWER_MANA, false));
uint8 const maxTargets = 10;
if (targets.size() > maxTargets)
{
targets.sort(acore::PowerPctOrderPred(POWER_MANA));
targets.sort(Acore::PowerPctOrderPred(POWER_MANA));
targets.resize(maxTargets);
}
}

4
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -977,8 +977,8 @@ public:
float max_range = GetSpellInfo()->GetMaxRange(false);
WorldObject* result = nullptr;
// search for nearby enemy corpse in range
acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY);
acore::WorldObjectSearcher<acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
Acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY);
Acore::WorldObjectSearcher<Acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
caster->GetMap()->VisitFirstFound(caster->m_positionX, caster->m_positionY, max_range, searcher);
if (!result)
return SPELL_FAILED_NO_EDIBLE_CORPSES;

2
src/server/scripts/Spells/spell_item.cpp
View File

@@ -1998,7 +1998,7 @@ public:
if (targets.size() < 2)
return;
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
WorldObject* target = targets.front();
targets.clear();

4
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -652,7 +652,7 @@ public:
void CountTargets(std::list<WorldObject*>& targetList)
{
acore::Containers::RandomResize(targetList, GetSpellValue()->MaxAffectedTargets);
Acore::Containers::RandomResize(targetList, GetSpellValue()->MaxAffectedTargets);
_targetCount = targetList.size();
}
@@ -767,7 +767,7 @@ public:
if (targets.size() > maxTargets)
{
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}

16
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -152,13 +152,13 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::RaidCheck(GetCaster(), false));
targets.remove_if(Acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = GetCaster()->HasAura(SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING) ? 6 : 5; // Glyph of Circle of Healing
if (targets.size() > maxTargets)
{
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}
@@ -235,13 +235,13 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::RaidCheck(GetCaster(), false));
targets.remove_if(Acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = 3;
if (targets.size() > maxTargets)
{
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
targets.resize(maxTargets);
}
}
@@ -361,14 +361,14 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
targets.remove_if(acore::RaidCheck(GetCaster(), false));
targets.remove_if(Acore::PowerCheck(POWER_MANA, false));
targets.remove_if(Acore::RaidCheck(GetCaster(), false));
uint32 const maxTargets = 3;
if (targets.size() > maxTargets)
{
targets.sort(acore::PowerPctOrderPred(POWER_MANA));
targets.sort(Acore::PowerPctOrderPred(POWER_MANA));
targets.resize(maxTargets);
}
}
@@ -549,7 +549,7 @@ public:
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(acore::ObjectGUIDCheck(GetCaster()->GetGuidValue(UNIT_FIELD_CHANNEL_OBJECT), true));
unitList.remove_if(Acore::ObjectGUIDCheck(GetCaster()->GetGuidValue(UNIT_FIELD_CHANNEL_OBJECT), true));
}
void Register() override

4
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -2426,8 +2426,8 @@ public:
Unit* caster = GetCaster();
// Check for player that is in 65 y range
std::list<Player*> playerList;
acore::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
acore::PlayerListSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
Acore::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
Acore::PlayerListSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
caster->VisitNearbyWorldObject(65.0f, searcher);
for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
// Check if found player target is on fly mount or using flying form

2
src/server/scripts/Spells/spell_rogue.cpp
View File

@@ -395,7 +395,7 @@ public:
{
while (!_targets.empty())
{
ObjectGuid guid = acore::Containers::SelectRandomContainerElement(_targets);
ObjectGuid guid = Acore::Containers::SelectRandomContainerElement(_targets);
if (Unit* target = ObjectAccessor::GetUnit(*GetTarget(), guid))
{
// xinef: target may be no longer valid

10
src/server/scripts/Spells/spell_shaman.cpp
View File

@@ -424,7 +424,7 @@ public:
if (targets.size() < 2)
return;
targets.sort(acore::HealthPctOrderPred());
targets.sort(Acore::HealthPctOrderPred());
WorldObject* target = targets.front();
targets.clear();
@@ -512,8 +512,8 @@ public:
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(Acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(Acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
}
void ApplyDebuff()
@@ -999,8 +999,8 @@ public:
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(Acore::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(Acore::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
}
void ApplyDebuff()

2
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -168,7 +168,7 @@ public:
void FilterTargets(std::list<WorldObject*>& unitList)
{
GetCaster()->RemoveAurasDueToSpell(SPELL_WARRIOR_SPELL_REFLECTION);
unitList.sort(acore::ObjectDistanceOrderPred(GetCaster()));
unitList.sort(Acore::ObjectDistanceOrderPred(GetCaster()));
while (unitList.size() > GetSpellValue()->MaxAffectedTargets)
unitList.pop_back();
}