nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-17 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): rename namespaces and macros to acore (#2454)

Browse Source
This commit is contained in:
Viste
2019-12-01 15:13:31 +03:00
committed by Francesco Borzì
parent e19e95e5d0
commit e22d78ecd6
278 changed files with 1292 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
View File

@@ -275,7 +275,7 @@ class spell_shadow_sickle_periodic_damage : public SpellScriptLoader
PlayerList.push_back(player);
if (!PlayerList.empty())
caster->CastSpell(Trinity::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true);
caster->CastSpell(acore::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true);
}
}

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
View File

@@ -469,12 +469,12 @@ class spell_mistress_kiss_area : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
// get a list of players with mana
targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(Trinity::PowerCheck(POWER_MANA, false));
targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(acore::PowerCheck(POWER_MANA, false));
if (targets.empty())
return;
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}

2
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
View File

@@ -365,7 +365,7 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 10.0f, false));
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 10.0f, false));
}
void Register()

16
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
View File

@@ -356,7 +356,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
myList.push_back(p);
if (!myList.empty())
{
myList.sort(Trinity::ObjectDistanceOrderPred(me->GetVictim()));
myList.sort(acore::ObjectDistanceOrderPred(me->GetVictim()));
Player* target = myList.front();
if (me->GetVictim()->GetGUID() != _tankGUID || target->GetGUID() != _offtankGUID)
{
@@ -424,7 +424,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
if (Player* p = itr->GetSource())
if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && p->GetDistance(me) < 100.0f && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY))
myList.push_back(p);
Trinity::Containers::RandomResizeList(myList, Is25ManRaid() ? 3 : 2);
acore::Containers::RandomResizeList(myList, Is25ManRaid() ? 3 : 2);
if (myList.size() > 1)
{
Talk(SAY_PACT_OF_THE_DARKFALLEN);
@@ -450,7 +450,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
if (!myList.empty())
{
Trinity::Containers::RandomResizeList(myList, 1);
acore::Containers::RandomResizeList(myList, 1);
Player* target = myList.front();
Talk(EMOTE_SWARMING_SHADOWS, target);
Talk(SAY_SWARMING_SHADOWS);
@@ -472,7 +472,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && !p->HasAura(SPELL_PACT_OF_THE_DARKFALLEN) && !p->HasAura(SPELL_UNCONTROLLABLE_FRENZY))
myList.push_back(p);
Trinity::Containers::RandomResizeList<Player*>(myList, uint32(Is25ManRaid() ? 4 : 2));
acore::Containers::RandomResizeList<Player*>(myList, uint32(Is25ManRaid() ? 4 : 2));
for (std::list<Player*>::iterator itr = myList.begin(); itr != myList.end(); ++itr)
me->CastSpell(*itr, SPELL_TWILIGHT_BLOODBOLT, false);
me->CastSpell(me, SPELL_TWILIGHT_BLOODBOLT_TARGET, false);
@@ -632,7 +632,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN));
targets.remove_if(acore::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN));
bool remove = true;
std::list<WorldObject*>::const_iterator itr, itr2, itrEnd = targets.end();
@@ -677,7 +677,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN));
unitList.remove_if(acore::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN));
unitList.push_back(GetCaster());
}
@@ -732,7 +732,7 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader
{
uint32 targetCount = (targets.size() + 2) / 3;
targets.remove_if(BloodboltHitCheck(static_cast<LanaThelAI*>(GetCaster()->GetAI())));
Trinity::Containers::RandomResizeList(targets, targetCount);
acore::Containers::RandomResizeList(targets, targetCount);
// mark targets now, effect hook has missile travel time delay (might cast next in that time)
for (std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
GetCaster()->GetAI()->SetGUID((*itr)->GetGUID(), GUID_BLOODBOLT);
@@ -933,7 +933,7 @@ class spell_blood_queen_swarming_shadows_floor_dmg : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), GetSpellInfo()->Effects[0].CalcRadius(), true));
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), GetSpellInfo()->Effects[0].CalcRadius(), true));
}
void Register()

10
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
View File

