diff options
Diffstat (limited to 'src/server/scripts')
19 files changed, 29 insertions, 29 deletions
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index aad8bd97964..cc6f2a3c88c 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -132,7 +132,7 @@ class spell_argaloth_consuming_darkness : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); + Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); } void Register() override diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 90cb19fb736..dd64f3dcf9e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -190,7 +190,7 @@ public: for (uint8 i = 0; i < 6; ++i) AddList.push_back(Adds[i]); - Trinity::Containers::RandomResizeList(AddList, 4); + Trinity::Containers::RandomResize(AddList, 4); uint8 i = 0; for (std::list<uint32>::const_iterator itr = AddList.begin(); itr != AddList.end() && i < 4; ++itr, ++i) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index f3597815cf7..535095ec64f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -194,7 +194,7 @@ class boss_mandokir : public CreatureScript GetCreatureListWithEntryInGrid(creatures, me, NPC_CHAINED_SPIRIT, 200.0f); creatures.remove_if(Trinity::AnyDeadUnitCheck()); creatures.remove_if(Trinity::UnitAuraCheck(true, SPELL_OHGAN_ORDERS_TRIGGER)); - Trinity::Containers::RandomResizeList(creatures, 1); + Trinity::Containers::RandomResize(creatures, 1); if (creatures.empty()) return; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 9c5bc308a27..587c210bf50 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -141,7 +141,7 @@ public: GetCreatureListWithEntryInGrid(stalkers, me, NPC_BEETLE_STALKER, 100.0f); std::list<Creature*> beetlers = stalkers; - Trinity::Containers::RandomResizeList(beetlers, 9); // Holds the summoners of Jeweled Scarab + Trinity::Containers::RandomResize(beetlers, 9); // Holds the summoners of Jeweled Scarab for (std::list<Creature*>::iterator itr = beetlers.begin(); itr != beetlers.end(); ++itr) { @@ -151,7 +151,7 @@ public: (*itr)->m_Events.AddEvent(new SummonScarab((*itr), instance), (*itr)->m_Events.CalculateTime(5000)); } - Trinity::Containers::RandomResizeList(stalkers, 2); // Holds the summoners of Dustbone Horror + Trinity::Containers::RandomResize(stalkers, 2); // Holds the summoners of Dustbone Horror for (std::list<Creature*>::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr) (*itr)->CastSpell((*itr), SPELL_SUMMON_DUSTBONE_HORROR); @@ -263,7 +263,7 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader void FilterTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); + Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); } void Register() override diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 164d0c49d86..9f214eb5e12 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -154,7 +154,7 @@ class boss_moam : public CreatureScript targetList.push_back((*itr)->getTarget()); } - Trinity::Containers::RandomResizeList(targetList, 5); + Trinity::Containers::RandomResize(targetList, 5); for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr) DoCast(*itr, SPELL_DRAIN_MANA); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 550daaa627c..81bbcec913e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1831,7 +1831,7 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader void SelectMeteorFlames(std::list<WorldObject*>& unitList) { if (!unitList.empty()) - Trinity::Containers::RandomResizeList(unitList, 10); + Trinity::Containers::RandomResize(unitList, 10); } void HandleScript(SpellEffIndex /* effIndex */) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index aef566023ed..e1e3f085a4a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -232,7 +232,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader targets.remove_if(ConflagrationTargetSelector()); uint8 maxSize = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 3); if (targets.size() > maxSize) - Trinity::Containers::RandomResizeList(targets, maxSize); + Trinity::Containers::RandomResize(targets, maxSize); } void HandleDummy(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index a9fe5c4a325..a2115d9c265 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -554,9 +554,9 @@ class instance_halls_of_reflection : public InstanceMapScript ObjectGuid bossGuid = i <= 3 ? FalricGUID : MarwynGUID; if (!i) - Trinity::Containers::RandomResizeList(tempList, 3); + Trinity::Containers::RandomResize(tempList, 3); else if (i < 6 && i != 3) - Trinity::Containers::RandomResizeList(tempList, 4); + Trinity::Containers::RandomResize(tempList, 4); for (uint32 entry : tempList) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 67ff8b2def6..3c7eb8dfc86 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -408,7 +408,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list<Player*> targets; SelectRandomTarget(false, &targets); - Trinity::Containers::RandomResizeList(targets, Is25ManRaid() ? 3 : 2); + Trinity::Containers::RandomResize(targets, Is25ManRaid() ? 3 : 2); if (targets.size() > 1) { Talk(SAY_PACT_OF_THE_DARKFALLEN); @@ -431,7 +431,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list<Player*> targets; SelectRandomTarget(false, &targets); - Trinity::Containers::RandomResizeList(targets, uint32(Is25ManRaid() ? 4 : 2)); + Trinity::Containers::RandomResize(targets, uint32(Is25ManRaid() ? 4 : 2)); for (std::list<Player*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) DoCast(*itr, SPELL_TWILIGHT_BLOODBOLT); DoCast(me, SPELL_TWILIGHT_BLOODBOLT_TARGET); @@ -683,7 +683,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); + Trinity::Containers::RandomResize(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); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index ade231be232..b7f52c47791 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -221,7 +221,7 @@ class boss_festergut : public CreatureScript if (!ranged.empty()) { - Trinity::Containers::RandomResizeList(ranged, RAID_MODE<uint32>(1, 3, 1, 3)); + Trinity::Containers::RandomResize(ranged, RAID_MODE<uint32>(1, 3, 1, 3)); for (std::list<Unit*>::iterator itr = ranged.begin(); itr != ranged.end(); ++itr) DoCast(*itr, SPELL_VILE_GAS); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 313997f1b58..991a09ce75e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1142,7 +1142,7 @@ class spell_putricide_unbound_plague : public SpellScriptLoader targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_UNBOUND_PLAGUE)); - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 90fe740125e..a8be1a887b6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -849,7 +849,7 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader } if (!ranged.empty()) - Trinity::Containers::RandomResizeList(ranged, GetCaster()->GetMap()->Is25ManRaid() ? 3 : 1); + Trinity::Containers::RandomResize(ranged, GetCaster()->GetMap()->Is25ManRaid() ? 3 : 1); targets.swap(ranged); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 6dca64500d3..82182418752 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1153,7 +1153,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader unitList.remove_if(UnchainedMagicTargetSelector()); uint32 maxSize = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 6 : 2); if (unitList.size() > maxSize) - Trinity::Containers::RandomResizeList(unitList, maxSize); + Trinity::Containers::RandomResize(unitList, maxSize); } void Register() override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index e004f1f5977..f23adcb51e9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1264,7 +1264,7 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader std::list<Creature*> summoners; GetCreatureListWithEntryInGrid(summoners, caster, NPC_WORLD_TRIGGER, 100.0f); summoners.remove_if(Trinity::UnitAuraCheck(true, SPELL_RECENTLY_SPAWNED)); - Trinity::Containers::RandomResizeList(summoners, 2); + Trinity::Containers::RandomResize(summoners, 2); if (summoners.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index f328859ab37..4330a899608 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -2005,7 +2005,7 @@ class spell_svalna_revive_champion : public SpellScriptLoader void RemoveAliveTarget(std::list<WorldObject*>& targets) { targets.remove_if(AliveCheck()); - Trinity::Containers::RandomResizeList(targets, 2); + Trinity::Containers::RandomResize(targets, 2); } void Land(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index b32cb206d16..8474e29d8a2 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1750,10 +1750,10 @@ class spell_malygos_arcane_storm : public SpellScriptLoader { // Resize list only to objects that are vehicles. IsCreatureVehicleCheck check(true); - Trinity::Containers::RandomResizeList(targets, check, (malygos->GetMap()->GetDifficultyID() == DIFFICULTY_10_N ? 4 : 10)); + Trinity::Containers::RandomResize(targets, check, (malygos->GetMap()->GetDifficultyID() == DIFFICULTY_10_N ? 4 : 10)); } else - Trinity::Containers::RandomResizeList(targets, (malygos->GetMap()->GetDifficultyID() == DIFFICULTY_10_N ? 4 : 10)); + Trinity::Containers::RandomResize(targets, (malygos->GetMap()->GetDifficultyID() == DIFFICULTY_10_N ? 4 : 10)); } void HandleVisual(SpellEffIndex /*effIndex*/) @@ -2031,7 +2031,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader if (!targets.empty()) { if (targets.size() > 1) - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); if (WorldObject* filteredTarget = targets.front()) if (malygos) @@ -2285,7 +2285,7 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade std::list<WorldObject*> selectedTargets = targets; uint8 guidDataSlot = DATA_FIRST_SURGE_TARGET_GUID; // SetGuid in Malygos AI is reserved for 14th, 15th and 16th Id for the three targets - Trinity::Containers::RandomResizeList(selectedTargets, 3); + Trinity::Containers::RandomResize(selectedTargets, 3); for (std::list<WorldObject*>::const_iterator itr = selectedTargets.begin(); itr != selectedTargets.end(); ++itr) { Creature* target = (*itr)->ToCreature(); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 37bafe3da48..484f5e24082 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -710,7 +710,7 @@ public: void FilterTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, 2); + Trinity::Containers::RandomResize(targets, 2); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index a19a4e09b17..85a6335b485 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -3176,7 +3176,7 @@ class spell_item_taunt_flag_targeting : public SpellScriptLoader return; } - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index a56b64766c1..ac383e3dedc 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -135,7 +135,7 @@ public: void ResizeTargets(std::list<WorldObject*>& targets) { - Trinity::Containers::RandomResizeList(targets, 3); + Trinity::Containers::RandomResize(targets, 3); } void Register() override @@ -494,7 +494,7 @@ class spell_sha_healing_stream_totem_heal : public SpellScriptLoader return !target->ToUnit() || target->ToUnit()->IsFullHealth(); }); - Trinity::Containers::RandomResizeList(targets, 1); + Trinity::Containers::RandomResize(targets, 1); if (targets.empty()) targets.push_back(GetOriginalCaster()); @@ -869,7 +869,7 @@ public: void FilterTargets(std::list<WorldObject*>& targets) { targets.remove(GetExplTargetUnit()); - Trinity::Containers::RandomResizeList(targets, [this](WorldObject* target) + Trinity::Containers::RandomResize(targets, [this](WorldObject* target) { return target->GetTypeId() == TYPEID_UNIT && !target->ToUnit()->HasAura(SPELL_SHAMAN_FLAME_SHOCK_MAELSTROM, GetCaster()->GetGUID()); }, 1); |