From 07099840dbb5fc25bd9cd3553293329c5b522786 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 14 Jan 2020 23:53:08 +0100 Subject: [PATCH] Scripts: Fix rbac permission for skipping default boss sequencing check # Conflicts: # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp # src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp # src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp # src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp # src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp # src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp # src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp # src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp # src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp # src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp # src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp # src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp # src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp # src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp # src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp # src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp # src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp # src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp # src/server/scripts/Northrend/Gundrak/boss_eck.cpp # src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp # src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp # src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp # src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp # src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp # src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp # src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp # src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp # src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp # src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp # src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp # src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp # src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp # src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp # src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp # src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp # src/server/scripts/Outland/BlackTemple/boss_illidan.cpp # src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp # src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp # src/server/scripts/Outland/BlackTemple/boss_supremus.cpp # src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp # src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp # src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp # src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp # src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp # src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp # src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp # src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp # src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp # src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp # src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp --- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 4 ++-- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 4 ++-- .../EasternKingdoms/BaradinHold/boss_alizabal.cpp | 4 ++-- .../EasternKingdoms/BaradinHold/boss_occuthar.cpp | 4 ++-- .../BaradinHold/boss_pit_lord_argaloth.cpp | 4 ++-- .../BastionOfTwilight/boss_chogall.cpp | 4 ++-- .../BastionOfTwilight/boss_halfus_wyrmbreaker.cpp | 4 ++-- .../boss_theralion_and_valiona.cpp | 4 ++-- .../boss_ascendant_lord_obsidius.cpp | 4 ++-- .../BlackrockCaverns/boss_beauty.cpp | 4 ++-- .../boss_corla_herald_of_twilight.cpp | 4 ++-- .../BlackrockCaverns/boss_karsh_steelbender.cpp | 4 ++-- .../BlackrockCaverns/boss_romogg_bonecrusher.cpp | 4 ++-- .../BlackrockSpire/boss_drakkisath.cpp | 4 ++-- .../BlackrockSpire/boss_gizrul_the_slavener.cpp | 4 ++-- .../BlackrockMountain/BlackrockSpire/boss_gyth.cpp | 4 ++-- .../BlackrockSpire/boss_halycon.cpp | 4 ++-- .../BlackrockSpire/boss_highlord_omokk.cpp | 4 ++-- .../BlackrockSpire/boss_lord_valthalak.cpp | 4 ++-- .../BlackrockSpire/boss_mother_smolderweb.cpp | 4 ++-- .../BlackrockSpire/boss_overlord_wyrmthalak.cpp | 4 ++-- .../BlackrockSpire/boss_quartermaster_zigris.cpp | 4 ++-- .../BlackrockSpire/boss_rend_blackhand.cpp | 4 ++-- .../boss_shadow_hunter_voshgajin.cpp | 4 ++-- .../BlackrockSpire/boss_the_beast.cpp | 4 ++-- .../BlackrockSpire/boss_urok_doomhowl.cpp | 4 ++-- .../BlackrockSpire/boss_warmaster_voone.cpp | 4 ++-- .../BlackwingDescent/boss_atramedes.cpp | 4 ++-- .../BlackwingDescent/boss_chimaeron.cpp | 4 ++-- .../BlackwingDescent/boss_magmaw.cpp | 4 ++-- .../BlackwingDescent/boss_maloriak.cpp | 4 ++-- .../BlackwingDescent/boss_nefarians_end.cpp | 5 ++--- .../BlackwingLair/boss_broodlord_lashlayer.cpp | 4 ++-- .../BlackwingLair/boss_chromaggus.cpp | 4 ++-- .../BlackwingLair/boss_ebonroc.cpp | 4 ++-- .../BlackwingLair/boss_firemaw.cpp | 4 ++-- .../BlackwingLair/boss_flamegor.cpp | 4 ++-- .../BlackwingLair/boss_nefarian.cpp | 2 +- .../BlackwingLair/boss_vaelastrasz.cpp | 4 ++-- .../Deadmines/boss_admiral_ripsnarl.cpp | 4 ++-- .../Deadmines/boss_captain_cookie.cpp | 4 ++-- .../Deadmines/boss_foe_reaper_5000.cpp | 4 ++-- .../EasternKingdoms/Deadmines/boss_glubtok.cpp | 4 ++-- .../Deadmines/boss_helix_gearbreaker.cpp | 4 ++-- .../Deadmines/boss_vanessa_van_cleef.cpp | 4 ++-- .../GrimBatol/boss_drahga_shadowburner.cpp | 4 ++-- .../EasternKingdoms/GrimBatol/boss_erudax.cpp | 4 ++-- .../GrimBatol/boss_forgemaster_throngus.cpp | 4 ++-- .../GrimBatol/boss_general_umbriss.cpp | 4 ++-- .../EasternKingdoms/Karazhan/boss_curator.cpp | 4 ++-- .../Karazhan/boss_maiden_of_virtue.cpp | 4 ++-- .../EasternKingdoms/Karazhan/boss_nightbane.cpp | 4 ++-- .../Karazhan/boss_terestian_illhoof.cpp | 4 ++-- .../MagistersTerrace/boss_felblood_kaelthas.cpp | 4 ++-- .../MagistersTerrace/boss_selin_fireheart.cpp | 4 ++-- .../MagistersTerrace/boss_vexallus.cpp | 4 ++-- .../ScarletMonastery/boss_arcanist_doan.cpp | 4 ++-- .../ScarletMonastery/boss_azshir_the_sleepless.cpp | 4 ++-- .../ScarletMonastery/boss_bloodmage_thalnos.cpp | 4 ++-- .../ScarletMonastery/boss_herod.cpp | 4 ++-- .../ScarletMonastery/boss_houndmaster_loksey.cpp | 4 ++-- .../ScarletMonastery/boss_interrogator_vishas.cpp | 4 ++-- .../ScarletMonastery/boss_scorn.cpp | 4 ++-- .../Scholomance/boss_darkmaster_gandling.cpp | 4 ++-- .../Scholomance/boss_doctor_theolen_krastinov.cpp | 4 ++-- .../Scholomance/boss_illucia_barov.cpp | 4 ++-- .../Scholomance/boss_instructor_malicia.cpp | 4 ++-- .../Scholomance/boss_kirtonos_the_herald.cpp | 4 ++-- .../Scholomance/boss_lord_alexei_barov.cpp | 4 ++-- .../Scholomance/boss_lorekeeper_polkelt.cpp | 4 ++-- .../Scholomance/boss_the_ravenian.cpp | 4 ++-- .../ShadowfangKeep/boss_baron_ashbury.cpp | 4 ++-- .../ShadowfangKeep/boss_baron_silverlaine.cpp | 4 ++-- .../ShadowfangKeep/boss_commander_springvale.cpp | 4 ++-- .../ShadowfangKeep/boss_lord_godfrey.cpp | 4 ++-- .../ShadowfangKeep/boss_lord_walden.cpp | 4 ++-- .../SunwellPlateau/boss_kalecgos.cpp | 8 ++++---- .../EasternKingdoms/SunwellPlateau/boss_muru.cpp | 4 ++-- .../EasternKingdoms/TheStockade/boss_hogger.cpp | 4 ++-- .../TheStockade/boss_lord_overheat.cpp | 4 ++-- .../TheStockade/boss_randolph_moloch.cpp | 4 ++-- .../ThroneOfTheTides/boss_commander_ulthok.cpp | 4 ++-- .../ThroneOfTheTides/boss_lady_nazjar.cpp | 4 ++-- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 4 ++-- .../EasternKingdoms/ZulAman/boss_daakara.cpp | 4 ++-- .../EasternKingdoms/ZulAman/boss_halazzi.cpp | 4 ++-- .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 4 ++-- .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 4 ++-- .../ZulGurub/boss_bloodlord_mandokir.cpp | 4 ++-- .../ZulGurub/boss_high_priest_venoxis.cpp | 4 ++-- .../ZulGurub/boss_high_priestess_kilnara.cpp | 4 ++-- .../ZulGurub/boss_jindo_the_godbreaker.cpp | 4 ++-- .../EasternKingdoms/ZulGurub/boss_zanzil.cpp | 4 ++-- .../Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp | 4 ++-- .../Kalimdor/BlackfathomDeeps/boss_gelihast.cpp | 4 ++-- .../Kalimdor/BlackfathomDeeps/boss_kelris.cpp | 4 ++-- .../BattleForMountHyjal/boss_archimonde.cpp | 4 ++-- .../CullingOfStratholme/boss_chrono_lord_epoch.cpp | 4 ++-- .../boss_infinite_corruptor.cpp | 4 ++-- .../CullingOfStratholme/boss_meathook.cpp | 4 ++-- .../boss_salramm_the_fleshcrafter.cpp | 4 ++-- .../DragonSoul/boss_madness_of_deathwing.cpp | 4 ++-- .../scripts/Kalimdor/Firelands/boss_baleroc.cpp | 4 ++-- .../Kalimdor/HallsOfOrigination/boss_ammunae.cpp | 4 ++-- .../Kalimdor/HallsOfOrigination/boss_anraphet.cpp | 4 ++-- .../HallsOfOrigination/boss_earthrager_ptah.cpp | 4 ++-- .../Kalimdor/HallsOfOrigination/boss_isiset.cpp | 4 ++-- .../Kalimdor/HallsOfOrigination/boss_rajh.cpp | 4 ++-- .../Kalimdor/HallsOfOrigination/boss_setesh.cpp | 4 ++-- .../boss_temple_guardian_anhuur.cpp | 4 ++-- .../LostCityOfTheTolvir/boss_general_husam.cpp | 4 ++-- .../boss_high_prophet_barim.cpp | 4 ++-- .../LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp | 8 ++++---- .../Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp | 4 ++-- .../scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp | 4 ++-- .../boss_amnennar_the_coldbringer.cpp | 4 ++-- .../Kalimdor/RazorfenDowns/boss_glutton.cpp | 4 ++-- .../RazorfenDowns/boss_mordresh_fire_eye.cpp | 4 ++-- .../Kalimdor/RazorfenDowns/boss_tuten_kash.cpp | 4 ++-- .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp | 4 ++-- .../Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 11 ----------- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 4 ++-- .../Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp | 4 ++-- .../Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp | 4 ++-- .../ThroneOfTheFourWinds/boss_conclave_of_wind.cpp | 6 +++--- .../Kalimdor/VortexPinnacle/boss_altairus.cpp | 4 ++-- .../scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp | 4 ++-- .../VortexPinnacle/boss_grand_vizier_ertan.cpp | 4 ++-- .../scripts/Kalimdor/WailingCaverns/boss_kresh.cpp | 4 ++-- .../WailingCaverns/boss_lady_anacondra.cpp | 4 ++-- .../Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp | 4 ++-- .../Kalimdor/WailingCaverns/boss_lord_pythas.cpp | 4 ++-- .../WailingCaverns/boss_lord_serpentis.cpp | 4 ++-- .../scripts/Kalimdor/WailingCaverns/boss_skum.cpp | 4 ++-- .../WailingCaverns/boss_verdan_the_everliving.cpp | 4 ++-- .../Stonecore/boss_high_priestess_azil.cpp | 4 ++-- .../scripts/Maelstrom/Stonecore/boss_ozruk.cpp | 4 ++-- .../scripts/Maelstrom/Stonecore/boss_slabhide.cpp | 4 ++-- .../AzjolNerub/Ahnkahet/boss_amanitar.cpp | 4 ++-- .../AzjolNerub/Ahnkahet/boss_elder_nadox.cpp | 4 ++-- .../AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp | 4 ++-- .../ObsidianSanctum/boss_sartharion.cpp | 4 ++-- .../RubySanctum/boss_baltharus_the_warborn.cpp | 4 ++-- .../RubySanctum/boss_general_zarithrian.cpp | 4 ++-- .../ChamberOfAspects/RubySanctum/boss_halion.cpp | 8 ++++---- .../RubySanctum/boss_saviana_ragefire.cpp | 4 ++-- .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 4 ++-- .../TrialOfTheCrusader/boss_faction_champions.cpp | 4 ++-- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 4 ++-- .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 12 ++++++------ .../Northrend/DraktharonKeep/boss_king_dred.cpp | 4 ++-- .../Northrend/DraktharonKeep/boss_novos.cpp | 4 ++-- .../Northrend/DraktharonKeep/boss_tharon_ja.cpp | 4 ++-- .../Northrend/DraktharonKeep/boss_trollgore.cpp | 4 ++-- .../FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 4 ++-- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 4 ++-- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 4 ++-- .../FrozenHalls/PitOfSaron/boss_krickandick.cpp | 4 ++-- .../Northrend/Gundrak/boss_drakkari_colossus.cpp | 4 ++-- src/server/scripts/Northrend/Gundrak/boss_eck.cpp | 4 ++-- .../scripts/Northrend/Gundrak/boss_gal_darah.cpp | 4 ++-- .../scripts/Northrend/Gundrak/boss_moorabi.cpp | 4 ++-- .../scripts/Northrend/Gundrak/boss_slad_ran.cpp | 4 ++-- .../IcecrownCitadel/boss_valithria_dreamwalker.cpp | 7 ++++--- .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 4 ++-- .../Northrend/Naxxramas/boss_anubrekhan.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_faerlina.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_gluth.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_gothik.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_grobbulus.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_heigan.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_loatheb.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_maexxna.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_noth.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_patchwerk.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_razuvious.cpp | 4 ++-- .../scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 4 ++-- .../Northrend/Nexus/Nexus/boss_keristrasza.cpp | 4 ++-- .../Nexus/Nexus/boss_nexus_commanders.cpp | 4 ++-- .../scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp | 4 ++-- .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp | 4 ++-- .../scripts/Northrend/Nexus/Oculus/boss_eregos.cpp | 4 ++-- .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 4 ++-- .../scripts/Northrend/Nexus/Oculus/boss_varos.cpp | 4 ++-- .../Ulduar/HallsOfLightning/boss_loken.cpp | 4 ++-- .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 4 ++-- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 4 ++-- .../Ulduar/HallsOfStone/boss_maiden_of_grief.cpp | 4 ++-- .../Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 2 +- .../Ulduar/Ulduar/boss_algalon_the_observer.cpp | 4 ++-- .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 12 ++++++------ .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 4 ++-- .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp | 14 +++++++------- .../Northrend/Ulduar/Ulduar/boss_general_vezax.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp | 4 ++-- .../Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 4 ++-- .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 4 ++-- .../Northrend/Ulduar/Ulduar/boss_razorscale.cpp | 4 ++-- .../Northrend/Ulduar/Ulduar/boss_thorim.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp | 4 ++-- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 4 ++-- .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 2 +- .../UtgardeKeep/boss_skarvald_dalronn.cpp | 4 ++-- .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 4 ++-- .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 4 ++-- .../UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp | 4 ++-- .../Northrend/VaultOfArchavon/boss_archavon.cpp | 4 ++-- .../Northrend/VaultOfArchavon/boss_emalon.cpp | 2 +- .../Northrend/VaultOfArchavon/boss_koralon.cpp | 4 ++-- .../Northrend/VaultOfArchavon/boss_toravon.cpp | 5 ++--- .../ManaTombs/boss_nexusprince_shaffar.cpp | 4 ++-- .../Auchindoun/ManaTombs/boss_pandemonius.cpp | 4 ++-- .../Outland/Auchindoun/SethekkHalls/boss_anzu.cpp | 4 ++-- .../SethekkHalls/boss_darkweaver_syth.cpp | 4 ++-- .../SethekkHalls/boss_talon_king_ikiss.cpp | 4 ++-- .../boss_blackheart_the_inciter.cpp | 4 ++-- .../ShadowLabyrinth/boss_grandmaster_vorpil.cpp | 4 ++-- .../Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 10 ---------- .../Outland/BlackTemple/boss_gurtogg_bloodboil.cpp | 4 ++-- .../scripts/Outland/BlackTemple/boss_illidan.cpp | 4 ++-- .../Outland/BlackTemple/boss_illidari_council.cpp | 4 ++-- .../Outland/BlackTemple/boss_mother_shahraz.cpp | 4 ++-- .../scripts/Outland/BlackTemple/boss_supremus.cpp | 4 ++-- .../Outland/BlackTemple/boss_teron_gorefiend.cpp | 4 ++-- .../Outland/BlackTemple/boss_warlord_najentus.cpp | 4 ++-- .../SteamVault/boss_hydromancer_thespia.cpp | 4 ++-- .../CoilfangReservoir/TheSlavePens/boss_ahune.cpp | 4 ++-- .../TheSlavePens/boss_mennu_the_betrayer.cpp | 4 ++-- .../TheSlavePens/boss_quagmirran.cpp | 4 ++-- .../TheSlavePens/boss_rokmar_the_crackler.cpp | 4 ++-- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 4 ++-- .../HellfireCitadel/BloodFurnace/boss_broggok.cpp | 4 ++-- .../BloodFurnace/boss_kelidan_the_breaker.cpp | 2 +- .../BloodFurnace/boss_the_maker.cpp | 4 ++-- .../HellfireRamparts/boss_omor_the_unscarred.cpp | 4 ++-- .../HellfireRamparts/boss_vazruden_the_herald.cpp | 4 ++-- .../boss_watchkeeper_gargolmar.cpp | 4 ++-- .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 4 ++-- .../Outland/TempestKeep/Eye/boss_astromancer.cpp | 4 ++-- .../Outland/TempestKeep/Eye/boss_void_reaver.cpp | 4 ++-- .../Mechanar/boss_gatewatcher_gyrokill.cpp | 4 ++-- .../Mechanar/boss_gatewatcher_ironhand.cpp | 4 ++-- .../Mechanar/boss_mechano_lord_capacitus.cpp | 4 ++-- .../Mechanar/boss_nethermancer_sepethrea.cpp | 2 +- .../Mechanar/boss_pathaleon_the_calculator.cpp | 4 ++-- .../arcatraz/boss_dalliah_the_doomsayer.cpp | 4 ++-- .../arcatraz/boss_wrath_scryer_soccothrates.cpp | 4 ++-- .../arcatraz/boss_zereketh_the_unbound.cpp | 4 ++-- .../botanica/boss_commander_sarannis.cpp | 4 ++-- .../botanica/boss_thorngrin_the_tender.cpp | 4 ++-- 253 files changed, 517 insertions(+), 539 deletions(-) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 737f3424b6..0dbcc70ab3 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -487,12 +487,12 @@ void BossAI::_JustReachedHome() me->setActive(false); } -void BossAI::_JustEngagedWith() +void BossAI::_JustEngagedWith(Unit* who) { if (instance) { // bosses do not respawn, check only on enter combat - if (!instance->CheckRequiredBosses(_bossId)) + if (!instance->CheckRequiredBosses(_bossId, who->ToPlayer())) { EnterEvadeMode(EVADE_REASON_SEQUENCE_BREAK); return; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 97f963aa06..54b0a840f7 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -354,7 +354,7 @@ class TC_GAME_API BossAI : public ScriptedAI virtual void ScheduleTasks() { } void Reset() override { _Reset(); } - void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } + void JustEngagedWith(Unit* who) override { _JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override { _JustDied(); } void JustReachedHome() override { _JustReachedHome(); } @@ -362,7 +362,7 @@ class TC_GAME_API BossAI : public ScriptedAI protected: void _Reset(); - void _JustEngagedWith(); + void _JustEngagedWith(Unit* who); void _JustDied(); void _JustReachedHome(); void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr); diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index e033a6e252..f52902a9c3 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -73,9 +73,9 @@ struct boss_alizabal : public BossAI { boss_alizabal(Creature* creature) : BossAI(creature, DATA_ALIZABAL), _bladeDanceChargeCount(0) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SEETHING_HATE, 9s + 500ms); diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index b7d9420e05..040cca6c76 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -66,9 +66,9 @@ class boss_occuthar : public CreatureScript ASSERT(_vehicle); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SEARING_SHADOWS, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS); 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 42870f7031..365589c7f0 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -63,9 +63,9 @@ struct boss_pit_lord_argaloth : public BossAI { boss_pit_lord_argaloth(Creature* creature) : BossAI(creature, DATA_ARGALOTH), _felFirestormCount(0) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_METEOR_SLASH, 10s + 800ms); events.ScheduleEvent(EVENT_CONSUMING_DARKNESS, 6s); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp index 92a36a128b..50ddf1da46 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp @@ -306,9 +306,9 @@ struct boss_chogall : public BossAI _achievementEnligibe = true; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); DoCastSelf(SPELL_CORRUPTED_BLOOD); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp index 3efa20a0bd..5d8ebf243e 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp @@ -185,9 +185,9 @@ class boss_halfus_wyrmbreaker : public CreatureScript DoSummon(NPC_PROTO_BEHEMOTH, ProtoBehemothPos); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_BERSERK, 10min); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp index 38a1ef0c76..6c09e0e543 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp @@ -249,7 +249,7 @@ class boss_theralion : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_BERSERK, 10min); @@ -500,7 +500,7 @@ class boss_valiona : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_GROUND); events.ScheduleEvent(EVENT_BLACKOUT, Seconds(10) + Milliseconds(500)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp index 9ae23f6f99..c0d1a6f59f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp @@ -106,9 +106,9 @@ struct boss_ascendant_lord_obsidius : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_STONE_BLOW, 8s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp index 5e98280840..eb1a8bd13f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp @@ -89,9 +89,9 @@ struct boss_beauty : public BossAI DoSummon(NPC_RUNTY, RuntyPos); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_BERSERKER_CHARGE, 15s); events.ScheduleEvent(EVENT_FLAMEBREAK, 21s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp index 35a86bd3dc..339fc09bd8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp @@ -126,9 +126,9 @@ struct boss_corla_herald_of_twilight : public BossAI DoCastSelf(SPELL_WEAR_CHRISTMAS_HAT_RED_SELF_DND); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); me->CastStop(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp index c7bccb577a..e03d590c1c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp @@ -93,9 +93,9 @@ struct boss_karsh_steelbender : public BossAI DoCastSelf(SPELL_SUPERHEATED_QUICKSILVER_ARMOR_PROC_AURA); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 10s, 12s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp index 6548ac4635..d4e93543ef 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp @@ -115,9 +115,9 @@ struct boss_romogg_bonecrusher : public BossAI _killedElementals++; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); Talk(SAY_EMOTE_CALL_FOR_HELP); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 96f13bb28a..affcc15fb7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -49,9 +49,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FIRE_NOVA, 6000); events.ScheduleEvent(EVENT_CLEAVE, 8000); events.ScheduleEvent(EVENT_CONFLIGURATION, 15000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp index 2b0f27d921..a7376f8d40 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -59,9 +59,9 @@ public: me->GetMotionMaster()->MovePath(GIZRUL_PATH, false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000)); events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 0976562d7d..a88f739865 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -78,9 +78,9 @@ public: } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000)); events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index 7c8d1c7be9..224e25ecc2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -61,9 +61,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_REND, urand(17000,20000)); events.ScheduleEvent(EVENT_THRASH, urand(10000,12000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp index 11ab7003d5..8afe88dc54 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -50,9 +50,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FRENZY, 20000); events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp index 14bda7f2b4..a80d9a6ac6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -64,9 +64,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000)); events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000)); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp index 6a03c3ea1d..dd5402af7b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp @@ -51,9 +51,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 523490dfca..c13f87e5c9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -70,9 +70,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SHOUT, 2 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 6 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp index aa3ebab4bc..3bcaaa0f8e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -47,9 +47,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHOOT, 1000); events.ScheduleEvent(EVENT_STUN_BOMB, 16000); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 10c1ad57f6..9ed0ca968c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -181,9 +181,9 @@ public: portcullisGUID.Clear(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 15000)); events.ScheduleEvent(EVENT_CLEAVE, urand(15000, 17000)); events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 4637c23a3d..a988aa67af 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -53,9 +53,9 @@ public: //DoCast(me, SPELL_ICEARMOR, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_HEX, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index 961fd40c72..4ac137528d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -52,9 +52,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FLAME_BREAK, 12 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_IMMOLATE, 3 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp index de4ae78908..5898d1a2be 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -53,9 +53,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(SPELL_REND, urand(17000,20000)); events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000)); Talk(SAY_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp index 9305a28b6c..0c7d288a1a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -53,9 +53,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp index fb069ca4a3..5c14c890ad 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp @@ -196,9 +196,9 @@ struct boss_atramedes : public BossAI events.SetPhase(PHASE_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); DoCastSelf(SPELL_DEVASTATION_TRIGGER); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp index 4b4108d643..bfadb008d6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp @@ -151,9 +151,9 @@ struct boss_chimaeron : public BossAI events.SetPhase(PHASE_ASLEEP); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->SetReactState(REACT_AGGRESSIVE); events.SetPhase(PHASE_1); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp index e45a260f79..22dac5fa49 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp @@ -215,9 +215,9 @@ struct boss_magmaw : public BossAI events.SetPhase(PHASE_OUT_OF_COMBAT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, FRAME_PRIORITY_MAGMAW); me->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index dcdea8295a..a6fb1cb50d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -262,9 +262,9 @@ struct boss_maloriak : public BossAI me->SummonCreatureGroup(SUMMON_GROUP_EXPERIMENTS); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp index c7914143e1..bd04596e53 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp @@ -380,7 +380,7 @@ struct boss_nefarians_end : public BossAI me->SetReactState(REACT_PASSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { // Attacking Nefarian while Onyxia is not engaged is not suposed to trigger anything if (instance->GetBossState(DATA_NEFARIANS_END) != IN_PROGRESS) @@ -389,8 +389,7 @@ struct boss_nefarians_end : public BossAI me->CombatStop(); return; } - - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustAppeared() override diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index 68d749fe67..10f14420fa 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -51,9 +51,9 @@ public: { boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 8000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 716bce7fb2..94fc469078 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -191,9 +191,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHIMMER, 0); events.ScheduleEvent(EVENT_BREATH_1, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index ac11cfa43a..d612fcae28 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -42,9 +42,9 @@ public: { boss_ebonrocAI(Creature* creature) : BossAI(creature, DATA_EBONROC) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index b99fd5a34e..1c942f80b0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -42,9 +42,9 @@ public: { boss_firemawAI(Creature* creature) : BossAI(creature, DATA_FIREMAW) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index ad169213d5..ee34bbaa4c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -47,9 +47,9 @@ public: { boss_flamegorAI(Creature* creature) : BossAI(creature, DATA_FLAMEGOR) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000)); events.ScheduleEvent(EVENT_WINGBUFFET, 30000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index bb4bbdf74d..f1ffc95dd6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -203,7 +203,7 @@ public: void BeginEvent(Player* target) { - _JustEngagedWith(); + _JustEngagedWith(target); Talk(SAY_GAMESBEGIN_2); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index c50626c1fd..7c49c5ab25 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -93,9 +93,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCast(me, SPELL_ESSENCEOFTHERED); me->SetHealth(me->CountPctFromMaxHealth(30)); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp index f1f31573a2..86ce820c35 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp @@ -111,9 +111,9 @@ class boss_admiral_ripsnarl: public CreatureScript DoCastSelf(SPELL_THIRST_FOR_BLOOD, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastAOE(SPELL_RIPSNARL_CANNON_KILL, true); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp index d61ed7bcde..363751395c 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp @@ -147,9 +147,9 @@ class boss_captain_cookie : public CreatureScript DoCastSelf(SPELL_COOKIES_HAT, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->RemoveAurasDueToSpell(SPELL_WHOS_THAT); me->AttackStop(); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp index 71c060e2cb..56e6ff63e4 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp @@ -150,9 +150,9 @@ class boss_foe_reaper_5000 : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_1); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_OVERDRIVE, Seconds(9)); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp index c6999d3c91..f74b3998e4 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp @@ -139,9 +139,9 @@ struct boss_glubtok : public BossAI } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_1); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp index b5bf2ed501..1ebb08efcf 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp @@ -176,9 +176,9 @@ struct boss_helix_gearbreaker : public BossAI me->SetReactState(REACT_PASSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 2); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp index 2587ef5bd5..612584fe43 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp @@ -194,10 +194,10 @@ class boss_vanessa_van_cleef : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); DoCastAOE(SPELL_VANESSA_ACHIEVEMENT_SPELL, true); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_DEFLECTION, Seconds(11)); diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp index bdc7e5f510..c9578365ad 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp @@ -143,9 +143,9 @@ class boss_drahga_shadowburner : public CreatureScript DoCastSelf(SPELL_WEAR_CHRISTMAS_HAT_GREEN_SELF_DND); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_1); diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp index 5bad8b5a11..9aee885d52 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp @@ -130,9 +130,9 @@ class boss_erudax : public CreatureScript { boss_erudaxAI(Creature* creature) : BossAI(creature, DATA_ERUDAX), _achievementEnligible(true) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_BINDING_SHADOWS, Seconds(10) + Milliseconds(500)); diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp index 4925e08977..919e1e7295 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp @@ -121,9 +121,9 @@ class boss_forgemaster_throngus : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_MIGHTY_STOMP, Seconds(6) + Milliseconds(500)); diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp index bca95ef524..ddeae38676 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp @@ -114,9 +114,9 @@ struct boss_general_umbriss : public BossAI _frenzyCasted = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SUMMON_SKARDYN, Seconds(6)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index c20a87565e..343b7d7004 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -77,9 +77,9 @@ public: Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 83ecde299e..19df70fec9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -65,9 +65,9 @@ public: _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastSelf(SPELL_HOLYGROUND, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 478f92610e..cc791b7062 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -181,9 +181,9 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_MASTERS_TERRACE_DOOR_2), open); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); SetupGroundPhase(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index ba565183dc..30c90fa894 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -86,9 +86,9 @@ public: events.ScheduleEvent(EVENT_ENRAGE, Minutes(10)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 250b6d8d3b..34682cb098 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -141,9 +141,9 @@ struct boss_felblood_kaelthas : public BossAI _firstGravityLapse = true; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_ONE); events.ScheduleEvent(EVENT_FIREBALL, 1ms, 0, PHASE_ONE); events.ScheduleEvent(EVENT_FLAME_STRIKE, 44s, 0, PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index ec34efa3c5..1389e2cdeb 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript crystal->KillSelf(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 123ce04c63..397322bdee 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -83,10 +83,10 @@ class boss_vexallus : public CreatureScript Talk(SAY_KILL); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 2e284312a1..66c87d65c0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -53,9 +53,9 @@ struct boss_arcanist_doan : public BossAI _detonationTriggered = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCE, 6s); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 11s); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index c63e2634a5..1cc0cb3a90 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -51,9 +51,9 @@ class boss_azshir_the_sleepless : public CreatureScript _siphon = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000); events.ScheduleEvent(EVENT_TERRIFY, 20000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 89bf47b5a2..5543ed7974 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -58,10 +58,10 @@ struct boss_bloodmage_thalnos : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s, 10s); events.ScheduleEvent(EVENT_SHADOW_BOLT, 1ms); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 0d9c62787f..bca24fd945 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -76,11 +76,11 @@ class boss_herod : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(me, SPELL_RUSHINGCHARGE); - _JustEngagedWith(); events.ScheduleEvent(EVENT_CLEAVE, 12000); events.ScheduleEvent(EVENT_WHIRLWIND, 60000); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 29fc098b73..365801db0a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -55,10 +55,10 @@ struct boss_houndmaster_loksey : public BossAI instance->instance->SpawnGroupSpawn(SPAWN_GROUP_ID_HOUNDS, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_BATTLE_SHOUT, 7s); events.ScheduleEvent(EVENT_BLOODLUST, 10s); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index e25ef1de55..5d5e0bb6c6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -49,10 +49,10 @@ struct boss_interrogator_vishas : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 8s); } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index c81336334e..ced6858fb9 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -49,9 +49,9 @@ class boss_scorn : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_LICH_SLAP, 45000); events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000); events.ScheduleEvent(EVENT_MIND_FLAY, 30000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index c55d19881f..68b36383b8 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -76,9 +76,9 @@ class boss_darkmaster_gandling : public CreatureScript gate->SetGoState(GO_STATE_ACTIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500); events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000); events.ScheduleEvent(EVENT_CURSE, 2000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 2df9d2cebe..b1fa301d52 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -53,9 +53,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript { boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_REND, 8000); events.ScheduleEvent(EVENT_BACKHAND, 9000); events.ScheduleEvent(EVENT_FRENZY, 1000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 00501cf786..e92f2cbba7 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -51,9 +51,9 @@ class boss_illucia_barov : public CreatureScript { boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000); events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000); events.ScheduleEvent(EVENT_SILENCE, 5000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index be83c9e90f..a1fb159ef3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -70,9 +70,9 @@ class boss_instructor_malicia : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000); events.ScheduleEvent(EVENT_CORRUPTION, 8000); events.ScheduleEvent(EVENT_RENEW, 32000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 9ac3bd99a7..e2595820ff 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -87,8 +87,9 @@ class boss_kirtonos_the_herald : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000)); events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000)); events.ScheduleEvent(EVENT_PIERCE_ARMOR, urand(18000, 18000)); @@ -97,7 +98,6 @@ class boss_kirtonos_the_herald : public CreatureScript events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000)); events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000)); events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000)); - _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 3befa07961..b5cdbb5fd4 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -55,9 +55,9 @@ class boss_lord_alexei_barov : public CreatureScript DoCast(me, SPELL_UNHOLY_AURA); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_IMMOLATE, 7000); events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index d7219a2b49..6d133fd2b8 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -50,9 +50,9 @@ class boss_lorekeeper_polkelt : public CreatureScript { boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000); events.ScheduleEvent(EVENT_DARKPLAGUE, 8000); events.ScheduleEvent(EVENT_CORROSIVEACID, 45000); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index b5562f1630..29f322c8be 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -50,9 +50,9 @@ class boss_the_ravenian : public CreatureScript { boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_TRAMPLE, 24000); events.ScheduleEvent(EVENT_CLEAVE, 15000); events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp index 1ca178af0d..41694b94a0 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp @@ -87,9 +87,9 @@ struct boss_baron_ashbury : public BossAI Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp index abf09ef815..462d3e8d12 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp @@ -111,10 +111,10 @@ public: _worgenCounter = 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); if (IsHeroic()) events.ScheduleEvent(EVENT_CURSED_VEIL, Seconds(6)); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp index 7af3ea97e4..ef3fe47b24 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp @@ -130,10 +130,10 @@ public: */ } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_MALEFIC_STRIKE, Seconds(5)); events.ScheduleEvent(EVENT_DESECRATION, Seconds(9) + Milliseconds(500)); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp index d08fb71975..8da2d2eb67 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp @@ -90,9 +90,9 @@ struct boss_lord_godfrey : public BossAI me->MakeInterruptable(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE ? SAY_AGGRO_ALLIANCE : SAY_AGGRO_HORDE); DoCastAOE(SPELL_BULLET_TIME_RESET_CREDIT); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp index c97c9d425c..6b2f6147fd 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp @@ -82,10 +82,10 @@ struct boss_lord_walden : public BossAI events.SetPhase(PHASE_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); events.SetPhase(PHASE_COMBAT); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 97a4021412..fb60fd9a5b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -208,11 +208,11 @@ struct boss_kalecgos : public BossAI damage = 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_EVIL_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALEC, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR)) @@ -461,9 +461,9 @@ struct boss_sathrovarr : public BossAI events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_SATH_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index af7b62b04f..8fea996466 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -276,9 +276,9 @@ public: }); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCast(me, SPELL_OPEN_PORTAL_PERIODIC, true); DoCast(me, SPELL_DARKNESS_PERIODIC, true); DoCast(me, SPELL_NEGATIVE_ENERGY_PERIODIC, true); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp index 767546ce54..5536814213 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp @@ -66,9 +66,9 @@ public: { boss_hoggerAI(Creature* creature) : BossAI(creature, DATA_HOGGER), _hasEnraged(false) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); events.ScheduleEvent(EVENT_VICIOUS_SLICE, Seconds(3), Seconds(4)); events.ScheduleEvent(EVENT_MADDENING_CALL, Seconds(1), Seconds(2)); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp index 75f9ee8cf4..83462efb46 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp @@ -48,9 +48,9 @@ public: { boss_lord_overheatAI(Creature* creature) : BossAI(creature, DATA_LORD_OVERHEAT) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); events.ScheduleEvent(EVENT_FIREBALL, Seconds(2)); events.ScheduleEvent(EVENT_OVERHEAT, Seconds(9), Seconds(11)); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp index 8bed089c0a..987f8c25ef 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp @@ -70,9 +70,9 @@ public: secondVanish = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_PULL); events.ScheduleEvent(EVENT_WILDLY_STABBING, Seconds(4), Seconds(5)); events.ScheduleEvent(EVENT_SWEEP, Seconds(2), Seconds(3)); diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp index 5ad1056fae..860911bb9b 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp @@ -71,9 +71,9 @@ struct boss_commander_ulthok : public BossAI { boss_commander_ulthok(Creature* creature) : BossAI(creature, DATA_COMMANDER_ULTHOK) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); DoCastAOE(SPELL_ULTHOK_VO_AGGRO, true); diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp index c30f6eb10f..3c8016d106 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp @@ -155,9 +155,9 @@ struct boss_lady_nazjar : public BossAI { boss_lady_nazjar(Creature* creature) : BossAI(creature, DATA_LADY_NAZJAR), _waterspoutPhaseCount(0), _killedAdds(0), _isInTransition(false) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); HandleDoor(false); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 45c1fe0c90..6830cd5759 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -293,9 +293,9 @@ struct boss_akilzon : public BossAI { boss_akilzon(Creature* creature) : BossAI(creature, DATA_ALKILZON) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp index e0ce03b17a..d1a528aa58 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp @@ -40,9 +40,9 @@ struct boss_daakara : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 02d198bd04..5fc4bb391e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -51,9 +51,9 @@ struct boss_halazzi : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index b0ece75826..b22e06f498 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -53,9 +53,9 @@ struct boss_hexlord_malacrass : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void KilledUnit(Unit* /*victim*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index e83a4dc147..13d2a8a87a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -51,9 +51,9 @@ struct boss_nalorakk : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp index fb59b45eeb..77bb8a1fd0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp @@ -117,9 +117,9 @@ struct boss_bloodlord_mandokir : public BossAI _reanimateOhganCooldown = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp index 8c4092d0c9..092b9c9eaf 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp @@ -210,9 +210,9 @@ struct boss_high_priest_venoxis : public BossAI eyes->CastSpell(eyes, SPELL_SNAKE_EYES); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_TOTEM_BEAM_LEFT); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp index e150c8a6ad..f3132d5bbc 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp @@ -112,9 +112,9 @@ struct boss_high_priestess_kilnara : public BossAI me->SummonCreatureGroup(SUMMON_GROUP_PRIDE_OF_BETHEK); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastAOE(SPELL_CLEAR_ACHIEVEMENT_CREDITS); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp index f99c77d1cb..8483333e08 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -239,9 +239,9 @@ struct boss_jindo_the_godbreaker : public BossAI SetupEncounter(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); events.SetPhase(PHASE_ONE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index 70c65b1486..fc9be42b79 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -164,9 +164,9 @@ struct boss_zanzil : public BossAI DoSummon(NPC_ZANZILI_BERSERKER, ZanziliBerserkerPositions[i], 4000); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ZANZILI_FIRE, 13s, 14s); events.ScheduleEvent(EVENT_TERRIBLE_TONIC, 10s, 11s); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 83ca2730a1..a7475cd39b 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -54,9 +54,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index c262c6e5cc..c19a8288b3 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -38,9 +38,9 @@ public: { boss_gelihastAI(Creature* creature) : BossAI(creature, DATA_GELIHAST) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000)); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index c1ac2ec101..c6b2dd338e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -47,9 +47,9 @@ public: { boss_kelrisAI(Creature* creature) : BossAI(creature, DATA_KELRIS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000)); events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index f8f6a9b88a..47116792b0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -299,10 +299,10 @@ public: me->RemoveAllAuras(); // Reset Soul Charge auras. } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_FEAR, 42000); events.ScheduleEvent(EVENT_AIR_BURST, 30000); events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index 75082ae0fd..2c8b3615ec 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -63,9 +63,9 @@ class boss_epoch : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); _stepTargetIndex = 0; _stepTargets.clear(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index 849e40d892..4109b2894a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -75,10 +75,10 @@ class boss_infinite_corruptor : public CreatureScript target->CastSpell(target, SPELL_CORRUPTION_OF_TIME_TARGET, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7s); events.ScheduleEvent(EVENT_VOID_STRIKE, 5s); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index c9dab62300..72a4ee2e1d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -58,10 +58,10 @@ class boss_meathook : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CHAIN, Seconds(7), Seconds(11)); events.ScheduleEvent(EVENT_DISEASE, Seconds(2)); events.ScheduleEvent(EVENT_FRENZY, Seconds(13), Seconds(17)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index b2476b53e0..eb0463fff1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -70,10 +70,10 @@ class boss_salramm : public CreatureScript me->RemoveLootMode(LOOT_MODE_DEFAULT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON_GHOULS, randtime(Seconds(19),Seconds(24))); events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(2)); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp index 38a9d7e018..a86315d68c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp @@ -467,9 +467,9 @@ struct boss_madness_of_deathwing : public BossAI DoZoneInCombat(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoSummon(NPC_TAIL_TENTACLE, TailTentacleSummonPosition, 0, TEMPSUMMON_MANUAL_DESPAWN); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 93318e7c7b..4f393481ce 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -139,9 +139,9 @@ class boss_baleroc : public CreatureScript } } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(EMOTE_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_INCENDIARY_SOUL, 8.5*IN_MILLISECONDS); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp index 5d4c5261b9..0b07dd123d 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp @@ -106,9 +106,9 @@ struct boss_ammunae : public BossAI me->AddAura(SPELL_ZERO_ENERGY_ZERO_REGEN, me); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SUMMON_SEEDLING_POD, 7s); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index d93be78917..27de36494c 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -177,10 +177,10 @@ struct boss_anraphet : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(ANRAPHET_SAY_AGGRO); - _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_ANRAPHET_NEMESIS_STRIKE, Seconds(8), 0, PHASE_COMBAT); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 72194a6c06..556985d52b 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -90,11 +90,11 @@ struct boss_earthrager_ptah : public BossAI { boss_earthrager_ptah(Creature* creature) : BossAI(creature, DATA_EARTHRAGER_PTAH), _hasDispersed(false), _summonCount(0), _summonsDeadCount(0) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); - _JustEngagedWith(); events.SetPhase(PHASE_FIGHT); events.ScheduleEvent(EVENT_RAGING_SMASH, 7s, 0, PHASE_FIGHT); // Seconds(12) events.ScheduleEvent(EVENT_FLAME_BOLT, 8s, 0, PHASE_FIGHT); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp index 052a2d8276..e64e541af6 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp @@ -145,13 +145,13 @@ public: instance->SetData(DATA_ISISET_VEIL_OF_SKY_ALIVE, 1); } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); if (IsHeroic()) DoCastSelf(SPELL_CALL_OF_SKY); RescheduleEvents(); - _JustEngagedWith(); instance->SendEncounterUnit(ENCOUNTER_FRAME_SET_COMBAT_RES_LIMIT, 0); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp index 45dcd134f5..3a4a860c65 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp @@ -115,9 +115,9 @@ struct boss_rajh : public BossAI me->MakeInterruptable(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp index 12c8e830ca..fcc1fb7d33 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp @@ -124,9 +124,9 @@ class boss_setesh : public CreatureScript { boss_seteshAI(Creature* creature) : BossAI(creature, DATA_SETESH) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 8db9fae6c0..b604b5eba0 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -107,11 +107,11 @@ struct boss_temple_guardian_anhuur : public BossAI me->MakeInterruptable(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); - _JustEngagedWith(); events.SetPhase(PHASE_FIGHT); events.ScheduleEvent(EVENT_DIVINE_RECKONING, Seconds(10), 0, PHASE_FIGHT); events.ScheduleEvent(EVENT_BURNING_LIGHT, Seconds(12), 0, PHASE_FIGHT); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp index bc5d126de4..6eb59cd78b 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp @@ -109,9 +109,9 @@ struct boss_general_husam : public BossAI { boss_general_husam(Creature* creature) : BossAI(creature, DATA_GENERAL_HUSAM), _shockwaveStalkerCount(0) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp index 314c1500e6..6ea66bf57a 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp @@ -143,9 +143,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_FIFTY_LASHINGS, Seconds(9)); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp index abe9406045..25ea5dd9fa 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp @@ -145,9 +145,9 @@ class boss_lockmaw : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_VISCOUS_POISON, Seconds(6)); events.ScheduleEvent(EVENT_SCENT_OF_BLOOD, Seconds(6)); @@ -274,9 +274,9 @@ class boss_augh : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->HandleEmoteCommand(EMOTE_ONESHOT_NONE); DoCastSelf(SPELL_FRENZY); events.Reset(); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp index 71b319180f..038b88ee09 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp @@ -128,10 +128,10 @@ class boss_siamat : public CreatureScript SetCombatMovement(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.SetPhase(PHASE_1); events.ScheduleEvent(EVENT_STATIC_SHOCK, Milliseconds(1), 0, PHASE_1); events.ScheduleEvent(EVENT_DEFLECTING_WINDS, Seconds(6), 0, PHASE_1); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index ce6e6d8d34..f63e187a33 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -160,9 +160,9 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000)); events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000)); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 77d7d9e7ac..d8bd862077 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -68,9 +68,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000); events.ScheduleEvent(EVENT_FROSTBOLT, 1000); events.ScheduleEvent(EVENT_FROST_NOVA, urand(10000, 15000)); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index 2a1580103b..392c605148 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp @@ -53,9 +53,9 @@ public: hp15 = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp index fb2163c773..5b7b52b2ce 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp @@ -58,9 +58,9 @@ public: events.ScheduleEvent(EVENT_OOC_1, 10000); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_FIREBALL, 100); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index a67f906dd5..798300ecde 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -51,9 +51,9 @@ public: DoCast(me, SPELL_VIRULENT_POISON); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000)); events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000)); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index aa6f3bb9f5..4d9e0d2d7b 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -86,7 +86,7 @@ class boss_buru : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(EMOTE_TARGET, who); DoCast(me, SPELL_THORNS); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index adcce3a37c..71147204d2 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -138,9 +138,9 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.ScheduleEvent(EVENT_SILENCE, 30000); events.ScheduleEvent(EVENT_CYCLONE, 20000); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 09862366bb..a7cf348f69 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -81,17 +81,6 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12000); } - void JustDied(Unit* /*killer*/) override - { - //SAY_DEATH - _JustDied(); - } - - void JustEngagedWith(Unit* /*victim*/) override - { - _JustEngagedWith(); - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 5235a7777f..fb7007c08e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -130,9 +130,9 @@ class boss_skeram : public CreatureScript me->RemoveCorpse(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(6000, 12000)); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 9f4eea5fb6..6ffcb5eeed 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -180,9 +180,9 @@ class boss_viscidus : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); InitSpells(); } diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp index 09eda9a3ff..87aae05f59 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp @@ -308,9 +308,9 @@ struct boss_alakir : public BossAI _useTempoaryCloudSpawns = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->SetReactState(REACT_AGGRESSIVE); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp index 2162419533..024e8ffcb6 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp @@ -243,7 +243,7 @@ struct boss_anshal : public BossAI void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetReactState(REACT_AGGRESSIVE); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->RemoveAurasDueToSpell(SPELL_PRE_FIGHT_VISUAL_WEST); @@ -491,7 +491,7 @@ struct boss_nezir : public BossAI void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetReactState(REACT_AGGRESSIVE); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->RemoveAurasDueToSpell(SPELL_PRE_FIGHT_VISUAL_NORTH); @@ -725,7 +725,7 @@ struct boss_rohash : public BossAI void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetReactState(REACT_AGGRESSIVE); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); me->RemoveAurasDueToSpell(SPELL_PRE_FIGHT_VISUAL_EAST); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index eda884416d..fc725dcf4b 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -106,9 +106,9 @@ struct boss_altairus : public BossAI me->SetHover(true); } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_CALL_THE_WIND, 6s); events.ScheduleEvent(EVENT_CHILLING_BREATH, 10s, 14s); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp index be4c859f30..af7fcad3f5 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp @@ -185,9 +185,9 @@ struct boss_asaad : public BossAI me->SetReactState(REACT_AGGRESSIVE); } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.ScheduleEvent(EVENT_SUMMON_SKYFALL_STAR, 11000); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp index 4cbd4f99e8..beb137f67d 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp @@ -102,9 +102,9 @@ struct boss_grand_vizier_ertan : public BossAI { boss_grand_vizier_ertan(Creature* creature) : BossAI(creature, DATA_GRAND_VIZIER_ERTAN) { } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoCastSelf(SPELL_STORMS_EDGE_PERIODIC); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp index 122e25c851..a109cc6294 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_kresh.cpp @@ -38,9 +38,9 @@ public: { boss_kreshAI(Creature* creature) : BossAI(creature, DATA_KRESH) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRUSHING_BITE, Seconds(6)); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp index 3bd0332236..067d35a9f0 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lady_anacondra.cpp @@ -64,9 +64,9 @@ public: DoCastSelf(SPELL_NATURE_CHANNELING); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_NATURE_CHANNELING); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp index c9431520aa..e5e4a07408 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_cobrahn.cpp @@ -55,9 +55,9 @@ public: { boss_lord_cobrahnAI(Creature* creature) : BossAI(creature, DATA_LORD_COBRAHN) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(1), 0, PHASE_NORMAL); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp index 8c82d8e10b..fde38dc4cd 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_pythas.cpp @@ -49,10 +49,10 @@ public: { boss_lord_pythasAI(Creature* creature) : BossAI(creature, DATA_LORD_PYTHAS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(3)); events.ScheduleEvent(EVENT_THUNDERCLAP, Seconds(19)); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp index 89897a6b19..60704b9b55 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_lord_serpentis.cpp @@ -47,10 +47,10 @@ public: { boss_lord_serpentisAI(Creature* creature) : BossAI(creature, DATA_LORD_SERPENTIS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(1)); events.ScheduleEvent(EVENT_HEALING_TOUCH, Seconds(27)); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp index 687adce96d..771dfebeb0 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_skum.cpp @@ -38,9 +38,9 @@ public: { boss_skumAI(Creature* creature) : BossAI(creature, DATA_SKUM) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CHAINED_BOLT, Seconds(3), Seconds(4)); } diff --git a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp index d32f64c8a1..54432216be 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/boss_verdan_the_everliving.cpp @@ -38,9 +38,9 @@ public: { boss_verdan_the_everlivingAI(Creature* creature) : BossAI(creature, DATA_VERDAN_THE_EVERLIVING) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_GRASPING_VINES, Seconds(20),Seconds(35)); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 24351b086c..e44e4c3d95 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -166,9 +166,9 @@ class boss_high_priestess_azil : public CreatureScript MakeInterruptable(false); } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); DoCast(me, SPELL_ENERGY_SHIELD); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 05f6e3a3a4..563261e37b 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -72,9 +72,9 @@ class boss_ozruk : public CreatureScript { boss_ozrukAI(Creature* creature) : BossAI(creature, DATA_OZRUK), _enraged(false) { } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 746f0ddf64..760b96bd0d 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -147,9 +147,9 @@ class boss_slabhide : public CreatureScript damage = me->GetHealth() - 1; // Let creature health fall to 1 hp but prevent it from dying during air phase. } - void JustEngagedWith(Unit* /*victim*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me); events.SetPhase(PHASE_COMBAT); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 1e9ca26bc7..4bbdd486d9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -66,9 +66,9 @@ class boss_amanitar : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ROOT, urand(5, 9) * IN_MILLISECONDS); events.ScheduleEvent(EVENT_BASH, urand(10, 14) * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 6de52c5733..5895c3ea92 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -78,9 +78,9 @@ class boss_elder_nadox : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_PLAGUE, 13 * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 3833ecd9d7..8c732dd2f2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -107,9 +107,9 @@ class boss_prince_taldaram : public CreatureScript _embraceTakenDamage = 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BLOODTHIRST, 10000); events.ScheduleEvent(EVENT_VANISH, urand(25000, 35000)); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 2956afd8bb..7c38fb277a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -163,10 +163,10 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_SARTHARION_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoZoneInCombat(); FetchDragons(); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index a354cdbfd2..8805294039 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -107,10 +107,10 @@ class boss_baltharus_the_warborn : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { me->InterruptNonMeleeSpells(false); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.Reset(); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_CLEAVE, Seconds(13), 0, PHASE_COMBAT); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index c92b76f3ed..fc2bbf3b6f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -88,9 +88,9 @@ class boss_general_zarithrian : public CreatureScript return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE && BossAI::CanAIAttack(target)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, Seconds(8)); events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, Seconds(14)); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index c96ddd423c..dac1c33733 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -239,14 +239,14 @@ class boss_halion : public CreatureScript controller->AI()->EnterEvadeMode(why); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); events.Reset(); events.SetPhase(PHASE_ONE); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, Seconds(5)); events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(5), Seconds(15))); @@ -422,11 +422,11 @@ class boss_twilight_halion : public CreatureScript events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, Seconds(15)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { events.SetPhase(PHASE_TWO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->AddAura(SPELL_TWILIGHT_PRECISION, me); events.ScheduleEvent(EVENT_CLEAVE, Seconds(3)); events.ScheduleEvent(EVENT_BREATH, Seconds(12)); 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 3d8eda17c3..e37226b922 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -86,9 +86,9 @@ class boss_saviana_ragefire : public CreatureScript me->SetDisableGravity(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.Reset(); events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index e4de61f946..1139cae587 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -270,9 +270,9 @@ class boss_anubarak_trial : public CreatureScript summons.Summon(summoned); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 83a35ce10b..b684409d32 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -643,10 +643,10 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, DONE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); DoCast(me, SPELL_ANTI_AOE, true); - _JustEngagedWith(); if (Creature* pChampionController = ObjectAccessor::GetCreature((*me), instance->GetGuidData(NPC_CHAMPIONS_CONTROLLER))) pChampionController->AI()->SetData(2, IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 461de90569..e08a58c11d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -136,9 +136,9 @@ class boss_jaraxxus : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index a62c8b75e9..694c3b4908 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -227,9 +227,9 @@ class boss_gormok : public CreatureScript me->DespawnOrUnsummon(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_IN_PROGRESS); } @@ -563,9 +563,9 @@ struct boss_jormungarAI : public BossAI me->DespawnOrUnsummon(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS); } @@ -969,9 +969,9 @@ class boss_icehowl : public CreatureScript me->DespawnOrUnsummon(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp index c8925e9260..5c3109e1ce 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp @@ -76,9 +76,9 @@ class boss_king_dred : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33000); events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index c4cb16befc..b73dad1ebf 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -106,9 +106,9 @@ public: SetBubbled(false); } - void JustEngagedWith(Unit* /* victim */) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); SetCrystalsStatus(true); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index db1942b345..1adbce85f2 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -88,10 +88,10 @@ class boss_tharon_ja : public CreatureScript me->RestoreDisplayId(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_DECAY_FLESH, 20000); events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 17ffa51067..3cfdbcd167 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -92,9 +92,9 @@ class boss_trollgore : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CONSUME, 15000); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index f0b607c9d6..05d6987ebf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -95,9 +95,9 @@ class boss_bronjahm : public CreatureScript DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 5801390df4..5f4d603aab 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -156,9 +156,9 @@ class boss_devourer_of_souls : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_FACE_AGGRO); if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index d3aaf000b7..943d49d3f2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -104,9 +104,9 @@ class boss_garfrost : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(me, SPELL_PERMAFROST); me->CallForHelp(70.0f); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 98c18ca3d7..4003b49ef2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -162,9 +162,9 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_KRICK)); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* krick = GetKrick()) krick->AI()->Talk(SAY_KRICK_AGGRO); diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 3227df45d7..29918277c5 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -117,9 +117,9 @@ class boss_drakkari_colossus : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->RemoveAura(SPELL_FREEZE_ANIM); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index a6c62a2324..ed040b7b33 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -65,9 +65,9 @@ class boss_eck : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BITE, 5 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SPIT, 10 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SPRING, 8 * IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index eb42d5ff82..c29f70efbb 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -113,9 +113,9 @@ class boss_gal_darah : public CreatureScript _DespawnAtEvade(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->InterruptNonMeleeSpells(false); SetPhase(PHASE_TROLL); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 5d516b4039..70a8fadb9c 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -85,9 +85,9 @@ class boss_moorabi : public CreatureScript events.ScheduleEvent(EVENT_PHANTOM, Seconds(21), 0, PHASE_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastSelf(SPELL_MOJO_FRENZY, true); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 208f610c90..29b4349a82 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -107,9 +107,9 @@ public: lWrappedPlayers.clear(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 786b92ea44..4acf5f2d86 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -494,11 +494,9 @@ class npc_green_dragon_combat_trigger : public CreatureScript { } - void Reset() override + void JustAppeared() override { - _Reset(); me->SetReactState(REACT_PASSIVE); - summons.DespawnAll(); // Setup Archmages me->SummonCreatureGroup(SUMMON_GROUP_ALL); if (Is25ManRaid()) @@ -510,6 +508,8 @@ class npc_green_dragon_combat_trigger : public CreatureScript summons.DoAction(ACTION_SETUP_ARCHMAGES, pred); } + void JustEngagedWith(Unit* who) override { } // JustEnteredCombat is already doing all of this hook's default actions so no need to execute it twice + void JustEnteredCombat(Unit* target) override { if (IsEngaged()) @@ -525,6 +525,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript EngagementStart(target); me->setActive(true); + me->SetCombatPulseDelay(5); DoZoneInCombat(); instance->SetBossState(DATA_VALITHRIA_DREAMWALKER, IN_PROGRESS); if (Creature* valithria = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VALITHRIA_DREAMWALKER))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 88d46e0926..5aef3f957d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -671,9 +671,9 @@ class boss_sister_svalna : public CreatureScript } } - void JustEngagedWith(Unit* /*attacker*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE))) crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA); DoCastSelf(SPELL_DIVINE_SURGE, true); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 542d13c1e5..1ac70e3aa7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -151,9 +151,9 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); summons.DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 19ef34fd87..3745fa0275 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -97,9 +97,9 @@ class boss_faerlina : public CreatureScript SummonAdds(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_POISON, randtime(Seconds(10), Seconds(15))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 196d130a4e..272bb4da4f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -103,9 +103,9 @@ public: me->SetSpeed(UnitMoveType::MOVE_RUN, 12.0f / baseMoveSpeed[MOVE_RUN]); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WOUND, Seconds(10)); events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(16), Seconds(22))); events.ScheduleEvent(EVENT_DECIMATE, randtime(Minutes(1)+Seconds(50), Minutes(2))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 3ebca0412d..83868e16bf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -323,9 +323,9 @@ class boss_gothik : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.SetPhase(PHASE_ONE); events.ScheduleEvent(EVENT_SUMMON, Seconds(25), 0, PHASE_ONE); events.ScheduleEvent(EVENT_DOORS_UNLOCK, Minutes(3) + Seconds(25), 0, PHASE_ONE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index de2c46ac81..a12504142b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -54,9 +54,9 @@ class boss_grobbulus : public CreatureScript { boss_grobbulusAI(Creature* creature) : BossAI(creature, BOSS_GROBBULUS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CLOUD, Seconds(15)); events.ScheduleEvent(EVENT_INJECT, Seconds(20)); events.ScheduleEvent(EVENT_SPRAY, randtime(Seconds(15), Seconds(30))); // not sure diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 8ea09e315c..1ff13af790 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -113,9 +113,9 @@ public: Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); _safeSection = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index ec901e2e93..4c16354be2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -72,9 +72,9 @@ class boss_loatheb : public CreatureScript _sporeLoser = true; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_NECROTIC_AURA, Seconds(17)); events.ScheduleEvent(EVENT_DEATHBLOOM, Seconds(5)); events.ScheduleEvent(EVENT_SPORE, Seconds(18)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 68c25311a8..8b518f69b7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -99,9 +99,9 @@ public: { boss_maexxnaAI(Creature* creature) : BossAI(creature, BOSS_MAEXXNA) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_WRAP, Seconds(20)); events.ScheduleEvent(EVENT_SPRAY, Seconds(40)); events.ScheduleEvent(EVENT_SHOCK, randtime(Seconds(5), Seconds(10))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 3c6cdda09a..1991f9384d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -116,9 +116,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); EnterPhaseGround(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 31ddcda930..e67e03cf5c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -88,9 +88,9 @@ public: Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Enraged = false; Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_HATEFUL, Seconds(1)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index d06c487903..acc69b9ba0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -112,9 +112,9 @@ public: instance->SetBossState(BOSS_RAZUVIOUS, DONE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->StopMoving(); summons.DoZoneInCombat(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 5b10fef590..4c0895f6ee 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -175,9 +175,9 @@ class boss_sapphiron : public CreatureScript damage = me->GetHealth()-1; // don't die during air phase } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->CastSpell(me, SPELL_FROST_AURA, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 660c93b3d6..32cd25dc35 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -92,11 +92,11 @@ class boss_keristrasza : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14000); events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, DUNGEON_MODE(30000, 11000)); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp index d5e4e84e77..85fe36921e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp @@ -51,9 +51,9 @@ class boss_nexus_commanders : public CreatureScript { boss_nexus_commandersAI(Creature* creature) : BossAI(creature, DATA_COMMANDER) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON); DoCast(me, SPELL_BATTLE_SHOUT); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 913584ab1f..fad31e038d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -84,9 +84,9 @@ public: Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12000); events.ScheduleEvent(EVENT_TRAMPLE, 10000); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 9dc2fe695b..a1d475a9c7 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -80,9 +80,9 @@ class boss_drakos : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index ea648d4fcb..cc23ce1786 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -113,9 +113,9 @@ class boss_eregos : public CreatureScript Talk(SAY_KILL); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); /* Checks for present drakes vehicles from each type and deactivate achievement that corresponds to each found diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 9f176efa24..4804277049 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -128,9 +128,9 @@ class boss_urom : public CreatureScript me->GetMotionMaster()->MoveIdle(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); StartAttack(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 20005f5dd3..21b01c2ff1 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -92,9 +92,9 @@ class boss_varos : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 7e78bfe801..245d011350 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -101,9 +101,9 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index f8aa4ac12a..ac24b55b41 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -120,14 +120,14 @@ public: events.ScheduleEvent(EVENT_FORGE_CAST, 2 * IN_MILLISECONDS, 0, PHASE_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_PAUSE, 3.5 * IN_MILLISECONDS, 0, PHASE_NORMAL); events.ScheduleEvent(EVENT_SHATTERING_STOMP, 0 * IN_MILLISECONDS, 0, PHASE_NORMAL); events.ScheduleEvent(EVENT_SHATTER, 5 * IN_MILLISECONDS, 0, PHASE_NORMAL); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void AttackStart(Unit* who) override diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 4789ac55e8..c3692c2ec8 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -63,10 +63,10 @@ class boss_krystallus : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(3000, 9000)); events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000)); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index a2f0cf69b8..2b902096a4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -71,9 +71,9 @@ class boss_maiden_of_grief : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 8886b18a46..5e0f933a68 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -103,7 +103,7 @@ class boss_sjonnir : public CreatureScript return; } - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(3000, 8000)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index e4b6236e53..fe6cc08da8 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -394,7 +394,7 @@ class boss_algalon_the_observer : public CreatureScript return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } - void JustEngagedWith(Unit* /*target*/) override + void JustEngagedWith(Unit* who) override { uint32 introDelay = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -405,7 +405,7 @@ class boss_algalon_the_observer : public CreatureScript if (!_firstPull) { Talk(SAY_ALGALON_AGGRO); - _JustEngagedWith(); + _JustEngagedWith(who); introDelay = 8000; } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index b5669b1f71..2166f02cb5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -159,9 +159,9 @@ class boss_steelbreaker : public CreatureScript me->RemoveAllAuras(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_STEELBREAKER_AGGRO); DoCast(me, SPELL_HIGH_VOLTAGE); events.SetPhase(++phase); @@ -307,9 +307,9 @@ class boss_runemaster_molgeim : public CreatureScript me->RemoveAllAuras(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_MOLGEIM_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_BERSERK, 900000); @@ -486,9 +486,9 @@ class boss_stormcaller_brundir : public CreatureScript return 0; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_BRUNDIR_AGGRO); events.SetPhase(++phase); events.ScheduleEvent(EVENT_MOVE_POSITION, 1000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index bf3cde2d14..0e088a2fa7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -126,9 +126,9 @@ class boss_auriaya : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SCREECH, urand(45000, 65000)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index e666878901..c82db30ca0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -271,9 +271,9 @@ class boss_flame_leviathan : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetReactState(REACT_PASSIVE); events.ScheduleEvent(EVENT_PURSUE, 1); events.ScheduleEvent(EVENT_MISSILE, urand(1500, 4*IN_MILLISECONDS)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index bac96a03ec..514265317d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -339,7 +339,7 @@ class boss_freya : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); DoZoneInCombat(); Creature* Elder[3]; for (uint8 n = 0; n < 3; ++n) @@ -724,9 +724,9 @@ class boss_elder_brightleaf : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -825,9 +825,9 @@ class boss_elder_stonebark : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } @@ -932,9 +932,9 @@ class boss_elder_ironbranch : public CreatureScript Talk(SAY_ELDER_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 967cb92ffc..64a034676c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -131,9 +131,9 @@ class boss_general_vezax : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(me, SPELL_AURA_OF_DESPAIR); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index f1b4d33bdc..47357acaef 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -356,9 +356,9 @@ class boss_hodir : public CreatureScript FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCast(me, SPELL_BITING_COLD, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 6877db56e1..f1a6e7ce49 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -141,9 +141,9 @@ class boss_ignis : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_JET, 30000); events.ScheduleEvent(EVENT_SCORCH, 25000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 126bd5a3f7..f2e9d6d06b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -118,7 +118,7 @@ class boss_kologarn : public CreatureScript bool left, right; ObjectGuid eyebeamTarget; - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); @@ -134,7 +134,7 @@ class boss_kologarn : public CreatureScript if (Unit* arm = vehicle->GetPassenger(i)) arm->ToCreature()->SetInCombatWithZone(); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void Reset() override diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 38e32caa7c..15c57822e2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -419,12 +419,12 @@ class boss_mimiron : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!me->GetVehicleBase()) return; - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveAurasDueToSpell(SPELL_WELD); DoCast(me->GetVehicleBase(), SPELL_SEAT_6); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index e9126e4c6a..c31aaa2ae5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -386,9 +386,9 @@ class boss_razorscale : public CreatureScript commander->AI()->DoAction(ACTION_COMMANDER_RESET); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); if (Creature* controller = instance->GetCreature(DATA_RAZORSCALE_CONTROL)) controller->AI()->DoAction(ACTION_HARPOON_BUILD); me->SetSpeedRate(MOVE_FLIGHT, 3.0f); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 52a27e2936..6261580d99 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -611,9 +611,9 @@ class boss_thorim : public CreatureScript SetBoundary(&ArenaBoundaries); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO_1); events.SetPhase(PHASE_1); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 9b06723542..e8fd52989f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -213,10 +213,10 @@ class boss_xt002 : public CreatureScript _DespawnAtEvade(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_ENRAGE, TIMER_ENRAGE); events.ScheduleEvent(EVENT_GRAVITY_BOMB, TIMER_GRAVITY_BOMB); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 3f377a8f24..eb390626fe 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -154,11 +154,11 @@ class boss_ingvar_the_plunderer : public CreatureScript events.ScheduleEvent(EVENT_JUST_TRANSFORMED, IN_MILLISECONDS / 2, 0, PHASE_EVENT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (events.IsInPhase(PHASE_EVENT) || events.IsInPhase(PHASE_UNDEAD)) // ingvar gets multiple JustEngagedWith calls return; - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_HUMAN); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index b46630afce..4a168d6b38 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -140,7 +140,7 @@ class boss_keleseth : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_START_COMBAT); if (!who) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 4e0a88508a..dd28c75e7a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -110,10 +110,10 @@ struct generic_boss_controllerAI : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!IsInGhostForm) - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 2575160131..1e01d1d9ad 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -219,9 +219,9 @@ public: _orb = summon->GetGUID(); } - void JustEngagedWith (Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCING_SMASH, Seconds(7)); events.ScheduleEvent(EVENT_IMPALE, Seconds(11)); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 0ac8abe225..c259954525 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -170,9 +170,9 @@ class boss_svala : public CreatureScript instance->SetGuidData(DATA_SACRIFICED_PLAYER, ObjectGuid::Empty); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 5d4b39c7dd..e4b8f32071 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -138,9 +138,9 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BANE, urand(18000, 23000), EVENT_GROUP_BASE_SPELLS); events.ScheduleEvent(EVENT_FETID_ROT, urand(8000, 13000), EVENT_GROUP_BASE_SPELLS); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 52c7af4efa..45c1d31f2d 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -76,14 +76,14 @@ class boss_archavon : public CreatureScript { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); events.ScheduleEvent(EVENT_STOMP, 45000); events.ScheduleEvent(EVENT_BERSERK, 300000); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } // Below UpdateAI may need review/debug. diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 2752b8eba2..8003819168 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -116,7 +116,7 @@ class boss_emalon : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 360000); events.ScheduleEvent(EVENT_OVERCHARGE, 45000); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index b87a7e6dad..59b7e19179 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -60,7 +60,7 @@ class boss_koralon : public CreatureScript { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { DoCast(me, SPELL_BURNING_FURY); @@ -69,7 +69,7 @@ class boss_koralon : public CreatureScript events.ScheduleEvent(EVENT_METEOR_FISTS, 75000); // 1st after 75sec, then every 45sec events.ScheduleEvent(EVENT_FLAME_CINDER, 30000); /// @todo check timer - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 1bc03cb8b0..afc605260c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -67,15 +67,14 @@ class boss_toravon : public CreatureScript { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); DoCast(me, SPELL_FROZEN_MALLET); events.ScheduleEvent(EVENT_FROZEN_ORB, 11000); events.ScheduleEvent(EVENT_WHITEOUT, 13000); events.ScheduleEvent(EVENT_FREEZING_GROUND, 15000); - - _JustEngagedWith(); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 4807a0fbcb..8a33f89ac5 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -105,10 +105,10 @@ class boss_nexusprince_shaffar : public CreatureScript } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BEACON, 10000); events.ScheduleEvent(EVENT_FIREBALL, 8000); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index ef765e3857..4c802d136e 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -67,9 +67,9 @@ public: Talk(SAY_KILL); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_DARK_SHELL, 20000); events.ScheduleEvent(EVENT_VOID_BLAST, urand(8000, 23000)); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index 31e04b0f0c..599650544d 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp @@ -85,9 +85,9 @@ class boss_anzu : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000); } diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index 427e009c80..7f34cf9491 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -88,9 +88,9 @@ public: _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4000); events.ScheduleEvent(EVENT_FROST_SHOCK, 6000); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index 7f49f33bcd..0258d968ed 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -81,9 +81,9 @@ public: BossAI::MoveInLineOfSight(who); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5000); events.ScheduleEvent(EVENT_POLYMORPH, 8000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index b2318b1658..bb78b34169 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -80,9 +80,9 @@ struct boss_blackheart_the_inciter : public BossAI _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000); events.ScheduleEvent(EVENT_WAR_STOMP, 15000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index b834c24c1a..be66b5bb3d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -137,9 +137,9 @@ class boss_grandmaster_vorpil : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); if (IsHeroic()) events.ScheduleEvent(EVENT_BANISH, 17000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index c27e3f1cda..d28859aea0 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -84,16 +84,6 @@ class boss_murmur : public CreatureScript me->ResetPlayerDamageReq(); } - void JustEngagedWith(Unit* /*who*/) override - { - _JustEngagedWith(); - } - - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 399b66f4db..039f128be4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -130,10 +130,10 @@ public: BossAI::AttackStart(who); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); - _JustEngagedWith(); events.ScheduleEvent(EVENT_BERSERK, Minutes(10)); events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60)); ScheduleEvents(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 10a7e2a8be..9b0f756ec4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -474,9 +474,9 @@ public: akama->AI()->DoAction(ACTION_ACTIVE_AKAMA_INTRO); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetCanDualWield(true); if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER)) musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index d036f98efd..fd59019068 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -148,12 +148,12 @@ public: DoCastSelf(SPELL_EMPYREAL_BALANCE, true); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { if (!_inCombat) { _inCombat = true; - _JustEngagedWith(); + _JustEngagedWith(who); for (uint32 bossData : CouncilData) { if (Creature* council = instance->GetCreature(bossData)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b714109055..c49f9c62b8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -122,9 +122,9 @@ public: _enraged = false; } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCING_SHRIEK, Seconds(22)); events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, Seconds(15)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index d3d60508c9..16aefbc671 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -87,9 +87,9 @@ public: _DespawnAtEvade(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); ChangePhase(); events.ScheduleEvent(EVENT_BERSERK, Minutes(15)); events.ScheduleEvent(EVENT_FLAME, Seconds(20)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index a32240f5ed..a9b02fcffc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -127,9 +127,9 @@ public: } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.SetPhase(PHASE_COMBAT); events.ScheduleEvent(EVENT_ENRAGE, Minutes(10)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index b2099c4cca..b9b38577e1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -100,9 +100,9 @@ public: } } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_NEEDLE, Seconds(2)); events.ScheduleEvent(EVENT_SHIELD, Seconds(60)); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 885837bf2b..027518c0a6 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -67,10 +67,10 @@ class boss_hydromancer_thespia : public CreatureScript Talk(SAY_SLAY); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000); events.ScheduleEvent(EVENT_LUNG_BURST, 7000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index d86eb99be9..d288f032a4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -181,9 +181,9 @@ public: me->SetControlled(true, UNIT_STATE_ROOT); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_INITIAL_EMERGE, Milliseconds(4)); events.ScheduleEvent(EVENT_SYNCH_HEALTH, Seconds(3)); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp index 985188a19c..a61f2d9deb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp @@ -71,9 +71,9 @@ class boss_mennu_the_betrayer : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000); events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20000); events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 60000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp index de39f52e5e..c8dac8cdfa 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp @@ -61,9 +61,9 @@ class boss_quagmirran : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ACID_SPRAY, 25000); events.ScheduleEvent(EVENT_CLEAVE, 9000); events.ScheduleEvent(EVENT_UPPERCUT, 20000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp index 6e0a796d02..7e9b854238 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp @@ -69,9 +69,9 @@ class boss_rokmar_the_crackler : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000); events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20000); events.ScheduleEvent(EVENT_WATER_SPIT, 14000); diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 59ff2a295a..a61e9bad2c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -104,9 +104,9 @@ class boss_gruul : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 6737999545..6a0525e2d9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -61,9 +61,9 @@ class boss_broggok : public CreatureScript DoAction(ACTION_RESET_BROGGOK); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 507049cdf0..388a0cc386 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -101,7 +101,7 @@ class boss_kelidan_the_breaker : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_WAKE); if (me->IsNonMeleeSpellCast(false)) me->InterruptNonMeleeSpells(true); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 14336a9a91..825482293c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -51,9 +51,9 @@ class boss_the_maker : public CreatureScript { boss_the_makerAI(Creature* creature) : BossAI(creature, DATA_THE_MAKER) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ACID_SPRAY, 15000); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index b2d4099767..72cf62671e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -86,9 +86,9 @@ class boss_omor_the_unscarred : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 60370153af..65f49334fc 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -227,10 +227,10 @@ class boss_vazruden : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void KilledUnit(Unit* who) override diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 1f5dd5aa32..85020e64ac 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -75,12 +75,12 @@ class boss_watchkeeper_gargolmar : public CreatureScript _Reset(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); events.ScheduleEvent(EVENT_SURGE, 4000); - _JustEngagedWith(); } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 4841bd1b03..4af439b6a5 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -142,9 +142,9 @@ class boss_alar : public CreatureScript me->setActive(false); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); me->SetDisableGravity(true); // after enterevademode will be set walk movement me->setActive(true); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 56a24bc5be..2e54146b7c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -169,10 +169,10 @@ class boss_high_astromancer_solarian : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); } void SummonMinion(uint32 entry, float x, float y, float z) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 8d0d2db8f2..c0cc43148e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -79,10 +79,10 @@ class boss_void_reaver : public CreatureScript _JustDied(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_POUNDING, 15000); events.ScheduleEvent(EVENT_ARCANE_ORB, 3000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 8b8c9e1302..123fbd97e0 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -65,9 +65,9 @@ class boss_gatewatcher_gyrokill : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); events.ScheduleEvent(EVENT_SAW_BLADE, 20000); events.ScheduleEvent(EVENT_SHADOW_POWER, 25000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index a820969383..8e26a24b0d 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -61,9 +61,9 @@ class boss_gatewatcher_iron_hand : public CreatureScript { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000); events.ScheduleEvent(EVENT_JACKHAMMER, 45000); events.ScheduleEvent(EVENT_SHADOW_POWER, 25000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 8cd021f1e3..8aba44db57 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -76,9 +76,9 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(YELL_AGGRO); events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 4a98b68380..aa60d13de9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -70,7 +70,7 @@ class boss_nethermancer_sepethrea : public CreatureScript void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000)); events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000)); events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000)); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 4761561342..95c0ecd955 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -75,9 +75,9 @@ class boss_pathaleon_the_calculator : public CreatureScript { boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON, 30000); events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000)); events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000)); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index 012fb80566..843830efdf 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -84,9 +84,9 @@ class boss_dalliah_the_doomsayer : public CreatureScript soccothrates->AI()->SetData(1, 1); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000)); events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000)); if (IsHeroic()) diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index ae670817e9..49919f1be4 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -111,9 +111,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript dalliah->AI()->SetData(1, 1); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000)); events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000)); events.ScheduleEvent(EVENT_ME_FIRST, 6000); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index bcdb6d88d2..9b9620984a 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -61,9 +61,9 @@ class boss_zereketh_the_unbound : public CreatureScript Talk(SAY_DEATH); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000)); events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000)); events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000)); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 3551cd1e7d..0474aedc3b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -67,9 +67,9 @@ class boss_commander_sarannis : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_RESONANCE, 42700); events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 20647f08ae..6e9eb7387b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -68,9 +68,9 @@ class boss_thorngrin_the_tender : public CreatureScript Initialize(); } - void JustEngagedWith(Unit* /*who*/) override + void JustEngagedWith(Unit* who) override { - _JustEngagedWith(); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SACRIFICE, 5700); events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000);