@@ -539,7 +539,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
if (_guardList.empty())
{
GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_KOR_KRON_REAVER, 20.0f);
_guardList.sort(Trinity::ObjectDistanceOrderPred(me));
_guardList.sort(acore::ObjectDistanceOrderPred(me));
}
uint32 x = 1;
for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
@@ -801,7 +801,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
if (_guardList.empty())
{
GetCreatureListWithEntryInGrid(_guardList, me, NPC_SE_SKYBREAKER_MARINE, 20.0f);
_guardList.sort(Trinity::ObjectDistanceOrderPred(me));
_guardList.sort(acore::ObjectDistanceOrderPred(me));
}
uint32 x = 1;
for (std::list<Creature*>::iterator itr = _guardList.begin(); itr != _guardList.end(); ++itr)
@@ -1240,7 +1240,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader
// select one random target, with preference of ranged targets
uint32 targetsAtRange = 0;
uint32 const minTargets = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 10 : 4);
targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster(), false));
targets.sort(acore::ObjectDistanceOrderPred(GetCaster(), false));
// get target count at range
for (std::list<WorldObject*>::iterator itr = targets.begin(); itr != targets.end(); ++itr, ++targetsAtRange)
@@ -1308,12 +1308,12 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader
if (GetSpellInfo()->Id == 72385 || GetSpellInfo()->Id == 72442) // 10n, 10h
{
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
else
Trinity::Containers::RandomResizeList(targets, 3);
acore::Containers::RandomResizeList(targets, 3);
}
void Register()

6
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
View File

@@ -2203,7 +2203,7 @@ class spell_igb_explosion : public SpellScriptLoader
void SelectTarget(std::list<WorldObject*>& targets)
{
targets.remove_if(IgbExplosionCheck(GetCaster()));
Trinity::Containers::RandomResizeList(targets, 1);
acore::Containers::RandomResizeList(targets, 1);
}
void Register()
@@ -2472,7 +2472,7 @@ class spell_igb_burning_pitch_selector : public SpellScriptLoader
targets.remove_if(BurningPitchFilterCheck(teamId == TEAM_HORDE ? GO_ORGRIMS_HAMMER_H : GO_THE_SKYBREAKER_A));
if (!targets.empty())
{
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
@@ -2557,7 +2557,7 @@ class spell_igb_rocket_artillery : public SpellScriptLoader
if (!targets.empty())
{
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View File

@@ -624,7 +624,7 @@ class boss_lady_deathwhisper : public CreatureScript
return;
// select random cultist
Creature* cultist = Trinity::Containers::SelectRandomContainerElement(temp);
Creature* cultist = acore::Containers::SelectRandomContainerElement(temp);
if (!cultist)
return;

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -59,7 +59,7 @@ enum Events
uint32 const boneSpikeSummonId[3] = {69062, 72669, 72670};
struct BoneStormMoveTargetSelector : public ACORE::unary_function<Unit*, bool>
struct BoneStormMoveTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
BoneStormMoveTargetSelector(Creature* source) : _source(source) { }

24
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -188,7 +188,7 @@ private:
};
// xinef: malleable goo selector, check for target validity
struct MalleableGooSelector : public ACORE::unary_function<Unit*, bool>
struct MalleableGooSelector : public acore::unary_function<Unit*, bool>
{
const Unit* me;
MalleableGooSelector(Unit const* unit) : me(unit) {}
@@ -873,7 +873,7 @@ class spell_putricide_slime_puddle : public SpellScriptLoader
void ScaleRange(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 2.5f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true));
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 2.5f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true));
}
// big hax to unlock Abomination Eat Ooze ability, requires caster aura spell from difficulty X, but unlocks clientside when got base aura
@@ -1023,10 +1023,10 @@ class spell_putricide_tear_gas_effect : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
// vanish rank 1-3, mage invisibility
targets.remove_if(Trinity::UnitAuraCheck(true, 11327));
targets.remove_if(Trinity::UnitAuraCheck(true, 11329));
targets.remove_if(Trinity::UnitAuraCheck(true, 26888));
targets.remove_if(Trinity::UnitAuraCheck(true, 32612));
targets.remove_if(acore::UnitAuraCheck(true, 11327));
targets.remove_if(acore::UnitAuraCheck(true, 11329));
targets.remove_if(acore::UnitAuraCheck(true, 26888));
targets.remove_if(acore::UnitAuraCheck(true, 32612));
}
void Register()
@@ -1101,8 +1101,8 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
void SelectTarget(std::list<WorldObject*>& targets)
{
// dbc has only 1 field for excluding, this will prevent anyone from getting both at the same time
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_VOLATILE_OOZE_PROTECTION));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_GASEOUS_BLOAT_PROTECTION));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_VOLATILE_OOZE_PROTECTION));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_GASEOUS_BLOAT_PROTECTION));
if (targets.empty())
{
@@ -1111,7 +1111,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
return;
}
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
_target = target;
@@ -1264,8 +1264,8 @@ class spell_putricide_unbound_plague : public SpellScriptLoader
}
targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster())));
Trinity::Containers::RandomResizeList(targets, 1);
targets.remove_if(acore::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster())));
acore::Containers::RandomResizeList(targets, 1);
}
void HandleScript(SpellEffIndex /*effIndex*/)
@@ -1635,7 +1635,7 @@ class spell_putricide_eat_ooze : public SpellScriptLoader
if (targets.empty())
return;
targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster()));
targets.sort(acore::ObjectDistanceOrderPred(GetCaster()));
WorldObject* target = targets.front();
targets.clear();
targets.push_back(target);

4
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View File

@@ -502,12 +502,12 @@ class spell_rotface_mutated_infection : public SpellScriptLoader
{
// remove targets with this aura already
// tank is not on this list
targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id));
targets.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id));
targets.remove(GetCaster()->GetVictim());
if (targets.empty())
return;
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
_target = target;

14
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -227,7 +227,7 @@ class IceTombSummonEvent : public BasicEvent
uint64 _sindragosaGUID;
};
struct LastPhaseIceTombTargetSelector : public ACORE::unary_function<Unit*, bool>
struct LastPhaseIceTombTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
LastPhaseIceTombTargetSelector(Creature* source) : _source(source) { }
@@ -914,10 +914,10 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader
uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1);
healList.remove_if(UnchainedMagicTargetSelector(false));
if (healList.size() > maxSize)
Trinity::Containers::RandomResizeList(healList, maxSize);
acore::Containers::RandomResizeList(healList, maxSize);
dpsList.remove_if(UnchainedMagicTargetSelector(true));
if (dpsList.size() > maxSize)
Trinity::Containers::RandomResizeList(dpsList, maxSize);
acore::Containers::RandomResizeList(dpsList, maxSize);
unitList.splice(unitList.begin(), healList);
unitList.splice(unitList.begin(), dpsList);
}
@@ -1214,7 +1214,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id));
unitList.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id));
targetList.clear();
targetList = unitList;
}
@@ -1933,11 +1933,11 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false));
if (targets.empty())
return;
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
@@ -1954,7 +1954,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader
if (unitList.empty())
return;
Trinity::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true);
acore::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true);
}
void Register()

26
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -359,7 +359,7 @@ void SendPacketToPlayers(WorldPacket const* data, Unit* source)
}
struct NonTankLKTargetSelector : public ACORE::unary_function<Unit*, bool>
struct NonTankLKTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
NonTankLKTargetSelector(Creature* source, bool playerOnly = true, bool reqLOS = false, float maxDist = 0.0f, uint32 exclude1 = 0, uint32 exclude2 = 0) : _source(source), _playerOnly(playerOnly), _reqLOS(reqLOS), _maxDist(maxDist), _exclude1(exclude1), _exclude2(exclude2) { }
@@ -394,7 +394,7 @@ private:
};
struct DefileTargetSelector : public ACORE::unary_function<Unit*, bool>
struct DefileTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
DefileTargetSelector(Creature* source) : _source(source) { }
@@ -551,7 +551,7 @@ private:
Creature& _owner;
};
class NecroticPlagueTargetCheck : public ACORE::unary_function<Unit*, bool>
class NecroticPlagueTargetCheck : public acore::unary_function<Unit*, bool>
{
public:
NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1, uint32 notAura2) : _sourceObj(obj), _notAura1(notAura1), _notAura2(notAura2) {}
@@ -664,7 +664,7 @@ class boss_the_lich_king : public CreatureScript
// Reset The Frozen Throne gameobjects
FrozenThroneResetWorker reset;
Trinity::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
me->VisitNearbyGridObject(333.0f, worker);
me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
@@ -1950,7 +1950,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster()));
targets.sort(acore::ObjectDistanceOrderPred(GetCaster()));
if (targets.size() <= 1)
return;
@@ -2418,9 +2418,9 @@ class spell_the_lich_king_defile : public SpellScriptLoader
void CorrectRange(std::list<WorldObject*>& targets)
{
targets.remove_if(VehicleCheck());
targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true));
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 10.0f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X), true));
uint32 strangulatedAura[4] = {68980, 74325, 74296, 74297};
targets.remove_if(Trinity::UnitAuraCheck(true, strangulatedAura[GetCaster()->GetMap()->GetDifficulty()]));
targets.remove_if(acore::UnitAuraCheck(true, strangulatedAura[GetCaster()->GetMap()->GetDifficulty()]));
}
void ChangeDamageAndGrow()
@@ -2562,7 +2562,7 @@ class npc_valkyr_shadowguard : public CreatureScript
if (!triggers.empty())
{
valid = true;
triggers.sort(Trinity::ObjectDistanceOrderPred(me));
triggers.sort(acore::ObjectDistanceOrderPred(me));
target->GetMotionMaster()->Clear();
target->UpdatePosition(*me, true);
@@ -2785,9 +2785,9 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader
targets.clear();
return;
}
targets.remove_if(Trinity::UnitAuraCheck(true, GetSpellInfo()->Id));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BOSS_HITTIN_YA_AURA)); // done in dbc, but just to be sure xd
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_HARVEST_SOUL_VALKYR));
targets.remove_if(acore::UnitAuraCheck(true, GetSpellInfo()->Id));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_BOSS_HITTIN_YA_AURA)); // done in dbc, but just to be sure xd
targets.remove_if(acore::UnitAuraCheck(true, SPELL_HARVEST_SOUL_VALKYR));
if (InstanceScript* _instance = caster->GetInstanceScript())
if (Creature* lichKing = ObjectAccessor::GetCreature(*caster, _instance->GetData64(DATA_THE_LICH_KING)))
if (Spell* s = lichKing->GetCurrentSpell(CURRENT_GENERIC_SPELL))
@@ -2797,7 +2797,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader
if (targets.empty())
return;
_target = Trinity::Containers::SelectRandomContainerElement(targets);
_target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(_target);
if (Creature* caster = GetCaster()->ToCreature())
@@ -2976,7 +2976,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa
if (targets.empty())
return;
_target = Trinity::Containers::SelectRandomContainerElement(targets);
_target = acore::Containers::SelectRandomContainerElement(targets);
}
void HandleScript(SpellEffIndex effIndex)

16
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
View File

@@ -144,7 +144,7 @@ class RisenArchmageCheck
}
};
struct ManaVoidSelector : public ACORE::unary_function<Unit*, bool>
struct ManaVoidSelector : public acore::unary_function<Unit*, bool>
{
explicit ManaVoidSelector(WorldObject const* source) : _source(source) { }
@@ -205,7 +205,7 @@ class ValithriaDespawner : public BasicEvent
bool Execute(uint64 /*currTime*/, uint32 /*diff*/)
{
Trinity::CreatureWorker<ValithriaDespawner> worker(_creature, *this);
acore::CreatureWorker<ValithriaDespawner> worker(_creature, *this);
_creature->VisitNearbyGridObject(333.0f, worker);
_creature->AI()->Reset();
_creature->setActive(false);
@@ -525,7 +525,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript
std::list<Creature*> archmages;
RisenArchmageCheck check;
Trinity::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check);
acore::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check);
me->VisitNearbyGridObject(100.0f, searcher);
for (std::list<Creature*>::iterator itr = archmages.begin(); itr != archmages.end(); ++itr)
(*itr)->AI()->DoAction(ACTION_ENTER_COMBAT);
@@ -1305,9 +1305,9 @@ class spell_dreamwalker_summoner : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::AllWorldObjectsInExactRange(GetCaster(), 250.0f, true));
targets.remove_if(acore::AllWorldObjectsInExactRange(GetCaster(), 250.0f, true));
std::list<WorldObject*> list_copy = targets;
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED));
if (targets.empty())
{
if (list_copy.empty())
@@ -1315,7 +1315,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader
targets = list_copy;
}
WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
targets.push_back(target);
}
@@ -1361,14 +1361,14 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader
std::list<Creature*> summoners;
caster->GetCreaturesWithEntryInRange(summoners, 200.0f, NPC_WORLD_TRIGGER);
std::list<Creature*> list_copy = summoners;
summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED));
summoners.remove_if(acore::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED));
if (summoners.empty())
{
if (list_copy.empty())
return;
summoners = list_copy;
}
Trinity::Containers::RandomResizeList(summoners, 2);
acore::Containers::RandomResizeList(summoners, 2);
for (uint32 i = 0; i < 3; ++i)
caster->CastSpell(summoners.front(), SPELL_SUMMON_SUPPRESSER, true);

26
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -831,7 +831,7 @@ class npc_crok_scourgebane : public CreatureScript
// get all nearby vrykul
std::list<Creature*> temp;
FrostwingVrykulSearcher check(me, 150.0f);
Trinity::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check);
acore::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check);
me->VisitNearbyGridObject(150.0f, searcher);
_aliveTrash.clear();
@@ -875,15 +875,15 @@ class npc_crok_scourgebane : public CreatureScript
_wipeCheckTimer = 3000;
Player* player = NULL;
Trinity::AnyPlayerInObjectRangeCheck check(me, 140.0f);
Trinity::PlayerSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, player, check);
acore::AnyPlayerInObjectRangeCheck check(me, 140.0f);
acore::PlayerSearcher<acore::AnyPlayerInObjectRangeCheck> searcher(me, player, check);
me->VisitNearbyWorldObject(140.0f, searcher);
// wipe
if (!player || me->GetExactDist(4357.0f, 2606.0f, 350.0f) > 125.0f)
{
//Talk(SAY_CROK_DEATH);
FrostwingGauntletRespawner respawner;
Trinity::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner);
acore::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner);
me->VisitNearbyGridObject(333.0f, worker);
return;
}
@@ -1330,7 +1330,7 @@ class npc_captain_arnath : public CreatureScript
{
std::list<Creature*> targets = DoFindFriendlyMissingBuff(40.0f, SPELL_POWER_WORD_SHIELD);
if (!targets.empty())
DoCast(Trinity::Containers::SelectRandomContainerElement(targets), SPELL_POWER_WORD_SHIELD);
DoCast(acore::Containers::SelectRandomContainerElement(targets), SPELL_POWER_WORD_SHIELD);
Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, urand(15000, 20000));
break;
}
@@ -1354,8 +1354,8 @@ class npc_captain_arnath : public CreatureScript
Creature* FindFriendlyCreature() const
{
Creature* target = NULL;
Trinity::MostHPMissingInRange u_check(me, 60.0f, 0);
Trinity::CreatureLastSearcher<Trinity::MostHPMissingInRange> searcher(me, target, u_check);
acore::MostHPMissingInRange u_check(me, 60.0f, 0);
acore::CreatureLastSearcher<acore::MostHPMissingInRange> searcher(me, target, u_check);
me->VisitNearbyGridObject(60.0f, searcher);
return target;
}
@@ -1957,7 +1957,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader
std::list<Creature*> wards;
GetCaster()->GetCreatureListWithEntryInGrid(wards, NPC_DEATHBOUND_WARD, range);
wards.sort(Trinity::ObjectDistanceOrderPred(GetCaster()));
wards.sort(acore::ObjectDistanceOrderPred(GetCaster()));
for (std::list<Creature*>::iterator itr = wards.begin(); itr != wards.end(); ++itr)
{
if ((*itr)->IsAlive() && (*itr)->HasAura(SPELL_STONEFORM))
@@ -2056,8 +2056,8 @@ class spell_frost_giant_death_plague : public SpellScriptLoader
// First effect
void CountTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetGUID(), true));
targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(acore::ObjectGUIDCheck(GetCaster()->GetGUID(), true));
bool kill = true;
for (std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
@@ -2150,7 +2150,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader
void RemoveAliveTarget(std::list<WorldObject*>& targets)
{
targets.remove_if(AliveCheck());
Trinity::Containers::RandomResizeList(targets, 2);
acore::Containers::RandomResizeList(targets, 2);
}
void Land(SpellEffIndex /*effIndex*/)
@@ -2265,7 +2265,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript
instance->SetData(DATA_COLDFLAME_JETS, IN_PROGRESS);
std::list<Creature*> traps;
GetCreatureListWithEntryInGrid(traps, player, NPC_FROST_FREEZE_TRAP, 120.0f);
traps.sort(Trinity::ObjectDistanceOrderPred(player));
traps.sort(acore::ObjectDistanceOrderPred(player));
bool instant = false;
for (std::list<Creature*>::iterator itr = traps.begin(); itr != traps.end(); ++itr)
{
@@ -2323,7 +2323,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript
if (!crok->IsAlive())
{
FrostwingGauntletRespawner respawner;
Trinity::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner);
acore::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner);
crok->VisitNearbyGridObject(333.0f, worker);
return true;
}

4
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -1545,7 +1545,7 @@ class instance_icecrown_citadel : public InstanceMapScript
if (stalkers.empty())
return;
stalkers.sort(Trinity::ObjectDistanceOrderPred(teleporter));
stalkers.sort(acore::ObjectDistanceOrderPred(teleporter));
stalkers.front()->CastSpell((Unit*)NULL, SPELL_ARTHAS_TELEPORTER_CEREMONY, false);
stalkers.pop_front();
for (std::list<Creature*>::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr)
@@ -1776,7 +1776,7 @@ class instance_icecrown_citadel : public InstanceMapScript
GetCreatureListWithEntryInGrid(triggers, terenas, NPC_WORLD_TRIGGER_INFINITE_AOI, 100.0f);
if (!triggers.empty())
{
triggers.sort(Trinity::ObjectDistanceOrderPred(terenas, false));
triggers.sort(acore::ObjectDistanceOrderPred(terenas, false));
Unit* visual = triggers.front();
visual->CastSpell(visual, SPELL_FROSTMOURNE_TELEPORT_VISUAL, true);
}

4
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
View File

@@ -166,7 +166,7 @@ const Position PosPlatform = {2640.5f, -3360.6f, 285.26f, 0.0f};
#define IN_LIVE_SIDE(who) (who->GetPositionY() < POS_Y_GATE)
// Predicate function to check that the r efzr unit is NOT on the same side as the source.
struct NotOnSameSide : public ACORE::unary_function<Unit *, bool>
struct NotOnSameSide : public acore::unary_function<Unit *, bool>
{
bool m_inLiveSide;
explicit NotOnSameSide(Unit *pSource) : m_inLiveSide(IN_LIVE_SIDE(pSource)) {}
@@ -673,7 +673,7 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK));
targets.remove_if(acore::UnitAuraCheck(false, SPELL_SHADOW_MARK));
}
void Register() override

4
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
View File

@@ -892,8 +892,8 @@ public:
else if (me->GetEntry() == NPC_LIVING_POISON)
{
Unit* target = nullptr;
Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 0.5f);
Trinity::UnitLastSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, target, u_check);
acore::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 0.5f);
acore::UnitLastSearcher<acore::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, target, u_check);
me->VisitNearbyObject(1.5f, searcher);
if (target)
me->CastSpell(me, SPELL_FROGGER_EXPLODE, true);

2
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
View File

@@ -271,7 +271,7 @@ class spell_boss_magus_telestra_gravity_well : public SpellScriptLoader
void SelectTarget(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::RandomCheck(50));
targets.remove_if(acore::RandomCheck(50));
}
void HandlePull(SpellEffIndex effIndex)

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View File

@@ -1983,7 +1983,7 @@ class spell_pursue : public SpellScriptLoader
else
{
//! In the end, only one target should be selected
WorldObject* _target = Trinity::Containers::SelectRandomContainerElement(targets);
WorldObject* _target = acore::Containers::SelectRandomContainerElement(targets);
targets.clear();
if (_target)
targets.push_back(_target);
@@ -2033,8 +2033,8 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader
{
// use 99 because it is 3d search
std::list<WorldObject*> targetList;
Trinity::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, nullptr);
Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check);
acore::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, nullptr);
acore::WorldObjectListSearcher<acore::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check);
GetCaster()->GetMap()->VisitAll(GetCaster()->m_positionX, GetCaster()->m_positionY, 99, searcher);
float minDist = 99 * 99;
Unit* target = nullptr;

12
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
View File

@@ -398,9 +398,9 @@ public:
Map::PlayerList const& pl = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
targets.push_back(itr->GetSource());
targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER));
Trinity::Containers::RandomResizeList(targets, 2);
targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER));
acore::Containers::RandomResizeList(targets, 2);
for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
{
float prevZ = (*itr)->GetPositionZ();
@@ -1232,9 +1232,9 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER));
Trinity::Containers::RandomResizeList(targets, 1);
targets.remove_if(acore::ObjectTypeIdCheck(TYPEID_PLAYER, false));
targets.remove_if(acore::UnitAuraCheck(true, SPELL_FLASH_FREEZE_TRAPPED_PLAYER));
acore::Containers::RandomResizeList(targets, 1);
}
void Register()

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
View File

@@ -639,7 +639,7 @@ public:
// predicate function to select non main tank target
class StoneGripTargetSelector : public ACORE::unary_function<Unit*, bool>
class StoneGripTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {}

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View File

@@ -952,7 +952,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader
void SelectTarget(std::list<WorldObject*>& targets)
{
if (Unit* victim = GetCaster()->GetVictim())
targets.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true));
targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true));
}
void Register()
@@ -1034,7 +1034,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader
void SelectTarget(std::list<WorldObject*>& targets)
{
if (Unit* victim = GetCaster()->GetVictim())
targets.remove_if(Trinity::ObjectGUIDCheck(victim->GetGUID(), true));
targets.remove_if(acore::ObjectGUIDCheck(victim->GetGUID(), true));
}
void Register()

2
src/server/scripts/Northrend/zone_dalaran.cpp
View File

@@ -546,7 +546,7 @@ class npc_minigob_manabonk : public CreatureScript
if (PlayerInDalaranList.empty())
return NULL;
return Trinity::Containers::SelectRandomContainerElement(PlayerInDalaranList);
return acore::Containers::SelectRandomContainerElement(PlayerInDalaranList);
}
void SendMailToPlayer(Player* player)

6
src/server/scripts/Northrend/zone_dragonblight.cpp
View File

@@ -765,7 +765,7 @@ public:
if (GameObject* go = me->FindNearestGameObject(GO_SAC_LIGHTS_VENGEANCE_2, 150.0f))
go->Delete();
WretchedGhoulCleaner cleaner;
Trinity::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
me->VisitNearbyGridObject(150.0f, worker);
}
@@ -978,7 +978,7 @@ public:
case 17: // kill vegard
{
WretchedGhoulCleaner cleaner;
Trinity::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
me->VisitNearbyGridObject(150.0f, worker);
if (Creature* c = me->FindNearestCreature(NPC_SAC_LIGHTS_VENGEANCE, 150.0f, true))
@@ -1185,7 +1185,7 @@ class spell_q24545_aod_special : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(GhoulTargetCheck(GetSpellInfo()->Id == 70790));
Trinity::Containers::RandomResizeList(targets, 2);
acore::Containers::RandomResizeList(targets, 2);
}
void HandleScript(SpellEffIndex effIndex)

4
src/server/scripts/Northrend/zone_sholazar_basin.cpp
View File

@@ -1454,10 +1454,10 @@ public:
switch (GetSpellInfo()->Id)
{
case SPELL_CORRECT_TRACKS:
player->MonsterSay(sObjectMgr->GetTrinityStringForDBCLocale(SAY_CORRECT_TRACKS), LANG_UNIVERSAL, player);
player->MonsterSay(sObjectMgr->GetAcoreStringForDBCLocale(SAY_CORRECT_TRACKS), LANG_UNIVERSAL, player);
break;
case SPELL_INCORRECT_TRACKS:
player->MonsterSay(sObjectMgr->GetTrinityStringForDBCLocale(SAY_INCORRECT_TRACKS), LANG_UNIVERSAL, player);
player->MonsterSay(sObjectMgr->GetAcoreStringForDBCLocale(SAY_INCORRECT_TRACKS), LANG_UNIVERSAL, player);
break;
default:
break;

2
src/server/scripts/Northrend/zone_wintergrasp.cpp
View File

@@ -212,7 +212,7 @@ class npc_wg_spirit_guide : public CreatureScript
GraveyardVect graveyard = wintergrasp->GetGraveyardVector();
for (uint8 i = 0; i < graveyard.size(); i++)
if (graveyard[i]->GetControlTeamId() == player->GetTeamId())
AddGossipItemFor(player, GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(((BfGraveyardWG*)graveyard[i])->GetTextId()), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + i);
AddGossipItemFor(player, GOSSIP_ICON_CHAT, sObjectMgr->GetAcoreStringForDBCLocale(((BfGraveyardWG*)graveyard[i])->GetTextId()), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + i);
SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());
return true;