From bd6034e1a9f5ba18dff1261edaea4494727412a2 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Mon, 13 Feb 2023 21:39:40 +0100 Subject: [PATCH 01/32] =?UTF-8?q?refactor(Core/AI):=20Some=20more=20refact?= =?UTF-8?q?oring=20prep=20for=20Comat=20Threat=20system=E2=80=A6=20(#15026?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Treeston <14020072+Treeston@users.noreply.github.com> --- src/server/game/AI/CoreAI/CombatAI.cpp | 14 ++++++-- src/server/game/AI/CoreAI/CombatAI.h | 4 +-- src/server/game/AI/CoreAI/PassiveAI.cpp | 2 +- src/server/game/AI/CoreAI/PassiveAI.h | 2 +- src/server/game/AI/CoreAI/UnitAI.h | 15 ++++++++ src/server/game/AI/CreatureAI.h | 6 ++-- .../game/AI/ScriptedAI/ScriptedCreature.cpp | 4 +-- .../game/AI/ScriptedAI/ScriptedCreature.h | 12 +++---- src/server/game/AI/SmartScripts/SmartAI.cpp | 2 +- src/server/game/AI/SmartScripts/SmartAI.h | 2 +- src/server/game/Entities/Unit/Unit.cpp | 2 +- .../AlteracValley/boss_balinda.cpp | 2 +- .../AlteracValley/boss_drekthar.cpp | 2 +- .../AlteracValley/boss_galvangar.cpp | 2 +- .../AlteracValley/boss_vanndar.cpp | 2 +- .../boss_ambassador_flamelash.cpp | 2 +- .../BlackrockDepths/boss_anubshiah.cpp | 4 +-- .../boss_emperor_dagran_thaurissan.cpp | 2 +- .../BlackrockDepths/boss_eviscerator.cpp | 4 +-- .../boss_general_angerforge.cpp | 2 +- .../boss_gorosh_the_dervish.cpp | 4 +-- .../BlackrockDepths/boss_grizzle.cpp | 4 +-- .../BlackrockDepths/boss_hedrum.cpp | 4 +-- .../boss_high_interrogator_gerstahn.cpp | 2 +- .../BlackrockDepths/boss_magmus.cpp | 4 +-- .../boss_moira_bronzebeard.cpp | 8 ++--- .../BlackrockDepths/boss_okthor.cpp | 4 +-- .../BlackrockDepths/boss_tomb_of_seven.cpp | 2 +- .../BlackrockSpire/boss_drakkisath.cpp | 4 +-- .../BlackrockSpire/boss_gyth.cpp | 4 +-- .../BlackrockSpire/boss_halycon.cpp | 4 +-- .../BlackrockSpire/boss_highlord_omokk.cpp | 4 +-- .../BlackrockSpire/boss_lord_valthalak.cpp | 4 +-- .../BlackrockSpire/boss_mor_grayhoof.cpp | 4 +-- .../boss_overlord_wyrmthalak.cpp | 4 +-- .../boss_pyroguard_emberseer.cpp | 4 +-- .../boss_quartermaster_zigris.cpp | 4 +-- .../BlackrockSpire/boss_rend_blackhand.cpp | 4 +-- .../boss_solakar_flamewreath.cpp | 6 ++-- .../BlackrockSpire/boss_the_beast.cpp | 4 +-- .../BlackrockSpire/boss_urok_doomhowl.cpp | 4 +-- .../BlackrockSpire/boss_warmaster_voone.cpp | 4 +-- .../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 | 4 +-- .../BlackwingLair/boss_razorgore.cpp | 4 +-- .../BlackwingLair/boss_vaelastrasz.cpp | 4 +-- .../MoltenCore/boss_baron_geddon.cpp | 4 +-- .../MoltenCore/boss_garr.cpp | 4 +-- .../MoltenCore/boss_gehennas.cpp | 4 +-- .../MoltenCore/boss_lucifron.cpp | 4 +-- .../MoltenCore/boss_magmadar.cpp | 4 +-- .../MoltenCore/boss_majordomo_executus.cpp | 4 +-- .../MoltenCore/boss_ragnaros.cpp | 4 +-- .../MoltenCore/boss_shazzrah.cpp | 4 +-- .../MoltenCore/boss_sulfuron_harbinger.cpp | 6 ++-- .../MoltenCore/molten_core.cpp | 2 +- .../Deadmines/boss_mr_smite.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_curator.cpp | 4 +-- .../Karazhan/boss_maiden_of_virtue.cpp | 4 +-- .../Karazhan/boss_midnight.cpp | 4 +-- .../EasternKingdoms/Karazhan/boss_moroes.cpp | 4 +-- .../Karazhan/boss_netherspite.cpp | 2 +- .../Karazhan/boss_nightbane.cpp | 2 +- .../Karazhan/boss_prince_malchezaar.cpp | 6 ++-- .../Karazhan/boss_servant_quarters.cpp | 2 +- .../Karazhan/boss_shade_of_aran.cpp | 4 +-- .../Karazhan/boss_terestian_illhoof.cpp | 8 ++--- .../EasternKingdoms/Karazhan/bosses_opera.cpp | 20 +++++------ .../EasternKingdoms/Karazhan/karazhan.cpp | 4 +-- .../boss_felblood_kaelthas.cpp | 2 +- .../boss_priestess_delrissa.cpp | 36 +++++++++---------- .../MagistersTerrace/boss_selin_fireheart.cpp | 2 +- .../MagistersTerrace/boss_vexallus.cpp | 2 +- .../ScarletEnclave/chapter1.cpp | 2 +- .../ScarletEnclave/chapter2.cpp | 6 ++-- .../ScarletEnclave/chapter5.cpp | 2 +- .../instance_scarlet_monastery.cpp | 4 +-- .../Scholomance/boss_darkmaster_gandling.cpp | 2 +- .../Scholomance/boss_kirtonos_the_herald.cpp | 2 +- .../Scholomance/boss_kormok.cpp | 2 +- .../Scholomance/instance_scholomance.cpp | 2 +- .../Stratholme/boss_baroness_anastari.cpp | 2 +- .../Stratholme/boss_jarien_and_sothos.cpp | 8 ++--- .../SunwellPlateau/boss_brutallus.cpp | 4 +-- .../SunwellPlateau/boss_eredar_twins.cpp | 8 ++--- .../SunwellPlateau/boss_felmyst.cpp | 4 +-- .../SunwellPlateau/boss_kalecgos.cpp | 8 ++--- .../SunwellPlateau/boss_kiljaeden.cpp | 2 +- .../SunwellPlateau/boss_muru.cpp | 6 ++-- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 4 +-- .../EasternKingdoms/ZulAman/boss_halazzi.cpp | 4 +-- .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 4 +-- .../EasternKingdoms/ZulAman/boss_janalai.cpp | 8 ++--- .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_zuljin.cpp | 4 +-- .../EasternKingdoms/ZulAman/zulaman.cpp | 6 ++-- .../EasternKingdoms/ZulGurub/boss_arlokk.cpp | 6 ++-- .../ZulGurub/boss_gahzranka.cpp | 4 +-- .../EasternKingdoms/ZulGurub/boss_grilek.cpp | 4 +-- .../EasternKingdoms/ZulGurub/boss_hakkar.cpp | 4 +-- .../ZulGurub/boss_hazzarah.cpp | 4 +-- .../EasternKingdoms/ZulGurub/boss_jeklik.cpp | 6 ++-- .../EasternKingdoms/ZulGurub/boss_jindo.cpp | 8 ++--- .../ZulGurub/boss_mandokir.cpp | 10 +++--- .../EasternKingdoms/ZulGurub/boss_marli.cpp | 6 ++-- .../ZulGurub/boss_renataki.cpp | 4 +-- .../EasternKingdoms/ZulGurub/boss_thekal.cpp | 8 ++--- .../EasternKingdoms/ZulGurub/boss_venoxis.cpp | 6 ++-- .../ZulGurub/boss_wushoolay.cpp | 4 +-- .../EasternKingdoms/zone_arathi_highlands.cpp | 2 +- .../scripts/EasternKingdoms/zone_duskwood.cpp | 2 +- .../EasternKingdoms/zone_ghostlands.cpp | 4 +-- .../EasternKingdoms/zone_hinterlands.cpp | 2 +- .../zone_isle_of_queldanas.cpp | 2 +- .../zone_silverpine_forest.cpp | 4 +-- .../EasternKingdoms/zone_stormwind_city.cpp | 4 +-- .../zone_stranglethorn_vale.cpp | 2 +- .../EasternKingdoms/zone_tirisfal_glades.cpp | 2 +- .../EasternKingdoms/zone_undercity.cpp | 4 +-- .../zone_western_plaguelands.cpp | 2 +- .../scripts/EasternKingdoms/zone_wetlands.cpp | 2 +- src/server/scripts/Events/brewfest.cpp | 14 ++++---- src/server/scripts/Events/hallows_end.cpp | 6 ++-- .../BattleForMountHyjal/boss_anetheron.cpp | 4 +-- .../BattleForMountHyjal/boss_archimonde.cpp | 8 ++--- .../BattleForMountHyjal/boss_azgalor.cpp | 4 +-- .../BattleForMountHyjal/boss_kazrogal.cpp | 2 +- .../boss_rage_winterchill.cpp | 2 +- .../BattleForMountHyjal/hyjalAI.cpp | 2 +- .../BattleForMountHyjal/hyjalAI.h | 2 +- .../BattleForMountHyjal/hyjal_trash.cpp | 18 +++++----- .../CullingOfStratholme/boss_epoch.cpp | 2 +- .../CullingOfStratholme/boss_infinite.cpp | 2 +- .../CullingOfStratholme/boss_mal_ganis.cpp | 2 +- .../CullingOfStratholme/boss_meathook.cpp | 2 +- .../CullingOfStratholme/boss_salramm.cpp | 2 +- .../culling_of_stratholme.cpp | 4 +-- .../boss_captain_skarloc.cpp | 2 +- .../boss_epoch_hunter.cpp | 2 +- .../boss_lieutenant_drake.cpp | 2 +- .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp | 2 +- .../TheBlackMorass/boss_aeonus.cpp | 2 +- .../TheBlackMorass/boss_chrono_lord_deja.cpp | 2 +- .../TheBlackMorass/boss_temporus.cpp | 2 +- .../Kalimdor/DireMaul/boss_isalien.cpp | 4 +-- .../Kalimdor/OnyxiasLair/boss_onyxia.cpp | 6 ++-- .../Kalimdor/RazorfenDowns/razorfen_downs.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp | 4 +-- .../Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 6 ++-- .../Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 4 +-- .../RuinsOfAhnQiraj/boss_ossirian.cpp | 6 ++-- .../Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 6 ++-- .../RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp | 4 +-- .../TempleOfAhnQiraj/boss_bug_trio.cpp | 8 ++--- .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 14 ++++---- .../TempleOfAhnQiraj/boss_fankriss.cpp | 4 +-- .../TempleOfAhnQiraj/boss_huhuran.cpp | 4 +-- .../Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp | 6 ++-- .../TempleOfAhnQiraj/boss_sartura.cpp | 6 ++-- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 4 +-- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 12 +++---- .../TempleOfAhnQiraj/boss_viscidus.cpp | 4 +-- .../mob_anubisath_sentinel.cpp | 2 +- .../TempleOfAhnQiraj/temple_of_ahnqiraj.cpp | 12 +++---- src/server/scripts/Kalimdor/boss_azuregos.cpp | 2 +- .../scripts/Kalimdor/zone_ashenvale.cpp | 2 +- src/server/scripts/Kalimdor/zone_azshara.cpp | 6 ++-- .../scripts/Kalimdor/zone_azuremyst_isle.cpp | 6 ++-- .../scripts/Kalimdor/zone_bloodmyst_isle.cpp | 2 +- .../scripts/Kalimdor/zone_darkshore.cpp | 4 +-- src/server/scripts/Kalimdor/zone_durotar.cpp | 2 +- .../scripts/Kalimdor/zone_moonglade.cpp | 4 +-- .../scripts/Kalimdor/zone_orgrimmar.cpp | 4 +-- src/server/scripts/Kalimdor/zone_silithus.cpp | 2 +- src/server/scripts/Kalimdor/zone_tanaris.cpp | 4 +-- .../scripts/Kalimdor/zone_the_barrens.cpp | 6 ++-- .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 4 +-- .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 4 +-- .../boss_krikthir_the_gatewatcher.cpp | 4 +-- .../AzjolNerub/ahnkahet/boss_amanitar.cpp | 4 +-- .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp | 4 +-- .../ahnkahet/boss_herald_volazj.cpp | 4 +-- .../ahnkahet/boss_jedoga_shadowseeker.cpp | 4 +-- .../ahnkahet/boss_prince_taldaram.cpp | 6 ++-- .../ObsidianSanctum/boss_sartharion.cpp | 6 ++-- .../boss_baltharus_the_warborn.cpp | 6 ++-- .../RubySanctum/boss_general_zarithrian.cpp | 6 ++-- .../RubySanctum/boss_halion.cpp | 6 ++-- .../RubySanctum/boss_saviana_ragefire.cpp | 4 +-- .../boss_argent_challenge.cpp | 6 ++-- .../TrialOfTheChampion/boss_black_knight.cpp | 2 +- .../boss_grand_champions.cpp | 6 ++-- .../boss_anubarak_trial.cpp | 4 +-- .../boss_faction_champions.cpp | 2 +- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 2 +- .../boss_northrend_beasts.cpp | 8 ++--- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 2 +- .../Northrend/DraktharonKeep/boss_dred.cpp | 4 +-- .../Northrend/DraktharonKeep/boss_novos.cpp | 4 +-- .../DraktharonKeep/boss_tharon_ja.cpp | 4 +-- .../DraktharonKeep/boss_trollgore.cpp | 2 +- .../ForgeOfSouls/boss_bronjahm.cpp | 2 +- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 2 +- .../HallsOfReflection/boss_falric.cpp | 2 +- .../HallsOfReflection/boss_marwyn.cpp | 2 +- .../HallsOfReflection/halls_of_reflection.cpp | 18 +++++----- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 2 +- .../PitOfSaron/boss_krickandick.cpp | 2 +- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 2 +- .../Gundrak/boss_drakkari_colossus.cpp | 6 ++-- .../scripts/Northrend/Gundrak/boss_eck.cpp | 4 +-- .../Northrend/Gundrak/boss_gal_darah.cpp | 4 +-- .../Northrend/Gundrak/boss_moorabi.cpp | 4 +-- .../Northrend/Gundrak/boss_slad_ran.cpp | 4 +-- .../boss_blood_prince_council.cpp | 6 ++-- .../boss_blood_queen_lana_thel.cpp | 2 +- .../boss_deathbringer_saurfang.cpp | 2 +- .../IcecrownCitadel/boss_festergut.cpp | 4 +-- .../boss_icecrown_gunship_battle.cpp | 6 ++-- .../boss_lady_deathwhisper.cpp | 8 ++--- .../IcecrownCitadel/boss_lord_marrowgar.cpp | 2 +- .../boss_professor_putricide.cpp | 2 +- .../IcecrownCitadel/boss_rotface.cpp | 4 +-- .../IcecrownCitadel/boss_sindragosa.cpp | 8 ++--- .../IcecrownCitadel/boss_the_lich_king.cpp | 2 +- .../boss_valithria_dreamwalker.cpp | 4 +-- .../IcecrownCitadel/icecrown_citadel.cpp | 20 +++++------ .../Northrend/Naxxramas/boss_anubrekhan.cpp | 4 +-- .../Northrend/Naxxramas/boss_faerlina.cpp | 4 +-- .../Naxxramas/boss_four_horsemen.cpp | 4 +-- .../Northrend/Naxxramas/boss_gluth.cpp | 4 +-- .../Northrend/Naxxramas/boss_gothik.cpp | 6 ++-- .../Northrend/Naxxramas/boss_grobbulus.cpp | 4 +-- .../Northrend/Naxxramas/boss_heigan.cpp | 4 +-- .../Northrend/Naxxramas/boss_kelthuzad.cpp | 6 ++-- .../Northrend/Naxxramas/boss_loatheb.cpp | 4 +-- .../Northrend/Naxxramas/boss_maexxna.cpp | 4 +-- .../scripts/Northrend/Naxxramas/boss_noth.cpp | 4 +-- .../Northrend/Naxxramas/boss_patchwerk.cpp | 4 +-- .../Northrend/Naxxramas/boss_razuvious.cpp | 6 ++-- .../Northrend/Naxxramas/boss_sapphiron.cpp | 4 +-- .../Northrend/Naxxramas/boss_thaddius.cpp | 8 ++--- .../Nexus/EyeOfEternity/boss_malygos.cpp | 4 +-- .../Northrend/Nexus/Nexus/boss_anomalus.cpp | 4 +-- .../boss_commander_stoutbeard_kolurg.cpp | 4 +-- .../Nexus/Nexus/boss_keristrasza.cpp | 4 +-- .../Nexus/Nexus/boss_magus_telestra.cpp | 4 +-- .../Northrend/Nexus/Nexus/boss_ormorok.cpp | 4 +-- .../Northrend/Nexus/Nexus/instance_nexus.cpp | 2 +- .../Northrend/Nexus/Oculus/boss_drakos.cpp | 2 +- .../Northrend/Nexus/Oculus/boss_eregos.cpp | 2 +- .../Northrend/Nexus/Oculus/boss_urom.cpp | 2 +- .../Northrend/Nexus/Oculus/boss_varos.cpp | 2 +- .../scripts/Northrend/Nexus/Oculus/oculus.cpp | 2 +- .../HallsOfLightning/boss_bjarngrim.cpp | 4 +-- .../Ulduar/HallsOfLightning/boss_ionar.cpp | 2 +- .../Ulduar/HallsOfLightning/boss_loken.cpp | 2 +- .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 4 +-- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 2 +- .../HallsOfStone/boss_maiden_of_grief.cpp | 2 +- .../Ulduar/HallsOfStone/boss_sjonnir.cpp | 6 ++-- .../Ulduar/HallsOfStone/brann_bronzebeard.cpp | 6 ++-- .../Ulduar/boss_algalon_the_observer.cpp | 2 +- .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 6 ++-- .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 4 +-- .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_freya.cpp | 10 +++--- .../Ulduar/Ulduar/boss_general_vezax.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_hodir.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_ignis.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 2 +- .../Ulduar/Ulduar/boss_razorscale.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_thorim.cpp | 14 ++++---- .../Northrend/Ulduar/Ulduar/boss_xt002.cpp | 2 +- .../Northrend/Ulduar/Ulduar/ulduar.cpp | 2 +- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 2 +- .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 2 +- .../UtgardeKeep/boss_skarvald_dalronn.cpp | 4 +-- .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 2 +- .../UtgardePinnacle/boss_palehoof.cpp | 10 +++--- .../UtgardePinnacle/boss_skadi.cpp | 4 +-- .../UtgardePinnacle/boss_svala.cpp | 2 +- .../UtgardePinnacle/boss_ymiron.cpp | 2 +- .../VaultOfArchavon/boss_archavon.cpp | 2 +- .../Northrend/VaultOfArchavon/boss_emalon.cpp | 2 +- .../VaultOfArchavon/boss_koralon.cpp | 2 +- .../VaultOfArchavon/boss_toravon.cpp | 4 +-- .../Northrend/VioletHold/boss_cyanigosa.cpp | 2 +- .../Northrend/VioletHold/boss_erekem.cpp | 4 +-- .../Northrend/VioletHold/boss_ichoron.cpp | 2 +- .../Northrend/VioletHold/boss_lavanthor.cpp | 2 +- .../Northrend/VioletHold/boss_moragg.cpp | 2 +- .../Northrend/VioletHold/boss_xevozz.cpp | 2 +- .../Northrend/VioletHold/boss_zuramat.cpp | 2 +- .../Northrend/VioletHold/violet_hold.cpp | 2 +- .../scripts/Northrend/isle_of_conquest.cpp | 2 +- .../scripts/Northrend/zone_borean_tundra.cpp | 8 ++--- src/server/scripts/Northrend/zone_dalaran.cpp | 6 ++-- .../scripts/Northrend/zone_dragonblight.cpp | 2 +- .../scripts/Northrend/zone_grizzly_hills.cpp | 6 ++-- .../scripts/Northrend/zone_icecrown.cpp | 2 +- .../scripts/Northrend/zone_sholazar_basin.cpp | 2 +- .../scripts/Northrend/zone_storm_peaks.cpp | 6 ++-- src/server/scripts/Northrend/zone_zuldrak.cpp | 2 +- src/server/scripts/OutdoorPvP/OutdoorPvPNA.h | 2 +- src/server/scripts/OutdoorPvP/OutdoorPvPZM.h | 2 +- .../AuchenaiCrypts/boss_exarch_maladaar.cpp | 2 +- .../boss_shirrak_the_dead_watcher.cpp | 2 +- .../ManaTombs/boss_nexusprince_shaffar.cpp | 4 +-- .../Auchindoun/ManaTombs/boss_pandemonius.cpp | 2 +- .../SethekkHalls/boss_talon_king_ikiss.cpp | 4 +-- .../boss_ambassador_hellmaw.cpp | 2 +- .../boss_blackheart_the_inciter.cpp | 2 +- .../boss_grandmaster_vorpil.cpp | 2 +- .../ShadowLabyrinth/boss_murmur.cpp | 2 +- .../Outland/BlackTemple/boss_bloodboil.cpp | 4 +-- .../Outland/BlackTemple/boss_illidan.cpp | 4 +-- .../BlackTemple/boss_mother_shahraz.cpp | 4 +-- .../BlackTemple/boss_reliquary_of_souls.cpp | 10 +++--- .../BlackTemple/boss_shade_of_akama.cpp | 6 ++-- .../Outland/BlackTemple/boss_supremus.cpp | 4 +-- .../BlackTemple/boss_teron_gorefiend.cpp | 4 +-- .../BlackTemple/boss_warlord_najentus.cpp | 4 +-- .../Outland/BlackTemple/illidari_council.cpp | 18 +++++----- .../boss_fathomlord_karathress.cpp | 4 +-- .../boss_hydross_the_unstable.cpp | 4 +-- .../SerpentShrine/boss_lady_vashj.cpp | 4 +-- .../boss_leotheras_the_blind.cpp | 4 +-- .../SerpentShrine/boss_lurker_below.cpp | 2 +- .../boss_morogrim_tidewalker.cpp | 4 +-- .../SlavePens/boss_ahune.cpp | 2 +- .../SteamVault/boss_hydromancer_thespia.cpp | 2 +- .../SteamVault/boss_mekgineer_steamrigger.cpp | 2 +- .../SteamVault/boss_warlord_kalithresh.cpp | 2 +- .../underbog/boss_ghazan.cpp | 4 +-- .../underbog/boss_hungarfen.cpp | 4 +-- .../underbog/boss_the_black_stalker.cpp | 4 +-- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 4 +-- .../GruulsLair/boss_high_king_maulgar.cpp | 12 +++---- .../BloodFurnace/boss_broggok.cpp | 4 +-- .../BloodFurnace/boss_kelidan_the_breaker.cpp | 4 +-- .../BloodFurnace/boss_the_maker.cpp | 2 +- .../boss_omor_the_unscarred.cpp | 4 +-- .../boss_vazruden_the_herald.cpp | 4 +-- .../boss_watchkeeper_gargolmar.cpp | 4 +-- .../MagtheridonsLair/boss_magtheridon.cpp | 4 +-- .../ShatteredHalls/boss_nethekurse.cpp | 2 +- .../ShatteredHalls/boss_warbringer_omrogg.cpp | 4 +-- .../boss_warchief_kargath_bladefist.cpp | 4 +-- .../Outland/TempestKeep/Eye/boss_alar.cpp | 4 +-- .../TempestKeep/Eye/boss_astromancer.cpp | 4 +-- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 4 +-- .../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 | 6 ++-- .../boss_pathaleon_the_calculator.cpp | 4 +-- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 4 +-- .../arcatraz/boss_dalliah_the_doomsayer.cpp | 4 +-- .../arcatraz/boss_harbinger_skyriss.cpp | 2 +- .../boss_wrath_scryer_soccothrates.cpp | 4 +-- .../arcatraz/boss_zereketh_the_unbound.cpp | 4 +-- .../botanica/boss_commander_sarannis.cpp | 4 +-- .../botanica/boss_high_botanist_freywinn.cpp | 4 +-- .../Outland/TempestKeep/botanica/boss_laj.cpp | 4 +-- .../botanica/boss_thorngrin_the_tender.cpp | 4 +-- .../botanica/boss_warp_splinter.cpp | 4 +-- .../scripts/Outland/boss_doomlord_kazzak.cpp | 2 +- .../scripts/Outland/boss_doomwalker.cpp | 2 +- .../Outland/zone_blades_edge_mountains.cpp | 6 ++-- .../Outland/zone_hellfire_peninsula.cpp | 2 +- src/server/scripts/Outland/zone_nagrand.cpp | 6 ++-- .../scripts/Outland/zone_netherstorm.cpp | 24 ++++++------- .../Outland/zone_shadowmoon_valley.cpp | 12 +++---- .../scripts/Outland/zone_shattrath_city.cpp | 2 +- .../scripts/Outland/zone_terokkar_forest.cpp | 8 ++--- .../scripts/Outland/zone_zangarmarsh.cpp | 4 +-- src/server/scripts/Pet/pet_dk.cpp | 2 +- src/server/scripts/Pet/pet_shaman.cpp | 4 +-- src/server/scripts/Spells/spell_generic.cpp | 2 +- src/server/scripts/Spells/spell_hunter.cpp | 2 +- .../scripts/World/boss_emerald_dragons.cpp | 16 ++++----- .../scripts/World/mob_generic_creature.cpp | 2 +- .../scripts/World/npc_stave_of_ancients.cpp | 26 +++++++------- src/server/scripts/World/npcs_special.cpp | 20 +++++------ 391 files changed, 873 insertions(+), 846 deletions(-) diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index c1c5a7d19..507b7c225 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -68,7 +68,12 @@ void CombatAI::JustDied(Unit* killer) me->CastSpell(killer, *i, true); } -void CombatAI::EnterCombat(Unit* who) +/** + * @brief Called for reaction when initially engaged + * + * @param who Who 'me' Engaged combat with + */ +void CombatAI::JustEngagedWith(Unit* who) { for (SpellVct::iterator i = spells.begin(); i != spells.end(); ++i) { @@ -114,7 +119,12 @@ void CasterAI::InitializeAI() m_attackDist = MELEE_RANGE; } -void CasterAI::EnterCombat(Unit* who) +/** + * @brief Called for reaction when initially engaged + * + * @param who Who 'me' Engaged combat with + */ +void CasterAI::JustEngagedWith(Unit* who) { if (spells.empty()) return; diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 6f5825385..19dbd4618 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -43,7 +43,7 @@ public: void InitializeAI() override; void Reset() override; - void EnterCombat(Unit* who) override; + void JustEngagedWith(Unit* who) override; void JustDied(Unit* killer) override; void UpdateAI(uint32 diff) override; @@ -61,7 +61,7 @@ public: void InitializeAI() override; void AttackStart(Unit* victim) override { AttackStartCaster(victim, m_attackDist); } void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) override; + void JustEngagedWith(Unit* /*who*/) override; private: float m_attackDist; }; diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index b14c39977..080827f1a 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -69,7 +69,7 @@ void PossessedAI::KilledUnit(Unit* /*victim*/) // victim->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); } -void CritterAI::EnterCombat(Unit* who) +void CritterAI::JustEngagedWith(Unit* who) { if (!me->HasUnitState(UNIT_STATE_FLEEING)) { diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index d3a713216..c9844cb98 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -68,7 +68,7 @@ class CritterAI : public PassiveAI public: explicit CritterAI(Creature* c) : PassiveAI(c) { } - void EnterCombat(Unit* /*who*/) override; + void JustEngagedWith(Unit* /*who*/) override; void EnterEvadeMode(EvadeReason why) override; void MovementInform(uint32 type, uint32 id) override; void UpdateAI(uint32 /*diff*/) override { } diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 5d6903cb5..ce7e8a177 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -332,6 +332,21 @@ public: targetList.resize(num); } + /** + * @brief Called when the unit enters combat + * (NOTE: Creature engage logic should NOT be here, but in JustEngagedWith, which happens once threat is established!) + * + * @todo Never invoked right now. Preparation for Combat Threat refactor + */ + virtual void JustEnteredCombat(Unit* /*who*/) { } + + /** + * @brief Called when the unit leaves combat + * + * @todo Never invoked right now. Preparation for Combat Threat refactor + */ + virtual void JustExitedCombat() { } + // Called at any Damage to any victim (before damage apply) virtual void DamageDealt(Unit* /*victim*/, uint32& /*damage*/, DamageEffectType /*damageType*/) { } diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 5cf63a319..993da42e2 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -116,8 +116,10 @@ public: // Called for reaction at stopping attack at no attackers or targets virtual void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER); - // Called for reaction when initially engaged - virtual void EnterCombat(Unit* /*victim*/) {} + /** + * @brief Called for reaction when initially engaged + */ + virtual void JustEngagedWith(Unit* /*who*/) {} // Called when the creature is killed virtual void JustDied(Unit* /*killer*/) {} diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index a02fa01fb..638c67c3a 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -593,7 +593,7 @@ void BossAI::_JustDied() } } -void BossAI::_EnterCombat() +void BossAI::_JustEngagedWith() { me->SetCombatPulseDelay(5); me->setActive(true); @@ -690,7 +690,7 @@ void WorldBossAI::_JustDied() summons.DespawnAll(); } -void WorldBossAI::_EnterCombat() +void WorldBossAI::_JustEngagedWith() { Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (target) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 86a2fd34e..f846a4367 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -278,9 +278,9 @@ struct ScriptedAI : public CreatureAI void Reset() override {} //Called at creature aggro either by MoveInLOS or Attack Start - void EnterCombat(Unit* /*victim*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} - // Called before EnterCombat even before the creature is in combat. + // Called before JustEngagedWith even before the creature is in combat. void AttackStart(Unit* /*target*/) override; // ************* @@ -455,13 +455,13 @@ public: virtual void ScheduleTasks() { } void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); } + void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override { _JustDied(); } void JustReachedHome() override { _JustReachedHome(); } protected: void _Reset(); - void _EnterCombat(); + void _JustEngagedWith(); void _JustDied(); void _JustReachedHome() { me->setActive(false); } @@ -493,12 +493,12 @@ public: virtual void ExecuteEvent(uint32 /*eventId*/) { } void Reset() override { _Reset(); } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); } + void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); } void JustDied(Unit* /*killer*/) override { _JustDied(); } protected: void _Reset(); - void _EnterCombat(); + void _JustEngagedWith(); void _JustDied(); EventMap events; diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 942041d08..e2c6828ef 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -787,7 +787,7 @@ void SmartAI::JustReachedHome() mJustReset = false; } -void SmartAI::EnterCombat(Unit* enemy) +void SmartAI::JustEngagedWith(Unit* enemy) { // Xinef: Interrupt channeled spells if (IsAIControlled()) diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index a74415035..93f942717 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -80,7 +80,7 @@ public: void JustReachedHome() override; // Called for reaction at enter to combat if not in combat yet (enemy can be nullptr) - void EnterCombat(Unit* enemy) override; + void JustEngagedWith(Unit* enemy) override; // Called for reaction at stopping attack at no attackers or targets void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER) override; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9d1b0a377..2c4cc920c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13675,7 +13675,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy, uint32 duration) if (enemy) { if (IsAIEnabled) - creature->AI()->EnterCombat(enemy); + creature->AI()->JustEngagedWith(enemy); if (creature->GetFormation()) creature->GetFormation()->MemberEngagingTarget(creature, enemy); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index b5f26c596..e79d9d13a 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -125,7 +125,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 45e5277e8..0732aca1f 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -67,7 +67,7 @@ public: Attacked = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 548d235a0..3f3b0ba74 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -59,7 +59,7 @@ public: ResetTimer = 5 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 4712b7574..3b97ce733 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -62,7 +62,7 @@ public: Attacked = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index 63ae9beda..9fc630ff1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -104,7 +104,7 @@ public: dwarfRune->SetGoState(state); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPELL_FIREBLAST, 2s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 104799fcb..896b65704 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -51,9 +51,9 @@ public: { boss_anubshiahAI(Creature* creature) : BossAI(creature, DATA_ANUBSHIAH) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_SHADOWBOLT, 0.2 * (int)TIMER_SHADOWBOLT); events.ScheduleEvent(SPELL_CURSE_TONGUES, 0.2 * (int)TIMER_CURSE_TONGUES); events.ScheduleEvent(SPELL_CURSE_WEAKNESS, 0.2 * (int)TIMER_CURSE_WEAKNESS); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index e7e00ce02..1fa25c3ca 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -51,7 +51,7 @@ public: boss_draganthaurissanAI(Creature* creature) : BossAI(creature, DATA_EMPEROR){} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (hasYelled != 5) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp index 5146adac1..06973abee 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp @@ -49,9 +49,9 @@ public: bool SpellShieldReady = false; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_SHADOWBOLT_VOLLEY, 0.2 * (int)TIMER_SHADOWBOLT_VOLLEY); events.ScheduleEvent(SPELL_REND, 0.2 * (int) TIMER_REND); events.ScheduleEvent(SPELL_SHIELD, 0.2 * (int) TIMER_SHIELD); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index fd73eed5b..3c969778b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -55,7 +55,7 @@ public: Medics = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SummonAdds(Unit* victim) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp index 96f7ba615..369941c61 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -49,9 +49,9 @@ public: uint32 nextWhirlwindTime; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_WHIRLWIND, 0.2 * (int) TIMER_WHIRLWIND); events.ScheduleEvent(SPELL_MORTALSTRIKE, 0.2 * (int) TIMER_MORTAL); events.ScheduleEvent(SPELL_BLOODLUST, 0.2 * (int) TIMER_BLOODLUST); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp index 919835e82..86846cddf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -48,9 +48,9 @@ public: uint32 nextTremorTime; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_GROUNDTREMOR, 0.2 * (int) TIMER_GROUNDTREMOR); events.ScheduleEvent(SPELL_FRENZY, 0.2 * (int) TIMER_FRENZY); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp index a7f384f47..83f50d0b8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp @@ -47,9 +47,9 @@ public: { boss_hedrumAI(Creature* creature) : BossAI(creature, DATA_HEDRUM) {} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_PARALYZING, 0.2 * (int) TIMER_PARALYZING); events.ScheduleEvent(SPELL_BANEFUL, 0.2 * (int) TIMER_BANEFUL); events.ScheduleEvent(SPELL_WEB_EXPLOSION, 0.2 * (int) TIMER_WEB_EXPLOSION); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 007e8d6be..68c3cd6c2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -54,7 +54,7 @@ public: ShadowShield_Timer = 8000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index 5791e97c7..a35b03d5c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -45,10 +45,10 @@ public: instance->SetData(TYPE_IRON_HALL, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(TYPE_IRON_HALL, IN_PROGRESS); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_WARSTOMP, 8s, 12s); events.ScheduleEvent(SPELL_FIERYBURST, 4s, 8s); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index ceeeffb7c..06891497b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -41,9 +41,9 @@ struct boss_moira_bronzebeardAI : public BossAI { // use a default value so we can inherit for priestess boss_moira_bronzebeardAI(Creature* creature, uint32 data = DATA_MOIRA) : BossAI(creature, data) {} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_MINDBLAST, 0.5 * (int) TIMER_MINDBLAST); events.ScheduleEvent(SPELL_HEAL, 0.5 * (int) TIMER_HEAL); events.ScheduleEvent(SPELL_RENEW, 0.5 * (int) TIMER_RENEW); @@ -103,9 +103,9 @@ struct boss_high_priestess_thaurissanAI : public boss_moira_bronzebeardAI { boss_high_priestess_thaurissanAI(Creature* creature) : boss_moira_bronzebeardAI(creature, DATA_PRIESTESS) {} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(0); events.ScheduleEvent(SPELL_WORDPAIN, 0.5 * (int)TIMER_WORDPAIN); events.ScheduleEvent(SPELL_HEAL, 0.5 * (int) TIMER_HEAL); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp index 38018f279..8b0052401 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp @@ -51,9 +51,9 @@ public: uint32 nextArcaneExplosionTime; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_ARCANE_BOLT, 0.2 * (int) TIMER_ARCANE_BOLT); events.ScheduleEvent(SPELL_ARCANE_EXPLOSION, 0.2 * (int) TIMER_ARCANE_EXPLOSION); events.ScheduleEvent(SPELL_POLYMORPH, 0.2 * (int) TIMER_POLYMORPH); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index 6948711eb..d3ac86617 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -191,7 +191,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPELL_SHADOWBOLTVOLLEY, 10s); _events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 18s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 4da05590b..1951846e8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -52,9 +52,9 @@ public: _conflagrateThreat = 0.0f; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAMESTRIKE, 6s); events.ScheduleEvent(EVENT_CLEAVE, 8s); events.ScheduleEvent(EVENT_CONFLAGRATION, 15s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 2342365be..aa44a665b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -70,9 +70,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CORROSIVE_ACID, 8s, 16s); events.ScheduleEvent(EVENT_FREEZE, 8s, 16s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index 12d8c0683..a75aca8fc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -52,9 +52,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_REND, 17s, 20s); events.ScheduleEvent(EVENT_THRASH, 10s, 12s); } 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 b2bc416d6..0bcaece06 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 EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FRENZY, 20s); events.ScheduleEvent(EVENT_KNOCK_AWAY, 18s); } 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 6eaf25ced..bb18ee33c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -74,9 +74,9 @@ public: StartTalking(TALK_SUMMON, 8 * IN_MILLISECONDS); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(TALK_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp index 1415d7096..bbf40c142 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp @@ -189,9 +189,9 @@ struct boss_mor_grayhoof : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); _scheduler.Schedule(5s, 10s, PHASE_HUMAN, [this](TaskContext context) { 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 c03252477..6bd951658 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -68,9 +68,9 @@ public: Summoned = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BLAST_WAVE, 20s); events.ScheduleEvent(EVENT_SHOUT, 2s); events.ScheduleEvent(EVENT_CLEAVE, 6s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index e8fe39e1f..faf5cf13e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -120,7 +120,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { // ### TODO Check combat timing ### events.ScheduleEvent(EVENT_FIRENOVA, 6s); @@ -376,7 +376,7 @@ public: _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1s); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { // Used to close doors if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) 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 8589199df..4ca0b2387 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -49,9 +49,9 @@ struct boss_quartermaster_zigris : public BossAI _hasDrunkPotion = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_STUN_BOMB, 16s); events.ScheduleEvent(EVENT_HOOKED_NET, 14s); events.ScheduleEvent(EVENT_SHOOT, 1s); 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 7dd8afcd3..5c9bdab64 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -158,9 +158,9 @@ public: summon->AI()->DoZoneInCombat(nullptr, 100.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 15s); events.ScheduleEvent(EVENT_CLEAVE, 15s, 17s); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17s, 19s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_solakar_flamewreath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_solakar_flamewreath.cpp index b7dbf0d8a..57b76bf01 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_solakar_flamewreath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_solakar_flamewreath.cpp @@ -65,7 +65,7 @@ public: targetEgg = nullptr; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(SPELL_HATCH_EGG, 1s); } @@ -181,9 +181,9 @@ public: DoZoneInCombat(nullptr, 100.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_WAR_STOMP, 17s, 20s); resetTimer = 0; } 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 7d86491d5..e4d0c9806 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -113,9 +113,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FLAME_BREAK, 12s); events.ScheduleEvent(EVENT_IMMOLATE, 3s); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23s); 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 081ca8ed6..d1815f6c6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -67,9 +67,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(SPELL_REND, 17s, 20s); events.ScheduleEvent(SPELL_STRIKE, 10s, 12s); events.ScheduleEvent(SPELL_INTIMIDATING_ROAR, 25s, 30s); 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 1e7671ddc..22110c1c5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -64,9 +64,9 @@ public: { boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.SetPhase(PHASE_BRAWLER); events.ScheduleEvent(EVENT_THRASH, 3s, GROUP_BRAWLER, PHASE_BRAWLER); 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 2005cd1c8..c4f86b15e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -65,9 +65,9 @@ public: { boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 8s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 026a0e799..fdf613bcd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -100,9 +100,9 @@ public: Initialize(); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHIMMER, 1s); events.ScheduleEvent(EVENT_BREATH, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index df8581ae7..7635294b4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -57,9 +57,9 @@ public: }, 15s); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 18s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index 675bfbb2d..cb8d43b0a 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 EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 18s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index 934ad9f4b..99a8434a7 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 EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SHADOWFLAME, 18s); events.ScheduleEvent(EVENT_WINGBUFFET, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index eb342d140..e50e27af6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -352,7 +352,7 @@ public: void BeginEvent() { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_GAMESBEGIN_2); @@ -552,7 +552,7 @@ struct boss_nefarian : public BossAI classesPresent.clear(); } - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} void JustDied(Unit* /*killer*/) override { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index 97ee71ffd..dc3a49443 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -129,9 +129,9 @@ public: return true; } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CLEAVE, 15s); events.ScheduleEvent(EVENT_STOMP, 35s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index bfed5fcfe..886800336 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -114,9 +114,9 @@ public: } } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(victim); + BossAI::JustEngagedWith(who); DoCastAOE(SPELL_ESSENCE_OF_THE_RED); // now drop damage requirement to be able to take loot diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index d2b0d1769..6adb4e6fa 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -60,9 +60,9 @@ public: armageddonCasted = false; } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_INFERNO, 13s, 15s); events.ScheduleEvent(EVENT_IGNITE_MANA, 7s, 19s); events.ScheduleEvent(EVENT_LIVING_BOMB, 11s, 16s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index 0ce40fc45..2fb8992c3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -69,9 +69,9 @@ public: massEruptionTimer = 600000; } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { - _EnterCombat(); + _JustEngagedWith(); DoCastSelf(SPELL_SEPARATION_ANXIETY, true); events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 15s); events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 10s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index db97c9e81..6076addf7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -43,9 +43,9 @@ public: { boss_gehennasAI(Creature* creature) : BossAI(creature, DATA_GEHENNAS) {} - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 6s, 9s); events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10s); events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 5s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index 311270ae4..2df1b4852 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -42,9 +42,9 @@ public: { boss_lucifronAI(Creature* creature) : BossAI(creature, DATA_LUCIFRON) {} - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_IMPENDING_DOOM, 6s, 11s); events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 11s, 14s); events.ScheduleEvent(EVENT_SHADOW_SHOCK, 5s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 704a94660..0a2d75365 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -55,9 +55,9 @@ public: { boss_magmadarAI(Creature* creature) : BossAI(creature, DATA_MAGMADAR) {} - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FRENZY, 8500ms); events.ScheduleEvent(EVENT_PANIC, 9500ms); events.ScheduleEvent(EVENT_LAVA_BOMB, 12s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index 2c02ca710..042fe52a8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -237,14 +237,14 @@ public: } } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { if (!events.IsInPhase(PHASE_COMBAT)) { return; } - _EnterCombat(); + _JustEngagedWith(); DoCastAOE(SPELL_SEPARATION_ANXIETY); Talk(SAY_AGGRO); DoCastSelf(SPELL_AEGIS_OF_RAGNAROS, true); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 899cb3a36..9caa24644 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -204,9 +204,9 @@ public: } } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.SetPhase(PHASE_EMERGED); ScheduleCombatEvents(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 1c6773527..eb14b8149 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -49,9 +49,9 @@ public: { boss_shazzrahAI(Creature* creature) : BossAI(creature, DATA_SHAZZRAH) {} - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 2s, 4s); events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 7s,11s); events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 14s, 19s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 011fb3ea0..d40447338 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -56,9 +56,9 @@ public: { boss_sulfuronAI(Creature* creature) : BossAI(creature, DATA_SULFURON) {} - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 6s, 20s); events.ScheduleEvent(EVENT_INSPIRE, 7s, 10s); events.ScheduleEvent(EVENT_KNOCKDOWN, 6s); @@ -128,7 +128,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DARK_STRIKE, 4s, 7s); events.ScheduleEvent(EVENT_DARK_MENDING, 15s, 30s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp index ea6eb193e..1cda09c9e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp @@ -226,7 +226,7 @@ struct npc_lava_spawn : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(15s, [this](TaskContext context) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 55e453cbd..10697610f 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -71,7 +71,7 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CHECK_HEALTH1, 500ms); events.ScheduleEvent(EVENT_CHECK_HEALTH2, 500ms); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 1c4b6b313..6ab065280 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -79,9 +79,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_HATEFUL_BOLT, 10000); 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 feb651db6..fd8978d22 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -43,9 +43,9 @@ struct boss_maiden_of_virtue : public BossAI { boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); DoCastAOE(SPELL_HOLY_GROUND, true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 96f405c56..b64c25a28 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -366,9 +366,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); scheduler.Schedule(Seconds(15), Seconds(25), [this](TaskContext task) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index e1bb36495..a3c6184b5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -124,9 +124,9 @@ struct boss_moroes : public BossAI DoCastSelf(SPELL_DUAL_WIELD, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_VANISH, 30s); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index c0ce0af29..9625e2303 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -251,7 +251,7 @@ public: Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { HandleDoors(false); SwitchToPortalPhase(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index c30c48f59..9478bf54b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -158,7 +158,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (instance) instance->SetData(DATA_NIGHTBANE, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index c0b508cfb..643413d12 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -105,7 +105,7 @@ public: InfernalPoint* point; void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override @@ -233,7 +233,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -485,7 +485,7 @@ public: { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp index aad9deaec..82c548fa9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -70,7 +70,7 @@ struct boss_servant_quarters : public BossAI me->DespawnOrUnsummon(1); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); if (me->GetEntry() == NPC_HYAKISS_THE_LURKER) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 1855dde57..11be933e8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -150,7 +150,7 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_GO_LIBRARY_DOOR), true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -584,7 +584,7 @@ public: CastTimer = 2000 + (rand() % 3000); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index c29dd16da..f85e4301b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -91,7 +91,7 @@ public: AmplifyTimer = 2000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -148,7 +148,7 @@ public: SacrificeGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -219,7 +219,7 @@ public: FireboltTimer = 2000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -313,7 +313,7 @@ public: DoCast(me, SPELL_SUMMON_IMP, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 19b47131f..7a9399418 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -158,7 +158,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_DOROTHEE_AGGRO); DoZoneInCombat(); @@ -263,7 +263,7 @@ public: YipTimer = 10000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -358,7 +358,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_STRAWMAN_AGGRO); DoZoneInCombat(); @@ -467,7 +467,7 @@ public: RustCount = 0; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TINHEAD_AGGRO); DoZoneInCombat(); @@ -599,7 +599,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_ROAR_AGGRO); DoZoneInCombat(); @@ -707,7 +707,7 @@ public: Talk(SAY_CRONE_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_CRONE_AGGRO); DoZoneInCombat(); @@ -775,7 +775,7 @@ public: MoveTimer = 1000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override @@ -886,7 +886,7 @@ public: IsChasing = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_WOLF_AGGRO); DoZoneInCombat(); @@ -1118,7 +1118,7 @@ public: RomuloDead = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -1288,7 +1288,7 @@ public: //LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen."); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); Talk(SAY_ROMULO_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 78e941fe1..46353f760 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -168,7 +168,7 @@ public: Start(false, false); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void WaypointReached(uint32 waypointId) override { @@ -480,7 +480,7 @@ public: me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} uint32 NextStep(uint32 nextStep) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 3ec4fcff9..333ef040f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -128,7 +128,7 @@ public: instance->SetData(DATA_KAELTHAS_EVENT, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS); me->SetInCombatWithZone(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index f8b9ab0c2..f15de20a8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -147,7 +147,7 @@ public: ++HelpersKilled; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); summons.DoZoneInCombat(); @@ -336,7 +336,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI ScriptedAI::EnterEvadeMode(why); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* delrissa = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_DELRISSA))) if (delrissa->IsAlive() && !delrissa->IsEngaged()) @@ -434,9 +434,9 @@ public: { boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_GOUGE, 5500); events.ScheduleEvent(EVENT_SPELL_KICK, 9000); @@ -534,10 +534,10 @@ public: { boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { me->CastSpell(me, SPELL_SUMMON_IMP, false); - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 3000); events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 1000); @@ -612,9 +612,9 @@ public: { boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_KNOCKDOWN, 6000); events.ScheduleEvent(EVENT_SPELL_SNAP_KICK, 3000); @@ -686,9 +686,9 @@ public: { boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_POLYMORPH, 1000); events.ScheduleEvent(EVENT_SPELL_ICE_BLOCK, 1000); @@ -794,9 +794,9 @@ public: { boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); me->CastSpell(me, SPELL_BATTLE_SHOUT, false); events.ScheduleEvent(EVENT_SPELL_DISARM, 6000); @@ -886,9 +886,9 @@ public: me->SummonCreature(NPC_SLIVER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); me->CastSpell(me, SPELL_FREEZING_TRAP, true); events.ScheduleEvent(EVENT_SPELL_AIMED_SHOT, 8000); @@ -976,9 +976,9 @@ public: uint32 Healing_Wave_Timer; // uint32 Frost_Shock_Timer; - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_TOTEM1, 2000); events.ScheduleEvent(EVENT_SPELL_TOTEM2, 4000); @@ -1067,9 +1067,9 @@ public: { boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_priestess_lackey_commonAI::EnterCombat(who); + boss_priestess_lackey_commonAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_DRAGON_GUN, 20000); events.ScheduleEvent(EVENT_SPELL_ROCKET_LAUNCH, 7000); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 6897ee17f..d14c9ff3e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -111,7 +111,7 @@ public: me->SetPower(POWER_MANA, 0); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_SELIN_EVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 2f086eedf..574afed7d 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -104,7 +104,7 @@ public: instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ENERGY_FEEDBACK); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 42863e3a1..d65fc1a50 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -748,7 +748,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ICY_TOUCH, 1s, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3s, GCD_CAST); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index fcf46f70d..f63817878 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -69,7 +69,7 @@ public: me->RestoreFaction(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (roll_chance_i(33)) Talk(SAY_AGGRO); @@ -432,7 +432,7 @@ public: uiStage_timer = 3000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TREE2); me->Dismount(); @@ -525,7 +525,7 @@ public: uiValroth_Smite_timer = 1000; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_VALROTH_AGGRO); DoCast(who, SPELL_VALROTH_SMITE); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 0d15881f0..91a926628 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -520,7 +520,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (battleStarted != ENCOUNTER_STATE_FIGHT) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index e3a9318b0..315eecb88 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -411,7 +411,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_MO_AGGRO); me->CastSpell(me, SPELL_RETRIBUTION_AURA, true); @@ -568,7 +568,7 @@ public: instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_WH_INTRO); events.ScheduleEvent(EVENT_SPELL_HOLY_SMITE, 1s, 3s); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index cf2d6aa66..597cdc884 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -183,7 +183,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetData(DATA_DARKMASTER_GANDLING, IN_PROGRESS); 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 91972c3bc..51f14aad9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -85,7 +85,7 @@ public: EventMap events2; InstanceScript* instance; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { TransformsCount = 0; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 8641887ae..9929cb8f2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -83,7 +83,7 @@ struct boss_kormok : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(TALK_AGGRO); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index c8dd58d23..e13e4a5b3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -380,7 +380,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { originalDisplayId = me->GetDisplayId(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index e02c894b8..44fd7acb1 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -60,7 +60,7 @@ public: }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(1s, [this](TaskContext context){ DoCastVictim(SPELL_BANSHEEWAIL); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp index efe4d8495..91a353b99 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp @@ -181,9 +181,9 @@ struct boss_jarien : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); _scheduler.Schedule(5s, [this](TaskContext context) { DoCastVictim(SPELL_SHADOW_SHOCK); @@ -307,9 +307,9 @@ struct boss_sothos : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); _scheduler.Schedule(10s, [this](TaskContext context) { DoCastAOE(SPELL_FEAR); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 10e8898e9..6158571a0 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -82,13 +82,13 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (who->GetEntry() == NPC_MADRIGOSA) return; Talk(YELL_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_SLASH, 11000); events.ScheduleEvent(EVENT_SPELL_STOMP, 30000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 03e4cf662..ddb88fa1b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -123,9 +123,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS))) if (alythess->IsAlive() && !alythess->IsInCombat()) alythess->AI()->AttackStart(who); @@ -271,9 +271,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH))) if (scorlash->IsAlive() && !scorlash->IsInCombat()) scorlash->AI()->AttackStart(who); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 019546457..03ba292b5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -160,9 +160,9 @@ public: instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_FOG_OF_CORRUPTION_CHARM); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); if (events.Empty() && events2.Empty()) events2.ScheduleEvent(EVENT_INTRO_2, 3000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 6e49ba093..f76d54b5a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -201,9 +201,9 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ARCANE_BUFFET, 6000); events.ScheduleEvent(EVENT_FROST_BREATH, 15000); events.ScheduleEvent(EVENT_WILD_MAGIC, 10000); @@ -409,7 +409,7 @@ public: damage = 0; } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); events.ScheduleEvent(EVENT_CHECK_HEALTH2, 1000); @@ -523,7 +523,7 @@ public: events.ScheduleEvent(EVENT_CHECK_HEALTH2, 1000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_SATH_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index f86154f7b..7840ff702 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -364,7 +364,7 @@ public: Talk(SAY_KJ_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events2.ScheduleEvent(EVENT_TEXT_SPEACH11, 26000, EVENT_GROUP_SPEACH); Talk(SAY_KJ_EMERGE); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 887a5de02..e0ee6a0b1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -86,9 +86,9 @@ public: me->SetVisible(true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CastSpell(me, SPELL_NEGATIVE_ENERGY, true); me->CastSpell(me, SPELL_SUMMON_BLOOD_ELVES_PERIODIC, true); me->CastSpell(me, SPELL_OPEN_PORTAL_PERIODIC, true); @@ -186,7 +186,7 @@ public: me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPAWN_BLACK_HOLE, 15000); events.ScheduleEvent(EVENT_SPAWN_DARKNESS, 10000); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index dee26b328..97a0d1045 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -110,7 +110,7 @@ public: SetWeather(WEATHER_STATE_FINE, 0.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers) events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000)); // 20 to 30 seconds(bosskillers) @@ -391,7 +391,7 @@ public: me->SetDisableGravity(true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index ee104d45e..de8b05dbd 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -105,7 +105,7 @@ public: EnterPhase(PHASE_LYNX); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); Talk(SAY_AGGRO); @@ -350,7 +350,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ } + void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index feb1bc37c..12ebadca6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -228,7 +228,7 @@ struct boss_hexlord_addAI : public ScriptedAI void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -294,7 +294,7 @@ public: me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index d815709e8..172bc17db 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -175,7 +175,7 @@ public: Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -451,7 +451,7 @@ public: DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } @@ -524,7 +524,7 @@ public: return num == 0; // if num == 0, no more templist } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -618,7 +618,7 @@ public: me->SetDisableGravity(true); } - void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ } + void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 7acdf580c..0c03cc52a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -280,7 +280,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (instance) instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index ffd84ba75..a30560278 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -201,7 +201,7 @@ public: //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); @@ -580,7 +580,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*target*/) override { } + void JustEngagedWith(Unit* /*target*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 8cd10ea96..ab5719b64 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -144,7 +144,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MovementInform(uint32 type, uint32 data) override { @@ -469,7 +469,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { @@ -618,7 +618,7 @@ public: uiTargetGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void sGossipSelect(Player* player, uint32 sender, uint32 action) override { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 98311351e..d618c9f0a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -115,9 +115,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s, 9s, 0, PHASE_ONE); events.ScheduleEvent(EVENT_GOUGE, 12s, 15s, 0, PHASE_ONE); events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL); @@ -341,7 +341,7 @@ public: _events.ScheduleEvent(EVENT_ATTACK, 6000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->GetMotionMaster()->Clear(false); me->RemoveAura(SPELL_SNEAK_RANK_1_1); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index 73a3a0c9c..9e917e53d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -72,9 +72,9 @@ public: _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->AddAura(SPELL_THRASH, me); events.ScheduleEvent(EVENT_FROSTBREATH, 8s); events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 46b76001f..7e95c16e6 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -61,9 +61,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_AVATAR, 20s, 30s); events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s); events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 5s, 15s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 397187e29..8c9136957 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -110,9 +110,9 @@ public: _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s); events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s); events.ScheduleEvent(EVENT_CAUSE_INSANITY, 17s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index c842bc2b1..b753acf8b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -69,9 +69,9 @@ struct boss_hazzarah : public BossAI summon->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SLEEP, 12s, 15s); events.ScheduleEvent(EVENT_EARTH_SHOCK, 8s, 18s); events.ScheduleEvent(EVENT_CHAIN_BURN, 12s, 28s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 5fb6c7e0b..2e74f2a12 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -132,7 +132,7 @@ struct boss_jeklik : public BossAI BossAI::EnterEvadeMode(why); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_GREEN_CHANNELING); @@ -147,7 +147,7 @@ struct boss_jeklik : public BossAI { me->SetHover(false); me->SetDisableGravity(false); - _EnterCombat(); + _JustEngagedWith(); SetCombatMovement(true); me->SetReactState(REACT_AGGRESSIVE); events.SetPhase(PHASE_ONE); @@ -285,7 +285,7 @@ struct npc_batrider : public ScriptedAI me->AddUnitState(UNIT_STATE_ROOT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(2s, [this](TaskContext context) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 999cd45c6..8f3f26d7c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -58,9 +58,9 @@ struct boss_jindo : public BossAI { boss_jindo(Creature* creature) : BossAI(creature, DATA_JINDO) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s); events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 16s); events.ScheduleEvent(EVENT_HEX, 8s); @@ -187,7 +187,7 @@ struct npc_healing_ward : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler. Schedule(2s, [this](TaskContext context) @@ -237,7 +237,7 @@ struct npc_shade_of_jindo : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler. Schedule(1s, [this](TaskContext context) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 8b3c8a8dd..37e7cd3d6 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -184,9 +184,9 @@ public: instance->SaveToDB(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_OVERPOWER, 1s); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 14s, 28s); events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s); @@ -537,9 +537,9 @@ public: reviveGUID.Clear(); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { - if (victim->GetTypeId() != TYPEID_PLAYER) + if (who->GetTypeId() != TYPEID_PLAYER) return; _scheduler.Schedule(6s, 12s, [this](TaskContext context) @@ -672,7 +672,7 @@ struct npc_vilebranch_speaker : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler .Schedule(2s, 4s, [this](TaskContext context) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index f4c391c05..6c302153d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -122,9 +122,9 @@ struct boss_marli : public BossAI Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE); Talk(SAY_AGGRO); } @@ -253,7 +253,7 @@ struct npc_spawn_of_marli : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(4s, [this](TaskContext context) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 09b7a57f1..5ed123a2e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -63,9 +63,9 @@ public: _dynamicFlags = me->GetDynamicFlags(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_VANISH, 23s, 25s); events.ScheduleEvent(EVENT_GOUGE, 5s, 10s); events.ScheduleEvent(EVENT_THOUSAND_BLADES, 15s, 20s); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index fcdfb773a..ea6c77f97 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -121,9 +121,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); _scheduler.CancelAll(); _scheduler.Schedule(4s, [this](TaskContext context) { @@ -306,7 +306,7 @@ public: }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(1s, [this](TaskContext context) { DoCastSelf(SPELL_SHIELD); @@ -391,7 +391,7 @@ public: }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(13s, [this](TaskContext context) { DoCastSelf(SPELL_SWEEPINGSTRIKES); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 0ec4a3e49..eea96fa24 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -138,9 +138,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); me->SetReactState(REACT_AGGRESSIVE); // Always running events events.ScheduleEvent(EVENT_THRASH, 5s); @@ -299,7 +299,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) + void JustEngagedWith(Unit*) { events.ScheduleEvent(EVENT_POISON, 8ms); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 4e117d9c7..771424b66 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -49,9 +49,9 @@ public: { boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 7s, 15s); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 12s, 16s); events.ScheduleEvent(EVENT_FORKED_LIGHTNING, 8s, 12s); diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 3817dc302..cab0ece62 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -107,7 +107,7 @@ public: summoned->AI()->AttackStart(me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 65bdff33e..4eae86200 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -83,7 +83,7 @@ struct boss_twilight_corrupter : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); _scheduler diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 8ebf55458..c5bc2e3d2 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -168,7 +168,7 @@ struct npc_sentinel_leader : public ScriptedAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SINISTER_STRIKE, 5s, 9s); _events.ScheduleEvent(EVENT_BACKSTAB, 3s, 5s); @@ -317,7 +317,7 @@ struct npc_sentinel_infiltrator : public ScriptedAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_GOUGE2, 9s, 15s); _events.ScheduleEvent(EVENT_BACKSTAB2, 3s, 5s); diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 4bb76d733..886f89d48 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -94,7 +94,7 @@ public: npc_escortAI::JustRespawned(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 1f051e491..cc8024d91 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -658,7 +658,7 @@ public: { npc_greengill_slaveAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 5aeab3c44..de3399299 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -109,7 +109,7 @@ public: void Reset() override { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO, who); } @@ -213,7 +213,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summoned) override { diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index b5324ccf8..060111d4d 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -166,7 +166,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* pMarzon = ObjectAccessor::GetCreature(*me, MarzonGUID)) { @@ -303,7 +303,7 @@ public: me->RestoreFaction(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_MARZON_2); diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index e7756d96e..1686e33d3 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -81,7 +81,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 5ffe52770..9085e2be3 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -84,7 +84,7 @@ public: me->SetImmuneToPC(true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackedBy(Unit* pAttacker) override { diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 0c06b1056..3a753350e 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -121,7 +121,7 @@ public: _events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_FADE, 30s); _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s); @@ -273,7 +273,7 @@ public: EventCast = true; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 58a47c94b..b7e675402 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -53,7 +53,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoDie() { diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index d4024d44c..a4e84a4bd 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -80,7 +80,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING) && !IsFriendSummoned && GetPlayerForEscort()) { diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 569fa463d..badf22dd9 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -336,7 +336,7 @@ struct npc_dark_iron_attack_generator : public ScriptedAI // DARK IRON ATTACK EVENT void MoveInLineOfSight(Unit* /*who*/) override {} - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void SpellHit(Unit* caster, SpellInfo const* spellInfo) override { @@ -560,7 +560,7 @@ struct npc_dark_iron_attack_mole_machine : public ScriptedAI { npc_dark_iron_attack_mole_machine(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void MoveInLineOfSight(Unit*) override {} void AttackStart(Unit*) override {} @@ -618,7 +618,7 @@ struct npc_dark_iron_guzzler : public ScriptedAI ObjectGuid targetGUID; bool attacking; - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void MoveInLineOfSight(Unit*) override {} void AttackStart(Unit*) override {} @@ -768,7 +768,7 @@ struct npc_brewfest_super_brew_trigger : public ScriptedAI npc_brewfest_super_brew_trigger(Creature* creature) : ScriptedAI(creature) { } uint32 timer; - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void MoveInLineOfSight(Unit* /*who*/) override { } @@ -1758,7 +1758,7 @@ struct npc_coren_direbrew_sisters : public ScriptedAI return ObjectGuid::Empty; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(SPELL_PORT_TO_COREN); @@ -1845,10 +1845,10 @@ struct npc_direbrew_antagonist : public ScriptedAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_ANTAGONIST_COMBAT, who); - ScriptedAI::EnterCombat(who); + ScriptedAI::JustEngagedWith(who); } }; diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 52a140c07..65b569c32 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -28,7 +28,7 @@ #include "SpellScript.h" #include "TaskScheduler.h" -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 @@ -598,7 +598,7 @@ struct npc_hallows_end_soh : public ScriptedAI int32 pos; TaskScheduler scheduler; - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { scheduler.Schedule(6s, [this](TaskContext context) { @@ -1082,7 +1082,7 @@ struct boss_headless_horseman : public ScriptedAI Player* GetRhymePlayer() { return playerGUID ? ObjectAccessor::GetPlayer(*me, playerGUID) : nullptr; } - void EnterCombat(Unit*) override { me->SetInCombatWithZone(); } + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); } void MoveInLineOfSight(Unit* /*who*/) override {} void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index a87452598..ad49d80be 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -76,7 +76,7 @@ public: instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); @@ -208,7 +208,7 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 8f616e1ef..7d50c5c6e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -127,7 +127,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { @@ -172,7 +172,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { @@ -215,7 +215,7 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { @@ -347,7 +347,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->InterruptSpell(CURRENT_CHANNELED_SPELL); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 27b6f1489..f6f9ba85d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -82,7 +82,7 @@ public: instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); @@ -213,7 +213,7 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 9e122caea..f5f4e17d9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -78,7 +78,7 @@ public: instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index c23d5b71b..cd3ee4526 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -73,7 +73,7 @@ public: instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 65ddedf0b..42817e795 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -420,7 +420,7 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/) me->SetLootRecipient(nullptr); } -void hyjalAI::EnterCombat(Unit* /*who*/) +void hyjalAI::JustEngagedWith(Unit* /*who*/) { if (IsDummy)return; for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index e17ea0636..d1bd84f0e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -124,7 +124,7 @@ struct hyjalAI : public npc_escortAI void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override; // Send creature back to spawn location and evade. - void EnterCombat(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack + void JustEngagedWith(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack void UpdateAI(uint32 diff) override; // Called to summon waves, check for boss deaths and to cast our spells. diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 55926a3a7..23f49476c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -437,7 +437,7 @@ public: imol = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void WaypointReached(uint32 waypointId) override { @@ -590,7 +590,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -691,7 +691,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -812,7 +812,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -908,7 +908,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1007,7 +1007,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1094,7 +1094,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1190,7 +1190,7 @@ public: me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -1438,7 +1438,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 119b45769..84c7a97c6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -73,7 +73,7 @@ public: warps = 0; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 240dfea15..cfad4392f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -75,7 +75,7 @@ public: void JustSummoned(Creature* cr) override { summons.Summon(cr); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->InterruptNonMeleeSpells(false); events.ScheduleEvent(EVENT_SPELL_VOID_STRIKE, 8000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index ec401dd18..1979946d5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -84,7 +84,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_CARRION_SWARM, 6000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 4f29766e7..0f60e28c0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -63,7 +63,7 @@ public: EventMap events; void Reset() override { events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.RescheduleEvent(EVENT_SPELL_CONSTRICTING_CHAINS, 15000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 9fddcd7af..94ddd4a2d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -80,7 +80,7 @@ public: void JustSummoned(Creature* cr) override { summons.Summon(cr); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 7000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index bfeb96aec..00f43d616 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -385,7 +385,7 @@ public: void ScheduleNextEvent(uint32 currentEvent, uint32 time); void SummonNextWave(); void ReorderInstance(uint32 data); - void EnterCombat(Unit* /*who*/) override ; + void JustEngagedWith(Unit* /*who*/) override ; void SendNextWave(uint32 entry); void SpawnTimeRift(); @@ -1232,7 +1232,7 @@ void npc_arthas::npc_arthasAI::SummonNextWave() me->SummonCreature(/*entry*/(uint32)WavesLocations[tableId][i][0], WavesLocations[tableId][i][1], WavesLocations[tableId][i][2], WavesLocations[tableId][i][3], WavesLocations[tableId][i][4]); } -void npc_arthas::npc_arthasAI::EnterCombat(Unit* /*who*/) +void npc_arthas::npc_arthasAI::JustEngagedWith(Unit* /*who*/) { DoCast(me, SPELL_ARTHAS_AURA); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index b213e8295..8ede6f1c0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -149,7 +149,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CastSpell(me, SPELL_DEVOTION_AURA, true); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4c8ef521e..66d6916a5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -57,7 +57,7 @@ public: { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index 6f7013f21..5288c3cec 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -94,7 +94,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 9a1a751c9..3b19bc645 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -444,7 +444,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { combatEvents.Reset(); combatEvents.ScheduleEvent(EVENT_CHECK_HEALTH, 500); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 4c510dc3f..d2fd5b07e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -83,7 +83,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CLEAVE, 5000); events.ScheduleEvent(EVENT_SANDBREATH, 20000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 30365a3f0..8ef6ce89c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -71,7 +71,7 @@ public: ScriptedAI::InitializeAI(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ARCANE_BLAST, 10000); events.ScheduleEvent(EVENT_TIME_LAPSE, 15000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 4a957861e..f17bc8f60 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -70,7 +70,7 @@ public: ScriptedAI::InitializeAI(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_HASTEN, 12000); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); diff --git a/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp b/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp index feba8988e..e81a7a565 100644 --- a/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp @@ -87,9 +87,9 @@ struct boss_isalien : public BossAI summons.Summon(summon); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); _scheduler.Schedule(4s, 5s, [this](TaskContext context) { DoCastRandomTarget(SPELL_NET); diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 33b1a0210..1b0967efb 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -177,14 +177,14 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); SetPhase(PHASE_GROUNDED); instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); // just in case at reset some players already left the instance instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SummonCreature(NPC_ONYXIAN_LAIR_GUARD, -167.837936f, -200.549332f, -66.343231f, 5.598287f, TEMPSUMMON_MANUAL_DESPAWN); } @@ -552,7 +552,7 @@ public: EventMap events; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_OLG_SPELL_BLASTNOVA, 15000); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 40a1a24a3..3033156a2 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -95,7 +95,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (channeling) Talk(SAY_WATCH_OUT, who); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index d05c1b1e0..545f3080b 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -201,9 +201,9 @@ struct boss_ayamiss : public BossAI BossAI::EnterEvadeMode(why); } - void EnterCombat(Unit* attacker) override + void JustEngagedWith(Unit* attacker) override { - BossAI::EnterCombat(attacker); + BossAI::JustEngagedWith(attacker); me->SetCanFly(true); me->SetDisableGravity(true); me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index b347b61c7..b7bb08f02 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -78,9 +78,9 @@ struct boss_buru : public BossAI respawn ? egg->Respawn() : Unit::Kill(me, egg); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->AddThreat(who, 1000000.f); Talk(EMOTE_TARGET, who); DoCastSelf(SPELL_THORNS); @@ -193,7 +193,7 @@ struct npc_buru_egg : public ScriptedAI me->SetControlled(true, UNIT_STATE_STUNNED); } - void EnterCombat(Unit* attacker) override + void JustEngagedWith(Unit* attacker) override { if (Creature* buru = _instance->GetCreature(DATA_BURU)) { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 1593a7498..b788415f6 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -68,9 +68,9 @@ struct boss_moam : public BossAI me->SetRegeneratingPower(false); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(EMOTE_AGGRO); events.ScheduleEvent(EVENT_STONE_PHASE, 90s); events.ScheduleEvent(EVENT_SPELL_TRAMPLE, 9s); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 702974877..b86be2de9 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -161,9 +161,9 @@ struct boss_ossirian : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.Reset(); events.ScheduleEvent(EVENT_SPEEDUP, 10s); events.ScheduleEvent(EVENT_SILENCE, 30s); @@ -403,7 +403,7 @@ struct npc_anubisath_guardian : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(_spells[0]); DoCastSelf(_spells[1]); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index c01ce23c2..09abac426 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -86,9 +86,9 @@ struct boss_rajaxx : public BossAI }); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_DISARM, 10s); events.ScheduleEvent(EVENT_THUNDERCRASH, 12s); } @@ -219,7 +219,7 @@ struct npc_general_andorov : public npc_escortAI _summons.Summon(summon); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_BASH, 8s, 11s); events.ScheduleEvent(EVENT_COMMAND_AURA, 1s, 3s); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp index 868fa8374..8cd2c6e94 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp @@ -46,7 +46,7 @@ struct npc_hivezara_stinger : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoCast(who ,who->HasAura(SPELL_HIVEZARA_CATALYST) ? SPELL_STINGER_CHARGE_BUFFED : SPELL_STINGER_CHARGE_NORMAL, true); @@ -100,7 +100,7 @@ struct npc_obsidian_destroyer : public ScriptedAI me->SetPower(POWER_MANA, 0); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(6s, [this](TaskContext context) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index d8d010bc0..2a2fad44c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -79,7 +79,7 @@ public: void EnterCombatWithTrio(Unit* who) { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (Creature* vem = instance->GetCreature(DATA_VEM)) { @@ -331,7 +331,7 @@ struct boss_kri : public boss_bug_trio { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { EnterCombatWithTrio(who); @@ -359,7 +359,7 @@ struct boss_vem : public boss_bug_trio { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { EnterCombatWithTrio(who); @@ -400,7 +400,7 @@ struct boss_yauj : public boss_bug_trio { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { EnterCombatWithTrio(who); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 750377820..3008e7188 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -181,10 +181,10 @@ struct boss_eye_of_cthun : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { ScheduleTask(true); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); _beamTarget = who->GetGUID(); } @@ -404,7 +404,7 @@ struct boss_cthun : public BossAI scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -639,7 +639,7 @@ struct npc_eye_tentacle : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } @@ -701,7 +701,7 @@ struct npc_claw_tentacle : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); @@ -770,7 +770,7 @@ struct npc_giant_claw_tentacle : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); ScheduleTasks(); @@ -927,7 +927,7 @@ struct npc_giant_eye_tentacle : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index eb553c9de..f2a00e8fe 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -85,10 +85,10 @@ struct boss_fankriss : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _scheduler.CancelAll(); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); _scheduler .Schedule(7s, 14s, [this](TaskContext context) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index e48ec6356..078a55939 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -61,9 +61,9 @@ struct boss_huhuran : public BossAI _hardEnrage = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_FRENZY, 12s, 21s); events.ScheduleEvent(EVENT_WYVERN_STING, 25s, 43s); events.ScheduleEvent(EVENT_ACID_SPIT, 1s, 20s); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 2e56cb55b..32d4c51c2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -283,11 +283,11 @@ struct boss_ouro : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Emerge(); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void UpdateAI(uint32 diff) override @@ -335,7 +335,7 @@ struct npc_dirt_mound : ScriptedAI _ouroHealth = data; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); _scheduler.Schedule(30s, [this](TaskContext /*context*/) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 190c8eb93..a37f76e68 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -74,9 +74,9 @@ struct boss_sartura : public BossAI me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND, 12s, 22s); events.ScheduleEvent(EVENT_SPELL_BERSERK, 10min); @@ -181,7 +181,7 @@ struct npc_sartura_royal_guard : public ScriptedAI me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_GUARD_WHIRLWIND, 6s, 10s); events.ScheduleEvent(EVENT_GUARD_KNOCKBACK, 12s, 16s); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index e06e61c51..578b7b763 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -141,9 +141,9 @@ struct boss_skeram : public BossAI me->RemoveCorpse(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.Reset(); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index b92178975..e527b4076 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -237,9 +237,9 @@ struct boss_twinemperorsAI : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (!_introDone) { @@ -300,9 +300,9 @@ struct boss_veknilash : public boss_twinemperorsAI bool IAmVeklor() override { return false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_twinemperorsAI::EnterCombat(who); + boss_twinemperorsAI::JustEngagedWith(who); DoPlaySoundToSet(me, SOUND_VN_AGGRO); @@ -331,9 +331,9 @@ struct boss_veklor : public boss_twinemperorsAI bool IAmVeklor() override { return true; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_twinemperorsAI::EnterCombat(who); + boss_twinemperorsAI::JustEngagedWith(who); DoPlaySoundToSet(me, SOUND_VK_AGGRO); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index c20966aff..b39a94a8d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -276,9 +276,9 @@ struct boss_viscidus : public BossAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); InitSpells(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index dbc451e9e..7a28ca58a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -251,7 +251,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (gatherOthersWhenAggro) GetOtherSentinels(who); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp index 472e8b567..631f38d4a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp @@ -82,7 +82,7 @@ struct npc_anubisath_defender : public ScriptedAI _enraged = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(urand(0, 1) ? SPELL_SHADOW_FROST_REFLECT : SPELL_FIRE_ARCANE_REFLECT, true); @@ -191,7 +191,7 @@ struct npc_vekniss_stinger : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoCast(who ,who->HasAura(SPELL_VEKNISS_CATALYST) ? SPELL_STINGER_CHARGE_BUFFED : SPELL_STINGER_CHARGE_NORMAL, true); @@ -246,7 +246,7 @@ struct npc_obsidian_eradicator : public ScriptedAI _targetGUIDs.clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(3500ms, [this](TaskContext context) { @@ -311,7 +311,7 @@ struct npc_anubisath_warder : public ScriptedAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (urand(0, 1)) { @@ -382,7 +382,7 @@ struct npc_obsidian_nullifier : public ScriptedAI _targetGUIDs.clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.Schedule(6s, [this](TaskContext context) { @@ -479,7 +479,7 @@ struct npc_ahnqiraji_critter : public ScriptedAI }); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _scheduler.CancelAll(); diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 66d5f2129..483a47848 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -84,7 +84,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCastSelf(SPELL_MARK_OF_FROST_AURA); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 027692818..28347cc9d 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -88,7 +88,7 @@ public: _isBrazierExtinguished = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index 4dbd81639..c29bb285c 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -67,7 +67,7 @@ public: spellhit = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* unit, SpellInfo const* spell) override { @@ -237,7 +237,7 @@ public: Reached = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* who) override { @@ -422,7 +422,7 @@ public: WeMustDieTimer = 1000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index f8edf838b..3bc60dbe4 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -87,7 +87,7 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override { @@ -196,7 +196,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -245,7 +245,7 @@ public: _events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO, who); } diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 8c5a789c5..080b31667 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -53,7 +53,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* killer) override { diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index 8aff41376..768eb3b51 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -75,7 +75,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_SUNDER_ARMOR, 5s); @@ -329,7 +329,7 @@ public: void Reset() override {} - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (urand(0, 1)) Talk(SAY_REM_AGGRO, who); diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index da40a0f8b..af38415b3 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -154,7 +154,7 @@ public: { } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_POUNCE, 100ms); diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 6ff70df38..e9b37b509 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -276,7 +276,7 @@ enum ClintarSpirit { ASPECT_RAVEN = 22915, - // Texts for EnterCombat, the event and the end of the event are missing + // Texts for JustEngagedWith, the event and the end of the event are missing CLINTAR_SPIRIT_SAY_START = 0, }; @@ -604,7 +604,7 @@ public: } } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s, 5s); diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index b5aadc711..00cea506b 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -81,7 +81,7 @@ public: PlayerGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -252,7 +252,7 @@ public: ShockTimer = 8000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoAction(int32 action) override { diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 13ea19874..03ef895d4 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -656,7 +656,7 @@ public: hasTarget = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*slayer*/) override; void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 49d1c6caf..5c1c9d508 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -98,7 +98,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(AGGRO_YELL_AQUE, who); } @@ -270,7 +270,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void Reset() override { } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 285e794cb..176f8dad5 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -118,7 +118,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { //not always use if (rand() % 4) @@ -199,7 +199,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -304,7 +304,7 @@ public: BigWill.Clear(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void EnterEvadeMode(EvadeReason why) override { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 483e2657c..8e1b945f9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -128,7 +128,7 @@ class boss_anub_arak : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* ) override + void JustEngagedWith(Unit* ) override { Talk(SAY_AGGRO); instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); @@ -160,7 +160,7 @@ class boss_anub_arak : public CreatureScript switch (uint32 eventId = events.ExecuteEvent()) { case EVENT_CLOSE_DOORS: - _EnterCombat(); + _JustEngagedWith(); break; case EVENT_CARRION_BEETELS: me->CastSpell(me, SPELL_CARRION_BEETLES, false); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 4435715c6..147206777 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -137,7 +137,7 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.RescheduleEvent(EVENT_HADRONOX_ACID, 10000); events.RescheduleEvent(EVENT_HADRONOX_LEECH, 4000); @@ -269,7 +269,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (me->ToTempSummon()) if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit()) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 47efd6820..7fc1c7d3a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -127,9 +127,9 @@ public: return 0; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events2.Reset(); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 445c186db..28cdc0f68 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -114,7 +114,7 @@ struct boss_amanitar : public BossAI mushroomsSummoned = false; } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { events.ScheduleEvent(EVENT_ROOTS, urand(5000, 9000)); events.ScheduleEvent(EVENT_BASH, urand(10000, 14000)); @@ -243,7 +243,7 @@ struct npc_amanitar_mushrooms : public ScriptedAI } // Disabled events - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} void AttackStart(Unit* /*victim*/) override {} void EnterEvadeMode(EvadeReason /*why*/) override {} 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 388d9e454..ad2412fc9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -89,9 +89,9 @@ struct boss_elder_nadox : public BossAI respectYourElders = true; } - void EnterCombat(Unit * /*who*/) override + void JustEngagedWith(Unit * /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SWARMER, 10000); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 8e1c3ee83..de2878b81 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -112,9 +112,9 @@ struct boss_volazj : public BossAI instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_QUICK_DEMISE_START_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_HERALD_MIND_FLAY, 8000); events.ScheduleEvent(EVENT_HERALD_SHADOW, 5000); events.ScheduleEvent(EVENT_HERALD_SHIVER, 15000); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index c01e31247..3509f5776 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -321,9 +321,9 @@ struct boss_jedoga_shadowseeker : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); ReschedulleCombatEvents(); } 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 bfb1907ad..a4a50d1d1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -320,9 +320,9 @@ struct boss_taldaram : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); ScheduleCombatEvents(); @@ -490,7 +490,7 @@ private: } }; -// @todo: Turn into new script type when Gossips have been updated +/// @todo: Turn into new script type when Gossips have been updated class go_prince_taldaram_sphere : public GameObjectScript { public: diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 209471d74..689160f5a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -278,7 +278,7 @@ public: } } - void EnterCombat(Unit* pWho) override + void JustEngagedWith(Unit* pWho) override { if (pWho && !IsTargetInBounds(pWho)) { @@ -286,7 +286,7 @@ public: return; } - _EnterCombat(); + _JustEngagedWith(); DoCastSelf(SPELL_SARTHARION_PYROBUFFET, true); Talk(SAY_SARTHARION_AGGRO); @@ -808,7 +808,7 @@ struct boss_sartharion_dragonAI : public BossAI BossAI::JustSummoned(summon); } - void EnterCombat(Unit* /*who*/) final + void JustEngagedWith(Unit* /*who*/) final { me->setActive(true); DoZoneInCombat(); 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 07bf6f096..aa0a0b7b3 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 @@ -158,10 +158,10 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->InterruptNonMeleeSpells(false); events.ScheduleEvent(EVENT_CLEAVE, 11000); @@ -282,7 +282,7 @@ public: { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); 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 c73c0f7a2..ac19f4e3f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -111,9 +111,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 9000); @@ -213,7 +213,7 @@ public: Start(true, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_BLAST_NOVA, urand(20000, 30000)); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 2be575c9e..f6bf6c995 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -294,9 +294,9 @@ public: BossAI::JustReachedHome(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1); @@ -459,7 +459,7 @@ public: me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_CLEAVE, urand(8000, 10000)); 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 abba544d7..9442165ce 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -74,9 +74,9 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ENRAGE, 15000); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 16163a89b..7d5897ec3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -126,7 +126,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_RADIANCE, 16000); @@ -258,7 +258,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_HOLY_FIRE, urand(9000, 12000)); @@ -632,7 +632,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { switch( me->GetEntry() ) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index eda077307..eb9c57b46 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -406,7 +406,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); if (me->GetEntry() == NPC_RISEN_JAEREN || me->GetEntry() == NPC_RISEN_ARELAS) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index a6088f51e..27d3c7b9e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -212,7 +212,7 @@ public: m_ConditionsTimer -= diff; } void AttackStart(Unit* /*who*/) override {} - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} }; }; @@ -243,7 +243,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_MOUNT_CHARGE, urand(2500, 4000)); @@ -407,7 +407,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) me->CallForHelp(100.0f); 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 515116cc6..129dfe45e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -201,7 +201,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); events.Reset(); @@ -465,7 +465,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } 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 c80a6107c..0de30a7bf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -51,7 +51,7 @@ struct boss_faction_championsAI : public ScriptedAI uint32 threatTimer; uint32 powerTimer; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); RecalculateThreat(); 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 28ff389cc..62877d27c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -125,7 +125,7 @@ public: creature->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); events.Reset(); 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 bfbcf80c6..a785f6c1a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -103,7 +103,7 @@ public: events.ScheduleEvent(EVENT_SPELL_FIRE_BOMB, urand(10000, 30000)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_SNOBOLLED, 1500); @@ -256,7 +256,7 @@ public: PlayerGUID.Clear(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); events.Reset(); @@ -527,7 +527,7 @@ struct boss_jormungarAI : public ScriptedAI events.RescheduleEvent(EVENT_SUBMERGE, urand(45000, 50000)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); ScheduleEvents(); @@ -798,7 +798,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); events.Reset(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index ec53af7ec..e43b729fa 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -212,7 +212,7 @@ struct boss_twin_valkyrAI : public ScriptedAI me->GetMotionMaster()->MoveChase(victim, 0.0f, 0.0f, 6.0f); }*/ - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); me->LowerPlayerDamageReq(me->GetMaxHealth()); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index d00035475..ae37e7b52 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -81,9 +81,9 @@ public: ++_raptorCount; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); _raptorCount = 0; events.ScheduleEvent(EVENT_SPELL_BELLOWING_ROAR, 33000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index b5b9e45bd..23cb5f6b6 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -117,10 +117,10 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON_FETID_TROLL, 3000); events.ScheduleEvent(EVENT_SUMMON_SHADOWCASTER, 9000); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 11a635bad..d88c2886b 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -90,10 +90,10 @@ public: me->CastSpell(me, SPELL_CLEAR_GIFT, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 5000); events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, urand(14000, 18000)); events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, urand(8000, 10000)); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index a5548353d..60c86d2f9 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -72,7 +72,7 @@ public: events2.ScheduleEvent(EVENT_SPAWN_INVADERS, 30000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_SPELL_INFECTED_WOUND, urand(6000, 10000)); events.ScheduleEvent(EVENT_SPELL_CRUSH, urand(3000, 5000)); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 56cac2126..725bf303b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -89,7 +89,7 @@ public: pInstance->SetData(DATA_BRONJAHM, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL_OOC); 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 05b888769..065e80fde 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 @@ -116,7 +116,7 @@ public: return 0; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_FACE_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index e27d9f669..b01c72b90 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -73,7 +73,7 @@ public: pInstance->SetData(DATA_FALRIC, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetImmuneToAll(false); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 1b67e8cc3..607c19e39 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -69,7 +69,7 @@ public: pInstance->SetData(DATA_MARWYN, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetImmuneToAll(false); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index f513dc46d..35f53e006 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -695,7 +695,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000); events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 8000); @@ -794,7 +794,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_FIREBALL, 3000); events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); @@ -941,7 +941,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SHADOW_STEP, 4000); events.ScheduleEvent(EVENT_DEADLY_POISON, 6000); @@ -1039,7 +1039,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); events.ScheduleEvent(EVENT_SHIELD_BASH, 6000); @@ -1125,7 +1125,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); events.ScheduleEvent(EVENT_FROST_TRAP, 15000); @@ -1201,7 +1201,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_FROSTSWORN_GENERAL_AGGRO); events.ScheduleEvent(EVENT_ACTIVATE_REFLECTIONS, 8000); @@ -1280,7 +1280,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_BALEFUL_STRIKE, urand(4000, 7000)); } @@ -1886,7 +1886,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(1, 10000); events.ScheduleEvent(2, 4500); @@ -1955,7 +1955,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(1, 5000); } 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 ab311645f..1be51bb47 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -109,7 +109,7 @@ public: pInstance->SetData(DATA_ACHIEV_ELEVEN, 0); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CastSpell(me, SPELL_PERMAFROST, true); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 6f620f27f..d2a9dd9bc 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -98,7 +98,7 @@ public: return pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) >= INSTANCE_PROGRESS_FINISHED_INTRO; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Creature* k = GetKrick()) k->AI()->Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 8889b14a5..1e2777ac7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -432,7 +432,7 @@ public: me->SetFacingTo(M_PI); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { /// @todo This spell check is invalid // if (SPELL_NECROLYTE_CHANNELING) diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index ddd9bc8d2..2ac3101ee 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -140,9 +140,9 @@ public: me->CastSpell(me, SPELL_FREEZE_ANIM, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_COLOSSUS_MIGHTY_BLOW, 10000); events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_1, 1000); events.ScheduleEvent(EVENT_COLOSSUS_HEALTH_2, 1000); @@ -276,7 +276,7 @@ public: Talk(EMOTE_ALTAR); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { } diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index c6ddd9b58..99e7e4c8a 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -76,9 +76,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ECK_BERSERK, urand(60000, 90000)); events.ScheduleEvent(EVENT_ECK_BITE, 5000); events.ScheduleEvent(EVENT_ECK_SPIT, 10000); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 730994771..8693c8436 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -111,10 +111,10 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); ScheduleEvents(true); me->RemoveAurasDueToSpell(SPELL_START_VISUAL); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index b639e814d..b07d8e44e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -81,10 +81,10 @@ public: events2.ScheduleEvent(EVENT_PHANTOM, 21000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CastSpell(me, SPELL_MOJO_FRENZY, true); events.ScheduleEvent(EVENT_GROUND_TREMOR, 18000); diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 1998352b4..c581c0059 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -102,10 +102,10 @@ public: _achievement = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_POISON_NOVA, 10000); events.ScheduleEvent(EVENT_POWERFULL_BITE, 3000); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index eab6f849c..e73d3c1d9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -234,7 +234,7 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { bool valid = true; if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID))) @@ -494,7 +494,7 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { bool valid = true; if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID))) @@ -779,7 +779,7 @@ public: instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { bool valid = true; if (Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index f7bdd21ed..9c9d7a2d7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -168,7 +168,7 @@ public: instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, NOT_STARTED); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer()) || !me->IsVisible()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 5792b4f48..740cde76f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -269,7 +269,7 @@ public: instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!_introDone) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 644a371d8..c97a496f1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -108,7 +108,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { @@ -435,7 +435,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { me->setActive(true); me->CastSpell(me, SPELL_PLAGUE_STENCH, true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 44f572f0f..89aa7a093 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -770,7 +770,7 @@ public: _events.ScheduleEvent(EVENT_INTRO_H_4, 39200); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { if (_instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE && !me->HasAura(SPELL_FRIENDLY_BOSS_DAMAGE_MOD)) me->CastSpell(me, SPELL_FRIENDLY_BOSS_DAMAGE_MOD, true); @@ -1106,7 +1106,7 @@ public: _events.ScheduleEvent(EVENT_INTRO_A_5, 45000); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { if (_instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE && !me->HasAura(SPELL_FRIENDLY_BOSS_DAMAGE_MOD)) me->CastSpell(me, SPELL_FRIENDLY_BOSS_DAMAGE_MOD, true); @@ -1658,7 +1658,7 @@ public: { } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { _events.Reset(); _events.ScheduleEvent(EVENT_BLADESTORM, urand(13000, 18000)); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index f90b8eea6..bb8c999d4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -265,7 +265,7 @@ public: me->GetMotionMaster()->MoveChase(victim); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer())) { @@ -716,7 +716,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } void UpdateAI(uint32 diff) override { @@ -829,7 +829,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { DoZoneInCombat(); } + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); } void UpdateAI(uint32 diff) override { @@ -1041,7 +1041,7 @@ public: me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); Talk(SAY_DARNAVAN_AGGRO); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 0b1326eb1..1fa5d63ad 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -127,7 +127,7 @@ public: instance->SetData(DATA_BONED_ACHIEVEMENT, uint32(true)); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); me->setActive(true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 492f2f408..f910ded64 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -294,7 +294,7 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Position homePos = me->GetHomePosition(); if (!instance->CheckRequiredBosses(DATA_PROFESSOR_PUTRICIDE, who->ToPlayer()) || me->GetExactDist2d(&homePos) > 10.0f || !me->IsVisible()) // check home position because during festergut/rotface fight, trigger missile after their death can trigger putricide combat diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index ce190eabc..a011f02a6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -147,7 +147,7 @@ public: events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer())) { @@ -891,7 +891,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { me->setActive(true); events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000)); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index e4c90d4f9..2fccedca6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -320,9 +320,9 @@ public: instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ASPHYXIATION); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { - if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer()) || !me->IsVisible()) + if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, who->ToPlayer()) || !me->IsVisible()) { EnterEvadeMode(EVADE_REASON_OTHER); instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT); @@ -1594,7 +1594,7 @@ public: } } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CastSpell(me, SPELL_FROST_AURA_RIMEFANG, true); } @@ -1785,7 +1785,7 @@ public: _events.ScheduleEvent(EVENT_WHELP_FROST_BLAST, urand(3000, 6000)); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->GetEntry() == NPC_FROSTWARDEN_HANDLER) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 57ee449bd..6d41f9210 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -669,7 +669,7 @@ public: me->PlayDirectSound(17374); } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer()) || !me->IsVisible()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 61e582387..42ef685cd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -520,7 +520,7 @@ public: checkTimer = 5000; } - void EnterCombat(Unit* target) override + void JustEngagedWith(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer())) { @@ -728,7 +728,7 @@ public: _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(10000, 20000)); } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { me->FinishSpell(CURRENT_CHANNELED_SPELL, false); me->SetInCombatWithZone(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 83d13a0b2..4c3266913 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1037,7 +1037,7 @@ public: } } - void EnterCombat(Unit* /*attacker*/) override + void JustEngagedWith(Unit* /*attacker*/) override { if (me->HasReactState(REACT_PASSIVE) || me->IsImmuneToAll()) { @@ -1046,7 +1046,7 @@ public: me->SetReactState(REACT_PASSIVE); return; } - _EnterCombat(); + _JustEngagedWith(); me->LowerPlayerDamageReq(me->GetMaxHealth()); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE))) { @@ -1241,7 +1241,7 @@ public: } } - void EnterCombat(Unit* /*target*/) override + void JustEngagedWith(Unit* /*target*/) override { if (IsUndead) DoZoneInCombat(); @@ -1627,7 +1627,7 @@ public: ScriptedAI::AttackStart(victim); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->InterruptNonMeleeSpells(false); me->CallForHelp(8.5f); @@ -2576,7 +2576,7 @@ public: void Reset() override { events.Reset(); } void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(1, urand(5000, 15000)); @@ -2643,7 +2643,7 @@ public: void Reset() override { events.Reset(); } void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(1, urand(5000, 10000)); @@ -2697,7 +2697,7 @@ public: void Reset() override { events.Reset(); } void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(1, urand(5000, 15000)); @@ -2758,7 +2758,7 @@ public: void Reset() override { events.Reset(); } void AttackStart(Unit* who) override { AttackStartCaster(who, 20.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(1, urand(5000, 15000)); @@ -2825,7 +2825,7 @@ public: void Reset() override { events.Reset(); summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); summons.DespawnAll(); @@ -3361,7 +3361,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CallForHelp(15.0f); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 0411bccd1..c123bd070 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -157,9 +157,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CallForHelp(30.0f); Talk(SAY_AGGRO); if (pInstance) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 913ba2a53..f6bc7afcf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -112,9 +112,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CallForHelp(VISIBLE_RANGE); summons.DoZoneInCombat(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 6a2951841..77df500c0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -295,9 +295,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); if (movementPhase == MOVE_PHASE_NONE) { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index de26c3e9c..9256656b0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -110,9 +110,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); events.ScheduleEvent(EVENT_MORTAL_WOUND, 10000); events.ScheduleEvent(EVENT_ENRAGE, 22000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 591cb95b5..9260b6774 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -249,9 +249,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); Talk(SAY_INTRO_1); events.ScheduleEvent(EVENT_INTRO_2, 4000); @@ -542,7 +542,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { switch (me->GetEntry()) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 00714018a..8ce511a0c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -96,9 +96,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); PullChamberAdds(); me->SetInCombatWithZone(); events.ScheduleEvent(EVENT_POISON_CLOUD, 15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index bbe385478..b4e3f59da 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(EMOTE_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); Talk(SAY_AGGRO); if (pInstance) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index e362d1a43..bd16819e2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -296,9 +296,9 @@ public: AttackStart(who); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_SUMMON_MINIONS); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE); me->RemoveAllAttackers(); @@ -601,7 +601,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); if (me->GetEntry() == NPC_UNSTOPPABLE_ABOMINATION) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index ef41b0444..60a53df49 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -109,9 +109,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); events.ScheduleEvent(EVENT_NECROTIC_AURA, 10000); events.ScheduleEvent(EVENT_DEATHBLOOM, 5000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 37c79a7f3..d772488c6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -108,9 +108,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); events.ScheduleEvent(EVENT_WEB_WRAP, 20000); events.ScheduleEvent(EVENT_WEB_SPRAY, 40000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index e4aa237d4..2c1deebc9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -166,9 +166,9 @@ public: ScriptedAI::EnterEvadeMode(why); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); StartGroundPhase(); if (pInstance) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index e3e88e92f..9d37a4bfc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -97,9 +97,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->SetInCombatWithZone(); events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 1500); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 0d6e0285c..a7ca5b988 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -132,9 +132,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_UNBALANCING_STRIKE, 20000); events.ScheduleEvent(EVENT_DISRUPTING_SHOUT, 15000); @@ -203,7 +203,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (Creature* cr = me->FindNearestCreature(NPC_RAZUVIOUS, 100.0f)) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 6f31f8417..0114ef772 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -158,9 +158,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); EnterCombatSelfFunction(); me->CastSpell(me, RAID_MODE(SPELL_FROST_AURA_10, SPELL_FROST_AURA_25), true); events.ScheduleEvent(EVENT_BERSERK, 900000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 4b9d3fde4..3450cc2fa 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -240,9 +240,9 @@ public: summons.Summon(cr); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetInCombatWithZone(); summons.DoZoneInCombat(NPC_FEUGEN); summons.DoZoneInCombat(NPC_STALAGG); @@ -414,7 +414,7 @@ public: ScriptedAI::EnterEvadeMode(why); } - void EnterCombat(Unit* pWho) override + void JustEngagedWith(Unit* pWho) override { me->SetInCombatWithZone(); if (Creature* cr = me->FindNearestCreature(NPC_TESLA_COIL, 150.f, true)) @@ -738,7 +738,7 @@ public: npc_teslaAI(Creature* creature) : ScriptedAI(creature) { } void EnterEvadeMode(EvadeReason /*why*/) override { } // never stop casting due to evade void UpdateAI(uint32 /*diff*/) override { } // never do anything unless told - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*who*/, uint32& damage, DamageEffectType, SpellSchoolMask) override { damage = 0; } // no, you can't kill it }; }; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index abdc2b98f..e55cb263e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -323,7 +323,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); DoZoneInCombat(); @@ -1087,7 +1087,7 @@ public: EventMap events; uint16 timer; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); events.Reset(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 07377fee6..19e29bfef 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -120,10 +120,10 @@ public: activeRifts++; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); activeRifts = 0; events.SetTimer(45000); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp index 1431f5e71..0532fb783 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp @@ -64,9 +64,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_BATTLE_SHOUT, 0); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 1d6cc27ec..222468e47 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -77,10 +77,10 @@ public: aGuids.clear(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CastSpell(me, SPELL_INTENSE_COLD, true); events.ScheduleEvent(EVENT_CRYSTALFIRE_BREATH, 14000); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 97f0a426e..eb6c82fe6 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -109,9 +109,9 @@ public: return 0; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MAGUS_ICE_NOVA, 10000); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 2db07c63b..8eb88454f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -83,10 +83,10 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_ORMOROK_CRYSTAL_SPIKES, 12000); events.ScheduleEvent(EVENT_ORMOROK_TRAMPLE, 10000); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 0f022848f..b7c709c8b 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -194,7 +194,7 @@ public: me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { _allowDeath = me->GetInstanceScript()->GetBossState(DATA_ORMOROK_EVENT) == DONE; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index d1a060b0c..1111c6fc4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -83,7 +83,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { 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 b0b42856d..1fd69434a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -101,7 +101,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 46f205a95..b811c96ec 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -141,7 +141,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, 49838, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if( lock ) return; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index a96cc2f1a..66717beb9 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -120,7 +120,7 @@ public: me->DisableRotate(false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index d0b53a34c..5d931e9c4 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -502,7 +502,7 @@ public: void Reset() override {} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(IsHeroic() ? H_SPELL_EMPOWERING_BLOWS : SPELL_EMPOWERING_BLOWS); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 6671b36cc..893643883 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -166,7 +166,7 @@ public: m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); Talk(SAY_AGGRO); @@ -395,7 +395,7 @@ public: BjarngrimGUID.Clear(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_ARC_WELD, 2000); events.ScheduleEvent(EVENT_RENEW_STEEL, 10000 + rand() % 1000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9bf1964e6..7dcc25eca 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -112,7 +112,7 @@ public: events.RescheduleEvent(EVENT_STATIC_OVERLOAD, 5000, 0, 1); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); 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 af87f7274..698487c4a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -112,7 +112,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1f40b0723..4073879ab 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -119,7 +119,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); Talk(SAY_AGGRO); @@ -487,7 +487,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.Reset(); if (me->GetEntry() == 28961) // NPC_TITANIUM_SIEGEBREAKER diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 43573d4dc..a2be8dcac 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -81,7 +81,7 @@ public: pInstance->SetData(BOSS_KRYSTALLUS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.RescheduleEvent(EVENT_BOULDER, 8000); 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 13ca54629..64c40a090 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 @@ -78,7 +78,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_STORM, 5000); events.ScheduleEvent(EVENT_SHOCK, 26000 + rand() % 6000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index c62a456dd..14cccb93f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -161,7 +161,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -429,7 +429,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_TOXIC_VOLLEY, 5000); } @@ -486,7 +486,7 @@ public: events.RescheduleEvent(EVENT_MALFORMED_OOZE_CHECK, 1000); } - void EnterCombat(Unit*) override { } + void JustEngagedWith(Unit*) override { } void MoveInLineOfSight(Unit*) override { } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index b0c89d76b..035fead0e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -715,7 +715,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_DRP_CHARGE, 10000); events.ScheduleEvent(EVENT_DRP_CLEAVE, 7000); @@ -773,7 +773,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_DRS_LIGHTNING_BOLD, 5000); events.ScheduleEvent(EVENT_DRS_SHADOW_WORD_PAIN, 12000); @@ -828,7 +828,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_IGC_CRUSH, 6000); events.ScheduleEvent(EVENT_IGC_GROUND_SMASH, 4000); 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 c922d2c9b..f703c64a5 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 @@ -463,7 +463,7 @@ public: me->setActive(false); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (_fightWon) return; 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 9ebce4506..fc90aca81 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 @@ -229,7 +229,7 @@ public: me->RemoveAllAuras(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (pInstance) pInstance->SetData(TYPE_ASSEMBLY, IN_PROGRESS); @@ -425,7 +425,7 @@ public: me->RemoveAllAuras(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { me->InterruptNonMeleeSpells(false); me->setActive(true); @@ -642,7 +642,7 @@ public: me->RemoveAllAuras(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { me->InterruptNonMeleeSpells(false); me->setActive(true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 1ccebe1a3..5ce55b6f2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -172,7 +172,7 @@ public: void JustReachedHome() override { me->setActive(false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_AURIAYA, IN_PROGRESS); @@ -289,7 +289,7 @@ public: uint32 _savagePounceTimer; uint32 _ripFleshTimer; - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (me->GetInstanceScript()) if (Creature* cr = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(TYPE_AURIAYA))) 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 3ce5ce7b9..4def9710b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -252,7 +252,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { ScheduleEvents(); Talk(FLAME_LEVIATHAN_SAY_AGGRO); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 316f39a42..89d61de72 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -474,7 +474,7 @@ public: void JustReachedHome() override { me->setActive(false); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->setActive(true); me->SetInCombatWithZone(); @@ -698,7 +698,7 @@ public: freya->AI()->DoAction(ACTION_LUMBERJACKED); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_STONEBARK_FISTS_OF_STONE, 40000); events.ScheduleEvent(EVENT_STONEBARK_GROUND_TREMOR, 5000); @@ -794,7 +794,7 @@ public: freya->AI()->DoAction(ACTION_LUMBERJACKED); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_BRIGHTLEAF_FLUX, 10000); events.ScheduleEvent(EVENT_BRIGHTLEAF_SOLAR_FLARE, 5000); @@ -905,7 +905,7 @@ public: freya->AI()->DoAction(ACTION_LUMBERJACKED); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_IRONBRANCH_IMPALE, 10000); events.ScheduleEvent(EVENT_IRONBRANCH_IRON_ROOT, 15000); @@ -1114,7 +1114,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (me->GetEntry() == NPC_ANCIENT_CONSERVATOR) { 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 b91907d82..be2699ea0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -151,7 +151,7 @@ public: me->setActive(false); } - void EnterCombat(Unit* /*pWho*/) override + void JustEngagedWith(Unit* /*pWho*/) override { me->setActive(true); me->SetInCombatWithZone(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 886f17969..41280a413 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -264,7 +264,7 @@ public: SpawnHelpers(); } - void EnterCombat(Unit* /*pWho*/) override + void JustEngagedWith(Unit* /*pWho*/) override { me->CastSpell(me, SPELL_BITING_COLD_BOSS_AURA, true); SmallIcicles(true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 2e6934011..3bf5b917f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -224,7 +224,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 1196e2c10..807fe43b3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -377,7 +377,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_KOLOGARN, IN_PROGRESS); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 2f153e123..cdefcc475 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -331,7 +331,7 @@ public: ScriptedAI::JustReachedHome(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->setActive(true); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 80d836218..f91f8a9ec 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -205,7 +205,7 @@ public: me->GetMotionMaster()->MoveChase(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); events.Reset(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 0538c4e75..e7f0f84d7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -512,7 +512,7 @@ public: void JustReachedHome() override { me->setActive(false); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (m_pInstance && !_encounterFinished) m_pInstance->SetData(TYPE_THORIM, IN_PROGRESS); @@ -1000,7 +1000,7 @@ public: } void MoveInLineOfSight(Unit* /*who*/) override {} - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} void AttackStart(Unit* /*who*/) override {} void InitWaypoint() @@ -1129,7 +1129,7 @@ public: thorim->AI()->DoAction(ACTION_START_TRASH_DIED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (me->GetEntry() == NPC_DARK_RUNE_ACOLYTE_I) { @@ -1248,7 +1248,7 @@ public: _isCaster = (me->GetEntry() == NPC_DARK_RUNE_ACOLYTE_G); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (me->GetEntry() == NPC_IRON_RING_GUARD) { @@ -1384,7 +1384,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.CancelEvent(EVENT_RC_RUNIC_SMASH); events.ScheduleEvent(EVENT_RC_RUNIC_BARRIER, 10000); @@ -1496,7 +1496,7 @@ public: events.Reset(); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { _isInCombat = true; events.CancelEvent(EVENT_ARG_SPAWN); @@ -1583,7 +1583,7 @@ public: me->CastSpell(me, SPELL_AURA_OF_CELERITY, true); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (me->GetEntry() == NPC_DARK_RUNE_WARBRINGER) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 6dc81c834..527369a7f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -198,7 +198,7 @@ public: void JustReachedHome() override { me->setActive(false); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); events.ScheduleEvent(EVENT_ENRAGE, 600000, 0, 0); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 4eaa6de1d..29d13f1a4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -230,7 +230,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(1, 2000); // checking Separation Anxiety, Charged Sphere 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 893e524b4..24a5e0b72 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 @@ -159,7 +159,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); // schedule Phase 1 abilities diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 3222ac5f4..24a609747 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -156,7 +156,7 @@ public: pInstance->SetData(DATA_KELESETH, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.RescheduleEvent(EVENT_SPELL_SHADOWBOLT, 0); 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 cd20acec9..1191bd9d4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -117,7 +117,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { events.Reset(); events.RescheduleEvent(EVENT_SHARVALD_CHARGE, 5000); @@ -285,7 +285,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { events.Reset(); events.RescheduleEvent(EVENT_SHADOW_BOLT, 1000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 0664944a8..ee66014bd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -73,7 +73,7 @@ public: me->SaveRespawnTime(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (pInstance) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 75509078b..cd993a802 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -210,7 +210,7 @@ public: events.RescheduleEvent(EVENT_UNFREEZE_MONSTER, 3000); } } - void EnterCombat(Unit* /*pWho*/) override + void JustEngagedWith(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(DATA_GORTOK_PALEHOOF, IN_PROGRESS); @@ -367,7 +367,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void DoAction(int32 param) override { @@ -493,7 +493,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void DoAction(int32 param) override { @@ -603,7 +603,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void DoAction(int32 param) override { @@ -711,7 +711,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit*) override {} + void JustEngagedWith(Unit*) override {} void DoAction(int32 param) override { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 72c739bf2..26088671d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -159,7 +159,7 @@ public: Creature* GetGrauf() { return ObjectAccessor::GetCreature(*me, GraufGUID); } - void EnterCombat(Unit* /*pWho*/) override + void JustEngagedWith(Unit* /*pWho*/) override { if (!EventStarted) { @@ -386,7 +386,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index b8623afb7..6f8e67585 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -175,7 +175,7 @@ public: summon->CastSpell(summon, SPELL_TELEPORT_VISUAL, true); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); 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 7de1ed769..0b6b14d19 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -165,7 +165,7 @@ public: ScriptedAI::EnterEvadeMode(why); } - void EnterCombat(Unit* /*pWho*/) override + void JustEngagedWith(Unit* /*pWho*/) override { Talk(SAY_AGGRO); if(pInstance) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index b283a3baa..5565beacb 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -96,7 +96,7 @@ class boss_archavon : public CreatureScript ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 4a36a0f4f..2f6d7f185 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -132,7 +132,7 @@ public: target->SetFullHealth(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); if (summons.size() < 4) diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 4558291ae..4a005485d 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -85,7 +85,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CastSpell(me, SPELL_BURNING_FURY, true); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 0b76b1631..7ee6572dd 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -92,7 +92,7 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->CastSpell(me, SPELL_FROZEN_MALLET, true); @@ -180,7 +180,7 @@ public: me->CastSpell(me, SPELL_FROZEN_ORB_DMG, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 69bd9bba2..5bb9baa6a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -82,7 +82,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); Talk(SAY_AGGRO); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 0e1a1c51c..d16349987 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -83,7 +83,7 @@ public: events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); Talk(SAY_AGGRO); @@ -257,7 +257,7 @@ public: events.Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { DoZoneInCombat(); events.Reset(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index beb124351..78cb5f677 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -153,7 +153,7 @@ public: me->CastSpell(plr, spellId, triggered); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { bIsExploded = false; bIsFrenzy = false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 834459ea4..511e061e1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -67,7 +67,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); events.Reset(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 78b73531b..4bf33c610 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -70,7 +70,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); me->CastSpell(me, SPELL_RAY_OF_SUFFERING, true); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 23dbd25a2..814509a7d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -85,7 +85,7 @@ public: spheres.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 96b5bda34..1f538e20d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -81,7 +81,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 21e61c017..206356a91 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -275,7 +275,7 @@ struct violet_hold_trashAI : public npc_escortAI c->RemoveAura(SPELL_DESTROY_DOOR_SEAL, me->GetGUID()); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!who->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE)) { diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index afeba1fc5..746351feb 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -258,7 +258,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CHECK_RAGE, 2000); events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 6000); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 94bec6016..8eea98850 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -541,7 +541,7 @@ struct npc_beryl_sorcererAI : public CreatureAI Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->IsValidAttackTarget(who)) { @@ -770,7 +770,7 @@ public: DoMeleeAttackIfReady(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -1077,7 +1077,7 @@ public: m_uiTimer = 0; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } @@ -2011,7 +2011,7 @@ public: void Reset() override {} - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_DEFLECTION, 10000, 20000); _events.ScheduleEvent(EVENT_SOUL_BLAST, 4000, 6000); diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 88d0a87f5..4408eaa51 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -444,7 +444,7 @@ public: void Reset() override {} - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} void AttackStart(Unit* /*who*/) override {} @@ -656,7 +656,7 @@ public: me->AddAura(1908, me); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -756,7 +756,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->AddAura(1908, me); Battleshout_timer = 1000; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index e737e63c8..7b78d8d11 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -2187,7 +2187,7 @@ public: _playerGUID.Clear(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { _events.ScheduleEvent(EVENT_HEMORRHAGE, urand(5000, 8000)); _events.ScheduleEvent(EVENT_KIDNEY_SHOT, urand(12000, 15000)); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index e93fb93ef..20a892c67 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -183,7 +183,7 @@ public: } } - void EnterCombat(Unit* /*Who*/) override + void JustEngagedWith(Unit* /*Who*/) override { Talk(SAY_RANDOMAGGRO); } @@ -231,7 +231,7 @@ public: void Reset() override { } - void EnterCombat(Unit* Who) override + void JustEngagedWith(Unit* Who) override { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { @@ -548,7 +548,7 @@ public: me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_CLEAVE, urand(1000, 7000)); events.ScheduleEvent(EVENT_HAMSTRING, urand(5000, 12000)); diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 846d36e5b..f0fe1c047 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -1850,7 +1850,7 @@ public: events.ScheduleEvent(EVENT_SPAWN, 3000); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 3550ca5bc..d34470526 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -152,7 +152,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_ARTRUIS_AGGRO); me->CastSpell(me, SPELL_ARTRUIS_ICY_VEINS, true); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index a443c0bc0..95de09ef4 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -44,7 +44,7 @@ public: npc_frosthoundAI(Creature* creature) : npc_escortAI(creature) {} void AttackStart(Unit* /*who*/) override {} - void EnterCombat(Unit* /*who*/) override {} + void JustEngagedWith(Unit* /*who*/) override {} void EnterEvadeMode(EvadeReason /* why */) override {} void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override @@ -251,7 +251,7 @@ public: void WaypointReached(uint32 /*pointId*/) override { } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.Reset(); if (me->GetEntry() == NPC_TIME_LOST_PROTO_DRAKE) @@ -922,7 +922,7 @@ public: npc_icefangAI(Creature* creature) : npc_escortAI(creature) { } void AttackStart(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void EnterEvadeMode(EvadeReason /*why*/) override { } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) override diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 9004217d9..aa38b591b 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -455,7 +455,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { Talk(SAY_DRAKURU_3); events.ScheduleEvent(EVENT_BETRAYAL_SHADOW_BOLT, 2000); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 61e1e6c82..41e1d97de 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -20,7 +20,7 @@ #include "OutdoorPvP.h" -// @todo: "sometimes" set to neutral +/// @todo: "sometimes" set to neutral enum OutdoorPvPNASpells { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index 73f987b4d..efbb8201a 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -259,5 +259,5 @@ private: uint32 m_HordeTowersControlled; }; -// @todo: flag carrier death/leave/mount/activitychange should give back the gossip options +/// @todo: flag carrier death/leave/mount/activitychange should give back the gossip options #endif diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index c85d1a1fd..fb65e27f2 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -78,7 +78,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { Talk(SAY_AGGRO); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index f82b8d35d..80aee8195 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -78,7 +78,7 @@ public: me->SetControlled(false, UNIT_STATE_ROOT); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_SPELL_INHIBIT_MAGIC, 0); events.ScheduleEvent(EVENT_SPELL_ATTRACT_MAGIC, 28000); 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 d2b812469..a6013e1dd 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -88,7 +88,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { Talk(SAY_AGGRO); @@ -190,7 +190,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000, 9000)); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 044668273..2864d95f7 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -62,7 +62,7 @@ public: VoidBlastCounter = 0; } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { me->SetInCombatWithZone(); 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 3e2abf3f6..c8e350ae9 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 @@ -83,7 +83,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); @@ -229,7 +229,7 @@ public: me->RemoveAurasDueToSpell(SPELL_BANISH_SELF); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_SCREECH, 14000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index d6aabb4e8..893a31715 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -87,7 +87,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { if (isBanished) return; 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 d51a1a21a..d50c42f70 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 @@ -82,7 +82,7 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_INCITE, 20000); 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 44bf8eb37..f26528d9c 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -136,7 +136,7 @@ public: instance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); summonPortals(); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index fba9f6f19..b9a9f3229 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -76,7 +76,7 @@ public: instance->SetData(DATA_MURMUREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPELL_SONIC_BOOM, 30000); events.ScheduleEvent(EVENT_SPELL_MURMURS_TOUCH, urand(8000, 20000)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index e7ddb967b..d2a67850b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -92,9 +92,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->CastSpell(me, SPELL_ACIDIC_WOUND, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index f90347a34..95a77b1e6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -321,10 +321,10 @@ public: events.ScheduleEvent(EVENT_SPELL_FRENZY, 40000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { summons.DespawnAll(); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); ScheduleNormalEvents(1); events.ScheduleEvent(EVENT_SPELL_BERSERK, 25 * MINUTE * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SUMMON_MINIONS, 1000); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b354d7e52..16ec52b3f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -87,9 +87,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->CastSpell(me, SPELL_SABER_LASH_AURA, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index bc4f97a1d..38b8f8f78 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -183,9 +183,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void JustSummoned(Creature* summon) override @@ -327,7 +327,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SUFF_SAY_FREED); me->CastSpell(me, SPELL_AURA_OF_SUFFERING, true); @@ -437,7 +437,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(DESI_SAY_FREED); me->CastSpell(me, SPELL_AURA_OF_DESIRE, true); @@ -529,7 +529,7 @@ public: Unit::Kill(summoner, summoner); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(ANGER_SAY_FREED); me->CastSpell(me, SPELL_AURA_OF_ANGER, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 57d52608a..f628c6489 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -158,9 +158,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void DoAction(int32 param) override @@ -332,7 +332,7 @@ public: shade->AI()->DoAction(ACTION_AKAMA_DIED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPELL_CHAIN_LIGHTNING, 2000); events.ScheduleEvent(EVENT_SPELL_DESTRUCTIVE_POISON, 5000); diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index ed2bad609..89bded4e4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -67,9 +67,9 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); SchedulePhase(false); events.ScheduleEvent(EVENT_SPELL_BERSERK, 900000); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 75121d6ac..f13f7f0fe 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -107,9 +107,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_INCINERATE, 24000); events.ScheduleEvent(EVENT_SPELL_DOOM_BLOSSOM, 10000); events.ScheduleEvent(EVENT_SPELL_CRUSHING_SHADOWS, 17000); diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 47da1a2bf..bab5cdea9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -86,9 +86,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_BERSERK, 480000); events.ScheduleEvent(EVENT_YELL, urand(25000, 100000)); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index fddebcb5d..c791d4448 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -271,7 +271,7 @@ struct boss_illidari_council_memberAI : public ScriptedAI council->GetAI()->DoAction(ACTION_END_ENCOUNTER); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Creature* council = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ILLIDARI_COUNCIL))) council->GetAI()->DoAction(ACTION_START_ENCOUNTER); @@ -305,9 +305,9 @@ public: return ObjectAccessor::GetCreature(*me, instance->GetGuidData(RAND(NPC_GATHIOS_THE_SHATTERER, NPC_HIGH_NETHERMANCER_ZEREVOR))); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_illidari_council_memberAI::EnterCombat(who); + boss_illidari_council_memberAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_BLESSING, 10000); events.ScheduleEvent(EVENT_SPELL_AURA, 0); events.ScheduleEvent(EVENT_SPELL_SEAL, 2000); @@ -386,9 +386,9 @@ public: me->GetMotionMaster()->MoveChase(who, 20.0f); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_illidari_council_memberAI::EnterCombat(who); + boss_illidari_council_memberAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_FLAMESTRIKE, 25000); events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 5000); events.ScheduleEvent(EVENT_SPELL_ARCANE_BOLT, 15000); @@ -459,9 +459,9 @@ public: me->GetMotionMaster()->MoveChase(who, 20.0f); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - boss_illidari_council_memberAI::EnterCombat(who); + boss_illidari_council_memberAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_REFLECTIVE_SHIELD, 10000); events.ScheduleEvent(EVENT_SPELL_CIRCLE_OF_HEALING, 20000); events.ScheduleEvent(EVENT_SPELL_DIVINE_WRATH, 5000); @@ -517,10 +517,10 @@ public: { boss_veras_darkshadowAI(Creature* creature) : boss_illidari_council_memberAI(creature) { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { me->SetCanDualWield(true); - boss_illidari_council_memberAI::EnterCombat(who); + boss_illidari_council_memberAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_VANISH, 10000); events.ScheduleEvent(EVENT_SPELL_ENRAGE, 900000); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index be83e2829..ef979b2c9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -127,9 +127,9 @@ public: gobject->SetGoState(GO_STATE_ACTIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->CallForHelp(10.0f); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 84424b482..a3c94d269 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -168,9 +168,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_ENRAGE, 600000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index eb2db7192..4ecb9e585 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -138,9 +138,9 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); me->CastSpell(me, SPELL_REMOVE_TAINTED_CORES, true); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 5dcee04f9..79bd3180d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -172,9 +172,9 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->SetStandState(UNIT_STAND_STATE_KNEEL); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 1ff3f3771..34349e80a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -116,7 +116,7 @@ public: me->Attack(who, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPELL_WHIRL, 18000); events.ScheduleEvent(EVENT_SPELL_SPOUT, 45000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 66c73cca7..65c4aa659 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -105,9 +105,9 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_TIDAL_WAVE, 10000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp index 51866c34f..55cc12d06 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp @@ -129,7 +129,7 @@ public: events.RescheduleEvent(EVENT_SPELL_SUMMON_COLDWAVE, 5000); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); events.Reset(); 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 3b5a7ffcc..87523b579 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -75,7 +75,7 @@ public: Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_LIGHTNING, 15000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 95ff6c83f..6c2356e88 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -82,7 +82,7 @@ public: Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_SHRINK, 20000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 0ae0558ba..704c88d31 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -68,7 +68,7 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_REFLECTION, 10000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp index 96ac8a247..8054fa261 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_ghazan.cpp @@ -59,13 +59,13 @@ struct boss_ghazan : public BossAI BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_ACID_BREATH, 3s); events.ScheduleEvent(EVENT_ACID_SPIT, 1s); events.ScheduleEvent(EVENT_TAIL_SWEEP, DUNGEON_MODE(5900ms, 10s)); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*type*/, SpellSchoolMask /*school*/) override diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index a8e71dc16..980ef0969 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -70,9 +70,9 @@ struct boss_hungarfen : public BossAI DoCastAOE(SPELL_DESPAWN_MUSHROOMS, true); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); _scheduler.Schedule(IsHeroic() ? randtime(2400ms, 3600ms) : 10s, [this](TaskContext context) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index c2b085fe2..e3171541d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -64,7 +64,7 @@ struct boss_the_black_stalker : public BossAI { } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { events.ScheduleEvent(EVENT_LEVITATE, urand(8000, 12000)); events.ScheduleEvent(EVENT_SPELL_CHAIN, 6000); @@ -73,7 +73,7 @@ struct boss_the_black_stalker : public BossAI if (IsHeroic()) events.ScheduleEvent(EVENT_SPELL_SPORES, urand(10000, 15000)); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void JustSummoned(Creature* summon) override diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 9458e8bde..47caa5ca6 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -79,9 +79,9 @@ struct boss_gruul : public BossAI _caveInTimer = 29000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_GROWTH, 30000); diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 7c848380b..336955441 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -121,9 +121,9 @@ struct boss_high_king_maulgar : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCING_SMASH, 6s); @@ -209,7 +209,7 @@ struct boss_olm_the_summoner : public ScriptedAI me->GetMotionMaster()->MoveChase(who, 25.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -275,7 +275,7 @@ struct boss_kiggler_the_crazed : public ScriptedAI instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -342,7 +342,7 @@ struct boss_blindeye_the_seer : public ScriptedAI instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -412,7 +412,7 @@ struct boss_krosh_firehand : public ScriptedAI me->GetMotionMaster()->MoveChase(who, 25.0f); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SetInCombatWithZone(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index da6ff8e70..b2cc0ea3c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -43,10 +43,10 @@ struct boss_broggok : public BossAI me->SetImmuneToAll(true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); } void JustSummoned(Creature* summoned) override 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 8f5741c63..f844aa727 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 @@ -99,7 +99,7 @@ public: instance->SetData(DATA_KELIDAN, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_SPELL_VOLLEY, 1000); events.ScheduleEvent(EVENT_SPELL_CORRUPTION, 5000); @@ -307,7 +307,7 @@ public: return nullptr; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (Creature* kelidan = GetKelidan()) kelidan->AI()->DoAction(ACTION_CHANNELER_ENGAGED); 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 42dddb7d4..efc7a5316 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -59,7 +59,7 @@ public: instance->HandleGameObject(instance->GetGuidData(DATA_DOOR2), true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SPELL_EXPLODING, 6000); 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 3c3973c50..84a017623 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 @@ -65,10 +65,10 @@ public: _targetGUID.Clear(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SUMMON1, 10000); events.ScheduleEvent(EVENT_SUMMON2, 25000); 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 908789f23..4ae4b5a96 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 @@ -176,7 +176,7 @@ public: me->DespawnOrUnsummon(1); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_CHANGE_POS, 0); events.ScheduleEvent(EVENT_SPELL_FIREBALL, 5000); @@ -286,7 +286,7 @@ public: me->DespawnOrUnsummon(1); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_AGGRO_TALK, 5000); events.ScheduleEvent(EVENT_SPELL_REVENGE, 4000); 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 e15fd01ce..42e1c1519 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -64,10 +64,10 @@ public: BossAI::Reset(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000); events.ScheduleEvent(EVENT_SURGE, 3000); events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 2eec1fca3..b7ec0db34 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -134,10 +134,10 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events2.Reset(); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_EMOTE1, 0); events.ScheduleEvent(EVENT_EMOTE2, 60000); events.ScheduleEvent(EVENT_EMOTE3, 120000); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index e488495ca..8284319a0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -168,7 +168,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 6209c20be..d71a2dad5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -92,7 +92,7 @@ public: return summons.GetCreatureWithEntry(NPC_RIGHT_HEAD); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -104,7 +104,7 @@ public: events2.ScheduleEvent(aggroYell, 3000); } - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SPELL_FEAR, 8000); events.ScheduleEvent(EVENT_SPELL_BURNING_MAUL, 25000); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 893d85104..1df447a16 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -83,10 +83,10 @@ public: executioner->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CHECK_ROOM, 5000); events.ScheduleEvent(EVENT_SUMMON_ADDS, 30000); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index dfa312a1b..726e2523b 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -117,9 +117,9 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SWITCH_PLATFORM, 0); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index f1ca67c7b..412f09158 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -102,10 +102,10 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); me->CallForHelp(105.0f); events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index e96823f92..d5d4de468 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -263,9 +263,9 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); } void KilledUnit(Unit* victim) override 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 26af9fc92..a6eaba296 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -70,10 +70,10 @@ public: BossAI::JustDied(killer); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); - BossAI::EnterCombat(who); + BossAI::JustEngagedWith(who); events.ScheduleEvent(EVENT_SPELL_POUNDING, 15000); events.ScheduleEvent(EVENT_SPELL_ARCANEORB, 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 d0200deba..4a30cad15 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -56,9 +56,9 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); events.ScheduleEvent(EVENT_SAW_BLADE, 20000); events.ScheduleEvent(EVENT_SHADOW_POWER, 30000); 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 b8ba6d8c6..fc2483722 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -51,9 +51,9 @@ public: { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 15000); events.ScheduleEvent(EVENT_JACKHAMMER, 35000); 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 6585cd915..c594931d1 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 @@ -63,9 +63,9 @@ public: { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(YELL_AGGRO); events.ScheduleEvent(EVENT_HEADCRACK, 6000); events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10000); 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 682d47f4a..2a6e19eaf 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -52,9 +52,9 @@ public: { boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_FROST_ATTACK, 6000); events.ScheduleEvent(EVENT_ARCANE_BLAST, 14000); events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18000); @@ -158,7 +158,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ALL, true); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_SPELL_FIRE_TAIL, 500); events.ScheduleEvent(EVENT_SPELL_INFERNO, urand(10000, 20000)); 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 ee0e23f0b..c18d6c3b6 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 @@ -78,9 +78,9 @@ public: Talk(SAY_APPEAR); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_SUMMON, 30000); events.ScheduleEvent(EVENT_MANA_TAP, 12000); events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16000); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 04c9139fe..445a5f925 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -119,7 +119,7 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.ScheduleEvent(EVENT_MILL_CHECK_HEALTH, 1000); events.ScheduleEvent(EVENT_MILL_PYROBLAST, 30000); @@ -354,7 +354,7 @@ public: void MoveInLineOfSight(Unit*) override { } void AttackStart(Unit*) override { } - void EnterCombat(Unit*) override { } + void JustEngagedWith(Unit*) override { } void JustDied(Unit*) override { 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 72c315a62..1b7de47fc 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 @@ -77,9 +77,9 @@ struct boss_dalliah_the_doomsayer : public BossAI } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); if (Creature* soccothrates = instance->GetCreature(DATA_SOCCOTHRATES)) diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index d31658aa7..e16d23003 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -78,7 +78,7 @@ public: me->SetImmuneToAll(false); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); me->SetInCombatWithZone(); 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 86b95aeb2..33cb9ee41 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 @@ -110,9 +110,9 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events2.Reset(); events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000)); events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000)); 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 b36c13978..160a641ef 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 @@ -51,9 +51,9 @@ struct boss_zereketh_the_unbound : public BossAI Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); scheduler.Schedule(6s, [this](TaskContext context) 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 924e11a07..34a885db2 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -59,9 +59,9 @@ public: _Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_ARCANE_RESONANCE, 20000); events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 10000); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 3af92dd8a..27855a229 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -49,9 +49,9 @@ struct boss_high_botanist_freywinn : public BossAI { boss_high_botanist_freywinn(Creature* creature) : BossAI(creature, DATA_HIGH_BOTANIST_FREYWINN) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); scheduler.Schedule(6s, [this](TaskContext context) diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index d898f13ce..b9399aff0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -98,9 +98,9 @@ public: me->CastSpell(me, _lastTransform, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_ALERGIC_REACTION, 5000); events.ScheduleEvent(EVENT_TRANSFORM, 30000); 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 7335ae460..dee13b043 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 @@ -76,9 +76,9 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SACRIFICE, 6000); events.ScheduleEvent(EVENT_HELLFIRE, 18000); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 046c469aa..dd85decc7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -41,9 +41,9 @@ struct boss_warp_splinter : public BossAI { boss_warp_splinter(Creature* creature) : BossAI(creature, DATA_WARP_SPLINTER) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); scheduler.Schedule(8s, [this](TaskContext context) diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 24145c39b..62377ca8a 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -86,7 +86,7 @@ public: Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index e2022bab6..69a749478 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -84,7 +84,7 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 98e96bdce..a58dcd50b 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -39,7 +39,7 @@ EndContentData */ #include "SpellInfo.h" #include "SpellScript.h" -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 @@ -306,7 +306,7 @@ public: IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override @@ -462,7 +462,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 65ec06932..b6cd91367 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -261,7 +261,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 2823e440c..39d7d95bd 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -108,7 +108,7 @@ public: FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } @@ -236,7 +236,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* who) override @@ -454,7 +454,7 @@ public: FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 97aadbe9c..8936a0598 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -313,7 +313,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_CRUSADER_STRIKE, 3000); _events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 6000); @@ -415,7 +415,7 @@ public: me->SetHomePosition(me->GetPosition()); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { AttackStart(who); _events.ScheduleEvent(EVENT_SPELL_HOLY_SMITE, 1000); @@ -498,7 +498,7 @@ public: me->SetHomePosition(me->GetPosition()); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPELL_DEMORALIZING_SHOUT, 1000); _events.ScheduleEvent(EVENT_SPELL_HEROIC_STRIKE, urand(2500, 4000)); @@ -648,7 +648,7 @@ public: karja->GetAI()->DoAction(RESET_DEATHBLOW_EVENT); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { combatEvents.ScheduleEvent(EVENT_SPELL_ANTI_MAGIC_SHIELD, 20000); combatEvents.ScheduleEvent(EVENT_SPELL_BACKLASH, 4000); @@ -870,13 +870,13 @@ public: // Engage combat with Socrethar if (GetCreature(ADYEN_THE_LIGHTBRINGER)) - adyen->AI()->EnterCombat(me); + adyen->AI()->JustEngagedWith(me); if (GetCreature(EXARCH_ORELIS)) - orelis->AI()->EnterCombat(me); + orelis->AI()->JustEngagedWith(me); if (GetCreature(ANCHORITE_KARJA)) - karja->AI()->EnterCombat(me); + karja->AI()->JustEngagedWith(me); if (GetCreature(ISHANAH_HIGH_PRIESTESS)) - ishanah->AI()->EnterCombat(me); + ishanah->AI()->JustEngagedWith(me); break; } } @@ -941,7 +941,7 @@ public: bool second_waypath_done = false; bool adyen_dead = false, karja_dead = false, orelis_dead = false; - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { _events.ScheduleEvent(EVENT_SPELL_BURNING_LIGHT, 2000); _events.ScheduleEvent(EVENT_SPELL_CONSECRATION, 3000); @@ -1212,7 +1212,7 @@ public: } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { SummonsAction(who); } @@ -1382,7 +1382,7 @@ public: isEvent = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustSummoned(Creature* summoned) override { @@ -1713,7 +1713,7 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 353386015..f295c6663 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -607,7 +607,7 @@ public: Tapped = false; } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_KICK, urand(5000, 10000)); events.ScheduleEvent(EVENT_SUNDER, urand(5000, 10000)); @@ -944,7 +944,7 @@ public: DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { //don't always use if (rand() % 5) @@ -1113,7 +1113,7 @@ public: me->SetTarget(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void HandleAnimation() { @@ -1279,7 +1279,7 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } @@ -1406,7 +1406,7 @@ public: Timers = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { @@ -1654,7 +1654,7 @@ public: void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void JustDied(Unit* /*killer*/) override { diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 74baa9f24..35b7234c4 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -477,7 +477,7 @@ public: EventMap _events; - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { AttackStart(who); _events.ScheduleEvent(EVENT_SPELL_ISHANAH_HOLY_SMITE, 2000); diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index f538ef0fd..8e51648b6 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -365,7 +365,7 @@ public: me->SetFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoNice() { @@ -464,7 +464,7 @@ public: npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* done_by, uint32& damage, DamageEffectType, SpellSchoolMask) override { @@ -553,7 +553,7 @@ public: me->SetFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -674,7 +674,7 @@ public: } } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { events.Reset(); events.ScheduleEvent(EVENT_SPELL_WRATH, 0); diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index d6f918620..266d67fc5 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -104,7 +104,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { _spoken = 2; } @@ -273,7 +273,7 @@ public: me->SetFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index c5a34ffa5..74dbe3680 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -30,7 +30,7 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index ebd2ce038..1112cf190 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -46,7 +46,7 @@ struct npc_pet_shaman_earth_elemental : public ScriptedAI { npc_pet_shaman_earth_elemental(Creature* creature) : ScriptedAI(creature), _initAttack(true) { } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { _events.Reset(); _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, 0); @@ -91,7 +91,7 @@ struct npc_pet_shaman_fire_elemental : public ScriptedAI void InitializeAI() override { } - void EnterCombat(Unit*) override + void JustEngagedWith(Unit*) override { _events.Reset(); _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000)); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 13c1df6dd..ed54071bd 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -43,7 +43,7 @@ #include "Vehicle.h" #include -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 1d95d5b24..7f3468659 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -31,7 +31,7 @@ #include "SpellMgr.h" #include "SpellScript.h" -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 5792aab9f..e1bfd24fd 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -307,10 +307,10 @@ public: events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_YSONDRE_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } // Summon druid spirits on 75%, 50% and 25% health @@ -412,10 +412,10 @@ public: me->RemoveAurasDueToSpell(SPELL_SHADOW_BOLT_WHIRL); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_LETHON_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); DoCastSelf(SPELL_SHADOW_BOLT_WHIRL, true); } @@ -539,10 +539,10 @@ public: emerald_dragonAI::KilledUnit(who); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_EMERISS_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override @@ -630,10 +630,10 @@ public: events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_TAERAR_AGGRO); - emerald_dragonAI::EnterCombat(who); + emerald_dragonAI::JustEngagedWith(who); } void SummonedCreatureDies(Creature* /*summon*/, Unit*) override diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 335c9c5f9..6c6e1130f 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -48,7 +48,7 @@ public: IsSelfRooted = false; } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!me->IsWithinMeleeRange(who)) IsSelfRooted = true; diff --git a/src/server/scripts/World/npc_stave_of_ancients.cpp b/src/server/scripts/World/npc_stave_of_ancients.cpp index 24e6fa411..130d72b6a 100644 --- a/src/server/scripts/World/npc_stave_of_ancients.cpp +++ b/src/server/scripts/World/npc_stave_of_ancients.cpp @@ -291,7 +291,7 @@ public: events.Reset(); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { RevealForm(); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); @@ -301,9 +301,9 @@ public: return; } - if (victim && (UnitIsUnfair(victim) || !QuestIncomplete(victim, ARTORIUS_HEAD))) + if (who && (UnitIsUnfair(who) || !QuestIncomplete(who, ARTORIUS_HEAD))) { - me->CastSpell(victim, SPELL_FOOLS_PLIGHT, true); + me->CastSpell(who, SPELL_FOOLS_PLIGHT, true); } events.ScheduleEvent(EVENT_FOOLS_PLIGHT, urand(2000, 3000)); @@ -486,7 +486,7 @@ public: ResetState(); } - void EnterCombat(Unit* /*victim*/) override + void JustEngagedWith(Unit* /*who*/) override { RevealForm(); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); @@ -652,16 +652,16 @@ public: events.ScheduleEvent(SIMONE_EVENT_CHECK_PET_STATE, 2000); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { RevealForm(); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); if (!InNormalForm()) { - if (victim && (UnitIsUnfair(victim) || !QuestIncomplete(victim, SIMONE_HEAD))) + if (who && (UnitIsUnfair(who) || !QuestIncomplete(who, SIMONE_HEAD))) { - me->CastSpell(victim, SPELL_FOOLS_PLIGHT, true); + me->CastSpell(who, SPELL_FOOLS_PLIGHT, true); } events.ScheduleEvent(EVENT_RANGE_CHECK, 1000); @@ -886,7 +886,7 @@ public: me->RemoveAllMinionsByEntry(CREEPING_DOOM_ENTRY); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { RevealForm(); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); @@ -901,9 +901,9 @@ public: me->CastSpell(me, NELSON_SPELL_SOUL_FLAME, true); } - if (victim && (UnitIsUnfair(victim) || !QuestIncomplete(victim, NELSON_HEAD))) + if (who && (UnitIsUnfair(who) || !QuestIncomplete(who, NELSON_HEAD))) { - me->CastSpell(victim, SPELL_FOOLS_PLIGHT, true); + me->CastSpell(who, SPELL_FOOLS_PLIGHT, true); } events.ScheduleEvent(EVENT_FOOLS_PLIGHT, urand(2000, 3000)); @@ -1069,16 +1069,16 @@ public: events.Reset(); } - void EnterCombat(Unit* victim) override + void JustEngagedWith(Unit* who) override { RevealForm(); me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); if (!InNormalForm()) { - if (victim && (UnitIsUnfair(victim) || !QuestIncomplete(victim, FRANKLIN_HEAD))) + if (who && (UnitIsUnfair(who) || !QuestIncomplete(who, FRANKLIN_HEAD))) { - me->CastSpell(victim, SPELL_FOOLS_PLIGHT, true); + me->CastSpell(who, SPELL_FOOLS_PLIGHT, true); } events.ScheduleEvent(FRANKLIN_EVENT_DEMONIC_ENRAGE, urand(9000, 13000)); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c64f8d4ce..e7fe02949 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -56,7 +56,7 @@ EndContentData */ #include "WaypointMgr.h" #include "World.h" -// @todo: this import is not necessary for compilation and marked as unused by the IDE +/// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue // there is probably some underlying problem with imports which should properly addressed // see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 @@ -700,7 +700,7 @@ public: me->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -815,7 +815,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void ReceiveEmote(Player* player, uint32 emote) override { @@ -1046,7 +1046,7 @@ public: void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } }; bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override @@ -1113,7 +1113,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1297,7 +1297,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1476,7 +1476,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -1672,7 +1672,7 @@ public: npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void OnPossess(bool apply) { @@ -2373,7 +2373,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoAction(int32 /*param*/) override { @@ -2591,7 +2591,7 @@ public: events.Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_FLAME_BUFFET, 4s); events.ScheduleEvent(EVENT_FLAME_BREATH, 12s); From 25c77a59c9559844001640aa853b70708bf3a50c Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Tue, 14 Feb 2023 05:17:08 -0300 Subject: [PATCH 02/32] fix(Scripts/Ulduar): Don't load encounter states as IN_PROGRESS (#15041) --- .../scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index f9acc923d..22a2ec38f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -1088,6 +1088,14 @@ public: data >> C_of_Ulduar_MASK; data >> m_mageBarrier; + + for (uint8 i = 0; i < (MAX_ENCOUNTER - 1); ++i) + { + if (m_auiEncounter[i] == IN_PROGRESS) + { + m_auiEncounter[i] = NOT_STARTED; + } + } } void WriteSaveDataMore(std::ostringstream& data) override From 590ab7c67f9d65c97f4105bb57c8f9ff82d396f9 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 15 Feb 2023 05:26:25 -0300 Subject: [PATCH 03/32] fix(Scripts/Naxxramas): Remove Sapphiron encounter boss requirements (#15048) --- .../Naxxramas/instance_naxxramas.cpp | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 638c294c4..d134cfeef 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -641,27 +641,6 @@ public: return 0; } - bool AreAllWingsCleared() const - { - return (GetBossState(BOSS_MAEXXNA) == DONE) && (GetBossState(BOSS_LOATHEB) == DONE) && (GetBossState(BOSS_THADDIUS) == DONE) && (GetBossState(BOSS_HORSEMAN) == DONE); - } - - bool CheckRequiredBosses(uint32 bossId, Player const* /* player */) const override - { - switch (bossId) - { - case BOSS_SAPPHIRON: - if (!AreAllWingsCleared()) - { - return false; - } - break; - default: - break; - } - return true; - } - bool SetBossState(uint32 bossId, EncounterState state) override { // pull all the trash if not killed From b8a7e9f584313fef9f09a8bf7b0322b613d56804 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:34:08 -0300 Subject: [PATCH 04/32] fix(DB/SAI): Fix Escape from Durnholde Barrel exploit (#15047) --- data/sql/updates/pending_db_world/rev_1676415242315358700.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676415242315358700.sql diff --git a/data/sql/updates/pending_db_world/rev_1676415242315358700.sql b/data/sql/updates/pending_db_world/rev_1676415242315358700.sql new file mode 100644 index 000000000..55ef6b478 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676415242315358700.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` = 182589); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(182589, 1, 0, 0, 8, 0, 100, 1, 32744, 0, 0, 0, 0, 34, 10, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Barrel - On Spellhit \'Planting Incendiary Bomb\' - Set Instance Data 10 to 1 (No Repeat)'); From 8303217a191982e318f55d2556c0d440a018a517 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 15 Feb 2023 18:36:38 +0000 Subject: [PATCH 05/32] chore(DB): import pending files Referenced commit(s): b8a7e9f584313fef9f09a8bf7b0322b613d56804 --- .../rev_1676415242315358700.sql => db_world/2023_02_15_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1676415242315358700.sql => db_world/2023_02_15_00.sql} (94%) diff --git a/data/sql/updates/pending_db_world/rev_1676415242315358700.sql b/data/sql/updates/db_world/2023_02_15_00.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1676415242315358700.sql rename to data/sql/updates/db_world/2023_02_15_00.sql index 55ef6b478..d53920f7d 100644 --- a/data/sql/updates/pending_db_world/rev_1676415242315358700.sql +++ b/data/sql/updates/db_world/2023_02_15_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_13_01 -> 2023_02_15_00 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` = 182589); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES From c41980b7ab75759706caef09c8962aeb1f8ef9ae Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 15 Feb 2023 21:03:19 -0300 Subject: [PATCH 06/32] fix(Scripts/GruulsLair): Only players should deal aoe shatter damage (#15056) --- src/server/scripts/Outland/GruulsLair/boss_gruul.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 47caa5ca6..d6ef410ce 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -271,7 +271,11 @@ class spell_gruul_shatter : public SpellScript if (Unit* target = GetHitUnit()) { target->RemoveAurasDueToSpell(SPELL_STONED); - target->CastSpell((Unit*)nullptr, SPELL_SHATTER_EFFECT, true); + + if (target->IsPlayer()) + { + target->CastSpell((Unit*)nullptr, SPELL_SHATTER_EFFECT, true); + } } } From b3df45c58a91eb0e3ba313e58fae7829955858fe Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:11:56 -0300 Subject: [PATCH 07/32] fix(DB/Creature): Cleric of Karabor (#15060) --- .../rev_1676502726004152400.sql | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676502726004152400.sql diff --git a/data/sql/updates/pending_db_world/rev_1676502726004152400.sql b/data/sql/updates/pending_db_world/rev_1676502726004152400.sql new file mode 100644 index 000000000..4bb49dfae --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676502726004152400.sql @@ -0,0 +1,255 @@ +-- Delete all previous spawns +DELETE FROM `creature` WHERE `id1`=21815; +DELETE FROM `creature_addon` WHERE `guid` BETWEEN 76347 AND 76376; +DELETE FROM `waypoint_data` WHERE `id` BETWEEN 763470 AND 763760; + +-- Update Template +UPDATE `creature_template_addon` SET `bytes1` = 0, `bytes2` = 0, `auras` = '37509 37497' WHERE (`entry` = 21815); + +SET @GUID := 76347; + +DELETE FROM `creature` WHERE `id1`=21815 AND `guid` BETWEEN @GUID+0 AND @GUID+29; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`) VALUES +(@GUID+0 , 21815, 530, 3520, 0, -3887.04, 713.771, 8.29782, 1.82762, 300, 10, 1, 48069), +(@GUID+1 , 21815, 530, 3520, 0, -3849.29, 694.933, 5.71439, 3.87034, 300, 10, 1, 48069), +(@GUID+2 , 21815, 530, 3520, 0, -3854.41, 698.188, 6.53198, 0.306488, 300, 10, 1, 48069), +(@GUID+3 , 21815, 530, 3520, 0, -3766.98, 700.139, 8.31596, 4.407, 300, 10, 1, 48069), +(@GUID+4 , 21815, 530, 3520, 0, -3750.56, 716.819, 8.73649, 4.53786, 300, 0, 0, 48069), +(@GUID+5 , 21815, 530, 3520, 0, -3744.44, 676.38, 6.24564, 2.32439, 300, 10, 1, 48069), +(@GUID+6 , 21815, 530, 3520, 0, -3733.26, 733.125, 8.4431, 4.72984, 300, 0, 0, 48069), +(@GUID+7 , 21815, 530, 3520, 0, -3717.39, 716.184, 5.91291, 4.31096, 300, 0, 0, 48069), +(@GUID+8 , 21815, 530, 3520, 0, -3716.77, 684.095, 2.97334, 4.59022, 300, 0, 0, 48069), +(@GUID+9 , 21815, 530, 3520, 0, -3714.98, 702.358, 4.65603, 3.05748, 300, 10, 1, 48069), +(@GUID+10, 21815, 530, 3520, 0, -3710.93, 745.914, 4.09289, 2.98865, 300, 10, 1, 48069), +(@GUID+11, 21815, 530, 3520, 0, -3682.72, 715.336, 1.83526, 4.5204, 300, 0, 0, 48069), +(@GUID+12, 21815, 530, 3520, 0, -3690.71, 636.486, 2.23195, 0.83101, 300, 10, 1, 48069), +(@GUID+13, 21815, 530, 3520, 0, -3699.59, 733.226, 2.86307, 4.59022, 300, 0, 0, 48069), +(@GUID+14, 21815, 530, 3520, 0, -3707.96, 745.452, 3.56198, 2.98575, 300, 10, 1, 48069), +(@GUID+15, 21815, 530, 3520, 0, -3682.75, 684.471, 4.11465, 4.67748, 300, 0, 0, 48069), +(@GUID+16, 21815, 530, 3520, 0, -3658.89, 678.813, 2.39562, 4.08407, 300, 0, 0, 48069), +(@GUID+17, 21815, 530, 3520, 0, -3649.91, 715.165, -0.439142, 4.81711, 300, 0, 0, 48069), +(@GUID+18, 21815, 530, 3520, 0, -3633.06, 688.628, -0.872612, 4.60767, 300, 0, 0, 48069), +(@GUID+19, 21815, 530, 3520, 0, -3618.23, 712.812, -5.62207, 4.55531, 300, 0, 0, 48069), +(@GUID+20, 21815, 530, 3520, 0, -3449.61, 651.914, 5.48536, 4.41568, 300, 0, 0, 48069), +(@GUID+21, 21815, 530, 3520, 0, -3448.87, 681.795, 1.83994, 4.39823, 300, 0, 0, 48069), +(@GUID+22, 21815, 530, 3520, 0, -3417.83, 683.332, 3.42784, 4.5204, 300, 0, 0, 48069), +(@GUID+23, 21815, 530, 3520, 0, -3417.53, 655.185, 8.10019, 4.45059, 300, 0, 0, 48069), +(@GUID+24, 21815, 530, 3520, 0, -3389.03, 685.481, 4.64398, 4.55531, 300, 0, 0, 48069), +(@GUID+25, 21815, 530, 3520, 0, -3381.63, 690.305, 2.30061, 0.896055, 300, 10, 1, 48069), +(@GUID+26, 21815, 530, 3520, 0, -3368.94, 689.885, 0.267471, 4.19106, 300, 10, 1, 48069), +(@GUID+27, 21815, 530, 3520, 0, -3352.51, 653.728, 8.90633, 4.55531, 300, 0, 0, 48069), +(@GUID+28, 21815, 530, 3520, 0, -3311.53, 681.949, 3.57055, 4.50295, 300, 0, 0, 48069), +(@GUID+29, 21815, 530, 3520, 0, -3298.01, 737.507, -12.9353, 4.28148, 300, 10, 1, 48069); + +-- Delete Useless SAI (obsoleted by auras field +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21815) AND (`source_type` = 0); + +-- Stationary GUIDs do random emotes (these don't have any other SAI) +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21815); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-(@GUID+4 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+6 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+7 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+8 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+11), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+13), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+15), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+17), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+18), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+19), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+20), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+21), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+22), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+23), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+24), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+27), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), +(-(@GUID+28), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'); + +-- The Cleric near the Meeting Stone has an EmoteState +DELETE FROM `creature_addon` WHERE `guid`=@GUID+16; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@GUID+16,0,0,0,0,69,0, '37509 37497'); + +-- Pathing +SET @NPC := @GUID+0; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3869.5764,`position_y`=759.3223,`position_z`=10.068203 WHERE `guid`=@GUID+0; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3869.5764,`position_y`=759.3223,`position_z`=10.068203 WHERE `guid`=@GUID+1; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1 ,-3869.5764,759.3223,10.068203,NULL,0,0,0,100,0), +(@PATH,2 ,-3834.4094,750.589,11.009603,NULL,0,0,0,100,0), +(@PATH,3 ,-3800.625,749.4453,10.881915,NULL,0,0,0,100,0), +(@PATH,4 ,-3770.5815,746.9241,8.975661,NULL,0,0,0,100,0), +(@PATH,5 ,-3739.184,750.26605,7.625188,NULL,0,0,0,100,0), +(@PATH,6 ,-3705.9006,745.1378,3.2208452,NULL,0,0,0,100,0), +(@PATH,7 ,-3675.9314,737.9171,-0.3524542,NULL,0,0,0,100,0), +(@PATH,8 ,-3651.636,731.10114,-3.2281065,NULL,0,0,0,100,0), +(@PATH,9 ,-3634.649,725.6624,-5.1051817,NULL,0,0,0,100,0), +(@PATH,10,-3613.014,734.74524,-9.089146,NULL,0,0,0,100,0), +(@PATH,11,-3578.7466,738.03754,-11.877126,NULL,0,0,0,100,0), +(@PATH,12,-3613.014,734.74524,-9.089146,NULL,0,0,0,100,0), +(@PATH,13,-3634.649,725.6624,-5.1051817,NULL,0,0,0,100,0), +(@PATH,14,-3651.636,731.10114,-3.2281065,NULL,0,0,0,100,0), +(@PATH,15,-3675.9314,737.9171,-0.3524542,NULL,0,0,0,100,0), +(@PATH,16,-3705.9006,745.1378,3.2208452,NULL,0,0,0,100,0), +(@PATH,17,-3739.184,750.26605,7.625188,NULL,0,0,0,100,0), +(@PATH,18,-3770.5815,746.9241,8.975661,NULL,0,0,0,100,0), +(@PATH,19,-3800.625,749.4453,10.881915,NULL,0,0,0,100,0), +(@PATH,20,-3834.4094,750.589,11.009603,NULL,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `memberGUID` IN (@GUID+0, @GUID+1); +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES +(@GUID+0, @GUID+0, 0, 0, 3), +(@GUID+0, @GUID+1, 4, 180, 515); + +SET @NPC := @GUID+2; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3747.236,`position_y`=696.5975,`position_z`=6.5840187 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3747.236,696.5975,6.5840187,NULL,0,0,0,100,0), +(@PATH,2,-3730.9023,698.65857,3.9634356,NULL,0,0,0,100,0), +(@PATH,3,-3722.947,690.0796,3.4161944,NULL,0,0,0,100,0), +(@PATH,4,-3729.0647,673.63995,4.2409015,NULL,0,0,0,100,0), +(@PATH,5,-3740.9297,672.6357,5.4780617,NULL,0,0,0,100,0), +(@PATH,6,-3751.7456,684.16174,7.1030617,NULL,0,0,0,100,0); + +SET @NPC := @GUID+3; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3760.0994,`position_y`=701.21185,`position_z`=8.138514 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3760.0994,701.21185,8.138514,NULL,0,0,0,100,0), +(@PATH,2,-3735.13,704.054,5.157435,NULL,0,0,0,100,0), +(@PATH,3,-3704.3057,701.4581,3.496435,NULL,0,0,0,100,0), +(@PATH,4,-3682.0999,701.26227,3.1714263,NULL,0,0,0,100,0), +(@PATH,5,-3651.9983,700.2391,0.22538471,NULL,0,0,0,100,0), +(@PATH,6,-3618.2942,698.29016,-4.0110435,NULL,0,0,0,100,0); + +SET @NPC := @GUID+5; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3254.29,`position_y`=698.9422,`position_z`=-0.21338493 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3254.29,698.9422,-0.21338493,NULL,0,0,0,100,0), +(@PATH,2,-3269.0117,731.6173,-9.155927,NULL,0,0,0,100,0), +(@PATH,3,-3286.4524,743.7444,-13.61463,NULL,0,0,0,100,0), +(@PATH,4,-3296.0322,741.8055,-14.152838,NULL,0,0,0,100,0), +(@PATH,5,-3303.5566,725.4404,-9.488642,NULL,0,0,0,100,0), +(@PATH,6,-3298.8667,703.29083,-2.2325869,NULL,0,0,0,100,0), +(@PATH,7,-3281.4404,695.50433,-0.15322602,NULL,0,0,0,100,0), +(@PATH,8,-3270.842,697.1268,-0.31582367,NULL,0,0,0,100,0); + +SET @NPC := @GUID+9; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3880.9531,`position_y`=743.5303,`position_z`=10.1663475 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3880.9531,743.5303,10.1663475,NULL,0,0,0,100,0), +(@PATH,2,-3861.636,742.01324,11.263143,NULL,0,0,0,100,0), +(@PATH,3,-3856.0808,731.877,12.064431,NULL,0,0,0,100,0), +(@PATH,4,-3855.645,711.5427,9.751931,NULL,0,0,0,100,0), +(@PATH,5,-3871.3838,700.5008,7.004488,NULL,0,0,0,100,0), +(@PATH,6,-3885.0618,706.26013,7.678072,NULL,0,0,0,100,0), +(@PATH,7,-3890.3376,726.3714,8.703218,NULL,0,0,0,100,0); + +SET @NPC := @GUID+10; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3785.0684,`position_y`=683.5791,`position_z`=5.889006 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3785.0684,683.5791,5.889006,NULL,0,0,0,100,0), +(@PATH,2,-3803.7048,690.65753,6.0817604,NULL,0,0,0,100,0), +(@PATH,3,-3811.6797,707.48224,9.257961,NULL,0,0,0,100,0), +(@PATH,4,-3804.8096,734.0828,13.369342,NULL,0,0,0,100,0), +(@PATH,5,-3786.9722,736.4728,12.661452,NULL,0,0,0,100,0), +(@PATH,6,-3770.7656,734.17395,11.812331,NULL,0,0,0,100,0), +(@PATH,7,-3766.2847,718.8295,9.656214,NULL,0,0,0,100,0), +(@PATH,8,-3765.27,705.5667,8.656458,NULL,0,0,0,100,0), +(@PATH,9,-3770.7708,688.1346,7.402678,NULL,0,0,0,100,0); + +SET @NPC := @GUID+12; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3843.1797,`position_y`=672.1553,`position_z`=3.1999207 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3843.1797,672.1553,3.1999207,NULL,0,0,0,100,0), +(@PATH,2,-3822.7634,678.561,3.681614,NULL,0,0,0,100,0), +(@PATH,3,-3820.191,690.44226,5.6217995,NULL,0,0,0,100,0), +(@PATH,4,-3825.3499,700.38947,7.2865257,NULL,0,0,0,100,0), +(@PATH,5,-3839.6736,703.5138,7.699929,NULL,0,0,0,100,0), +(@PATH,6,-3852.221,692.3139,5.230194,NULL,0,0,0,100,0); + +SET @NPC := @GUID+14; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3681.981,`position_y`=672.6074,`position_z`=2.5414386 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3681.981,672.6074,2.5414386,NULL,0,0,0,100,0), +(@PATH,2,-3697.5095,679.7098,1.6525227,NULL,0,0,0,100,0), +(@PATH,3,-3716.136,662.59656,1.9161946,NULL,0,0,0,100,0), +(@PATH,4,-3695.6536,631.07117,2.1196935,NULL,0,0,0,100,0), +(@PATH,5,-3675.394,653.26544,1.074654,NULL,0,0,0,100,0); + +SET @NPC := @GUID+25; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3361.677,`position_y`=663.71295,`position_z`=7.0698924 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3361.677,663.71295,7.0698924,NULL,0,0,0,100,0), +(@PATH,2,-3340.6047,658.2445,7.2334666,NULL,0,0,0,100,0), +(@PATH,3,-3330.0156,661.8594,7.659556,NULL,0,0,0,100,0), +(@PATH,4,-3324.579,681.2995,3.2608604,NULL,0,0,0,100,0), +(@PATH,5,-3334.5027,695.6724,-2.6810365,NULL,0,0,0,100,0), +(@PATH,6,-3352.145,705.7665,-7.396452,NULL,0,0,0,100,0), +(@PATH,7,-3363.9849,698.51746,-4.011969,NULL,0,0,0,100,0), +(@PATH,8,-3372.8135,683.12305,3.467493,NULL,0,0,0,100,0); + +SET @NPC := @GUID+26; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3353.7112,`position_y`=738.6812,`position_z`=-21.589752 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3353.7112,738.6812,-21.589752,NULL,0,0,0,100,0), +(@PATH,2,-3368.1436,707.1668,-7.8815174,NULL,0,0,0,100,0), +(@PATH,3,-3390.9631,678.6413,6.280115,NULL,0,0,0,100,0), +(@PATH,4,-3424.6484,666.9002,5.771608,NULL,0,0,0,100,0), +(@PATH,5,-3450.5193,667.2751,3.0163298,NULL,0,0,0,100,0), +(@PATH,6,-3482.091,679.81305,0.5905714,NULL,0,0,0,100,0), +(@PATH,7,-3450.5193,667.2751,3.0163298,NULL,0,0,0,100,0), +(@PATH,8,-3424.6484,666.9002,5.771608,NULL,0,0,0,100,0), +(@PATH,9,-3390.9631,678.6413,6.280115,NULL,0,0,0,100,0), +(@PATH,10,-3368.1436,707.1668,-7.8815174,NULL,0,0,0,100,0); + +SET @NPC := @GUID+29; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3857.2578,`position_y`=670.34406,`position_z`=3.6999207 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3857.2578,670.34406,3.6999207,NULL,0,0,0,100,0), +(@PATH,2,-3876.7979,679.27246,3.8857965,NULL,0,0,0,100,0), +(@PATH,3,-3876.2832,691.2627,5.2607965,NULL,0,0,0,100,0), +(@PATH,4,-3854.0938,698.28723,6.538788,NULL,0,0,0,100,0), +(@PATH,5,-3848.75,681.0957,3.6999207,NULL,0,0,0,100,0); From 858890d070f9f090836dc0a19dcdab0fd3cbbd1e Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:12:32 -0300 Subject: [PATCH 08/32] fix(DB/Creature): Improve Shadowmoon Harbingers and Zealots for Teron Gorefiend questline (#15057) --- .../rev_1676495188428976800.sql | 348 ++++++++++++++++++ 1 file changed, 348 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676495188428976800.sql diff --git a/data/sql/updates/pending_db_world/rev_1676495188428976800.sql b/data/sql/updates/pending_db_world/rev_1676495188428976800.sql new file mode 100644 index 000000000..f8f6944ab --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676495188428976800.sql @@ -0,0 +1,348 @@ +-- Delete all old spawns +DELETE FROM `creature` WHERE `id1` IN (21788, 21795); + +DELETE FROM `creature` WHERE `id1`=21788 AND `guid` IN (1162,1215,1317,1345,1361,1369,1374,1377,1382,1383,1392,1395,1528,1636,1881,1882,2212,2554,2577,2588,2606,2688,3137,3239,3243,3246,3255,3257,3258,3261,3262,3552,3554,3558,3567,3570,3573,3574,3578,3583,6294); +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`) VALUES +(1162, 21788, 530, 3520, 3744, 1, 1, 1, -2999.42, 2619.98, 76.7438, 1.65806, 300, 0, 0, 48069), +(1215, 21788, 530, 3520, 3744, 1, 1, 1, -2985.53, 2556.82, 76.6267, 3.9619, 300, 0, 0, 48069), +(1317, 21788, 530, 3520, 3744, 1, 1, 1, -2987.33, 2568.42, 76.6267, 5.84685, 300, 0, 0, 48069), +(1345, 21788, 530, 3520, 3744, 1, 1, 1, -2977.33, 2574.98, 76.6267, 1.41372, 300, 0, 0, 48069), +(1361, 21788, 530, 3520, 3744, 1, 1, 1, -2950.32, 2627.79, 90.1358, 3.91042, 300, 0, 2, 48069), +(1369, 21788, 530, 3520, 3744, 1, 1, 1, -2965.68, 2540.96, 76.6267, 4.45059, 300, 0, 0, 48069), +(1374, 21788, 530, 3520, 3744, 1, 1, 1, -2932.27, 2652.53, 93.7619, 3.9619, 300, 0, 0, 48069), +(1377, 21788, 530, 3520, 3744, 1, 1, 1, -3016.36, 2549.72, 79.1196, 1.29154, 300, 0, 0, 48069), +(1382, 21788, 530, 3520, 3744, 1, 1, 1, -3028.98, 2656.45, 77.0467, 4.20624, 300, 0, 0, 48069), +(1383, 21788, 530, 3520, 3744, 1, 1, 1, -3046.55, 2641.27, 76.6267, 5.91667, 300, 0, 0, 48069), +(1392, 21788, 530, 3520, 3744, 1, 1, 1, -2907.59, 2603.01, 93.7636, 2.42601, 300, 0, 0, 48069), +(1395, 21788, 530, 3520, 3744, 1, 1, 1, -2903.63, 2615.3, 93.7636, 3.07178, 300, 0, 0, 48069), +(1528, 21788, 530, 3520, 3744, 1, 1, 1, -2926.18, 2646.13, 93.7365, 3.68264, 300, 0, 0, 48069), +(1636, 21788, 530, 3520, 3744, 1, 1, 1, -3036.08, 2528.19, 63.4115, 5.16617, 300, 0, 0, 48069), +(1881, 21788, 530, 3520, 3744, 1, 1, 1, -2963.02, 2518.09, 78.1958, 0.10472, 300, 0, 0, 48069), +(1882, 21788, 530, 3520, 3744, 1, 1, 1, -3039.82, 2590.35, 75.343, 4.08158, 300, 0, 2, 48069), +(2212, 21788, 530, 3520, 3744, 1, 1, 1, -3020.44, 2502.76, 62.7676, 0.296706, 300, 0, 0, 48069), +(2554, 21788, 530, 3520, 3744, 1, 1, 1, -3001.51, 2507.45, 61.3395, 1.55334, 300, 0, 0, 48069), +(2577, 21788, 530, 3520, 3744, 1, 1, 1, -2939.04, 2675.21, 93.7636, 4.43314, 300, 0, 0, 48069), +(2588, 21788, 530, 3520, 3744, 1, 1, 1, -3073.79, 2609.98, 61.8124, 1.11701, 300, 0, 0, 48069), +(2606, 21788, 530, 3520, 3744, 1, 1, 1, -3022.7, 2512.11, 68.6565, 0.383972, 300, 0, 0, 48069), +(2688, 21788, 530, 3520, 3744, 1, 1, 1, -3034.21, 2499.92, 63.1432, 1.48353, 300, 0, 0, 48069), +(3137, 21788, 530, 3520, 3744, 1, 1, 1, -3079.53, 2527.94, 62.6586, 0.15708, 300, 0, 0, 48069), +(3239, 21788, 530, 3520, 3744, 1, 1, 1, -3088.92, 2564.31, 61.9645, 1.16096, 300, 0, 2, 48069), +(3243, 21788, 530, 3520, 3744, 1, 1, 1, -3090.44, 2579.88, 61.8531, 4.81711, 300, 0, 0, 48069), +(3246, 21788, 530, 3520, 3744, 1, 1, 1, -3067.42, 2495.91, 64.7398, 1.5708, 300, 0, 0, 48069), +(3255, 21788, 530, 3520, 3744, 1, 1, 1, -3116.47, 2572.71, 61.8892, 0.10472, 300, 0, 0, 48069), +(3257, 21788, 530, 3520, 3744, 1, 1, 1, -3115.36, 2556.79, 61.9195, 0.314159, 300, 0, 0, 48069), +(3258, 21788, 530, 3520, 3744, 1, 1, 1, -3130.25, 2537.19, 61.8124, 0.925025, 300, 0, 0, 48069), +(3261, 21788, 530, 3520, 3744, 1, 1, 1, -3133.15, 2585.91, 61.8072, 2.86234, 300, 0, 0, 48069), +(3262, 21788, 530, 3520, 3744, 1, 1, 1, -3133.63, 2548.74, 62.054, 6.19592, 300, 0, 0, 48069), +(3552, 21788, 530, 3520, 3744, 1, 1, 1, -3122.75, 2501.02, 62.7039, 5.51524, 300, 0, 0, 48069), +(3554, 21788, 530, 3520, 3744, 1, 1, 1, -3061.51, 2459.65, 65.1814, 4.5204, 300, 0, 0, 48069), +(3558, 21788, 530, 3520, 3744, 1, 1, 1, -3125.39, 2489.52, 62.0623, 5.11381, 300, 0, 0, 48069), +(3567, 21788, 530, 3520, 3744, 1, 1, 1, -3072.73, 2425.39, 62.5464, 4.25418, 300, 0, 2, 48069), +(3570, 21788, 530, 3520, 3744, 1, 1, 1, -3115.36, 2440.23, 64.6714, 1.90241, 300, 0, 0, 48069), +(3573, 21788, 530, 3520, 3744, 1, 1, 1, -3147.67, 2577.59, 62.381, 1.8675, 300, 0, 0, 48069), +(3574, 21788, 530, 3520, 3744, 1, 1, 1, -3163.9, 2579.59, 62.7036, 0.488692, 300, 0, 0, 48069), +(3578, 21788, 530, 3520, 3744, 1, 1, 1, -3138.01, 2452.76, 63.8288, 4.15388, 300, 0, 0, 48069), +(3583, 21788, 530, 3520, 3744, 1, 1, 1, -3144.15, 2617.15, 61.8556, 3.75246, 300, 0, 0, 48069), +(6294, 21788, 530, 3520, 3744, 1, 1, 1, -3090.62, 2402.48, 63.1453, 4.31096, 300, 0, 0, 48069); + +-- Add missing aura +UPDATE `creature_template_addon` SET `bytes2` = 1, `auras` = '37509 37467' WHERE (`entry` = 21788); + +-- EmoteStates +DELETE FROM `creature_addon` WHERE (`guid` IN (1317,1881,1162,1636,2688,2212,2554,2606,2588,1383,1382,3583,3574,3573,3261,3570,3578,3558,3552,3258,3262)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(1317, 0, 0, 0, 1, 69, 0, '37509 37467'), +(1881, 0, 0, 0, 1, 69, 0, '37509 37467'), +(1162, 0, 0, 0, 1, 69, 0, '37509 37467'), +(1636, 0, 0, 0, 1, 173, 0, '37509 37467'), +(2688, 0, 0, 0, 1, 173, 0, '37509 37467'), +(2212, 0, 0, 0, 1, 173, 0, '37509 37467'), +(2554, 0, 0, 0, 1, 173, 0, '37509 37467'), +(2606, 0, 0, 0, 1, 173, 0, '37509 37467'), +(2588, 0, 0, 0, 1, 173, 0, '37509 37467'), +(1383, 0, 0, 0, 1, 173, 0, '37509 37467'), +(1382, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3583, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3574, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3573, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3261, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3570, 0, 0, 0, 1, 69, 0, '37509 37467'), +(3578, 0, 0, 0, 1, 69, 0, '37509 37467'), +(3558, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3552, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3258, 0, 0, 0, 1, 173, 0, '37509 37467'), +(3262, 0, 0, 0, 1, 173, 0, '37509 37467'); + +SET @NPC := 1882; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-2983.5215,`position_y`=2598.1836,`position_z`=78.26283 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '37509 37467'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-2983.5215,2598.1836,78.26283,NULL,0,0,0,100,0), +(@PATH,2,-3024.7961,2595.5806,76.43522,NULL,0,0,0,100,0), +(@PATH,3,-3039.0452,2591.4111,75.666115,NULL,0,0,0,100,0), +(@PATH,4,-3047.9443,2579.204,72.64109,NULL,0,0,0,100,0), +(@PATH,5,-3061.8794,2539.9922,62.18476,NULL,0,0,0,100,0), +(@PATH,6,-3091.3047,2537.0774,61.979004,NULL,0,0,0,100,0), +(@PATH,7,-3061.8794,2539.9922,62.18476,NULL,0,0,0,100,0), +(@PATH,8,-3047.9443,2579.204,72.64109,NULL,0,0,0,100,0), +(@PATH,9,-3039.0957,2591.3184,75.63206,NULL,0,0,0,100,0), +(@PATH,10,-3024.7961,2595.5806,76.43522,NULL,0,0,0,100,0); + +SET @NPC := 1361; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-2933.8972,`position_y`=2643.6787,`position_z`=93.74599 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '37509 37467'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1 ,-2933.8972,2643.6787,93.74599,NULL,0,0,0,100,0), +(@PATH,2 ,-2955.7297,2622.529,88.13892,NULL,0,0,0,100,0), +(@PATH,3 ,-2980.0588,2599.9182,78.87392,NULL,0,0,0,100,0), +(@PATH,4 ,-2978.64,2596.0317,78.716446,NULL,0,0,0,100,0), +(@PATH,5 ,-2972.57,2581.042,76.66835,NULL,0,0,0,100,0), +(@PATH,6 ,-2972.9563,2575.763,76.72368,NULL,0,0,0,100,0), +(@PATH,7 ,-2975.4248,2570.8157,78.03902,NULL,0,0,0,100,0), +(@PATH,8 ,-2982.6028,2555.2698,77.1833,NULL,0,0,0,100,0), +(@PATH,9 ,-2985.2214,2550.3682,76.64052,NULL,0,0,0,100,0), +(@PATH,10,-2982.6028,2555.2698,77.1833,NULL,0,0,0,100,0), +(@PATH,11,-2975.4248,2570.8157,78.03902,NULL,0,0,0,100,0), +(@PATH,12,-2972.9563,2575.763,76.72368,NULL,0,0,0,100,0), +(@PATH,13,-2972.57,2581.042,76.66835,NULL,0,0,0,100,0), +(@PATH,14,-2978.64,2596.0317,78.716446,NULL,0,0,0,100,0), +(@PATH,15,-2980.0588,2599.9182,78.87392,NULL,0,0,0,100,0), +(@PATH,16,-2955.7297,2622.529,88.13892,NULL,0,0,0,100,0); + +SET @NPC := 3239; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3093.9133,`position_y`=2552.819,`position_z`=61.854004 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '37509 37467'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3093.9133,2552.819,61.854004,NULL,0,0,0,100,0), +(@PATH,2,-3088.2668,2565.8164,61.979004,NULL,0,0,0,100,0), +(@PATH,3,-3092.8552,2574.3938,61.85414,NULL,0,0,0,100,0), +(@PATH,4,-3104.494,2575.0054,61.879585,NULL,0,0,0,100,0), +(@PATH,5,-3114.3167,2564.6672,61.751812,NULL,0,0,0,100,0), +(@PATH,6,-3103.5955,2551.0715,61.751812,NULL,0,0,0,100,0); + +SET @NPC := 3567; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3069.491,`position_y`=2529.9836,`position_z`=61.854004 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '37509 37467'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3069.491,2529.9836,61.854004,NULL,0,0,0,100,0), +(@PATH,2,-3070.1697,2512.4446,62.604004,NULL,0,0,0,100,0), +(@PATH,3,-3062.1099,2501.7195,63.482788,NULL,0,0,0,100,0), +(@PATH,4,-3062.6467,2491.8025,64.98155,NULL,0,0,0,100,0), +(@PATH,5,-3063.126,2487.5073,64.8179,NULL,0,0,0,100,0), +(@PATH,6,-3065.7622,2464.375,65.06447,NULL,0,0,0,100,0), +(@PATH,7,-3066.259,2460.8157,65.101944,NULL,0,0,0,100,0), +(@PATH,8,-3071.4614,2433.7969,63.650608,NULL,0,0,0,100,0), +(@PATH,9,-3072.3816,2426.0962,62.559624,NULL,0,0,0,100,0), +(@PATH,10,-3083.289,2403.9827,62.741753,NULL,0,0,0,100,0), +(@PATH,11,-3088.302,2397.173,62.38616,NULL,0,0,0,100,0), +(@PATH,12,-3083.289,2403.9827,62.741753,NULL,0,0,0,100,0), +(@PATH,13,-3072.3816,2426.0962,62.559624,NULL,0,0,0,100,0), +(@PATH,14,-3065.7622,2464.375,65.06447,NULL,0,0,0,100,0), +(@PATH,15,-3063.126,2487.5073,64.8179,NULL,0,0,0,100,0), +(@PATH,16,-3062.6467,2491.8025,64.98155,NULL,0,0,0,100,0), +(@PATH,17,-3062.1099,2501.7195,63.482788,NULL,0,0,0,100,0), +(@PATH,18,-3070.1697,2512.4446,62.604004,NULL,0,0,0,100,0); + +-- Corrects Positions of some NPCs +UPDATE `creature` SET `position_x`=-2903.655029296875, `position_y`=2615.60546875, `position_z`=93.76357269287109375, `orientation`=2.932153224945068359 WHERE `id1`=19343 AND `guid`=68959; +UPDATE `creature` SET `position_x`=-2908.09375, `position_y`=2603.760498046875, `position_z`=93.76357269287109375, `orientation`=2.30383467674255371 WHERE `id1`=19345 AND `guid`=68961; +UPDATE `creature` SET `position_x`=-2939.28369140625, `position_y`=2675.38134765625, `position_z`=93.76357269287109375, `orientation`=4.468042850494384765 WHERE `id1`=19348 AND `guid`=68964; +UPDATE `creature` SET `position_x`=-2999.8582, `position_y`=2619.497, `position_z`=76.782364, `orientation`=4.86946868896484375 WHERE `id1`=25099 AND `guid`=41791; + +-- Zealot Equip Template +DELETE FROM `creature_equip_template` WHERE (`CreatureID` = 21788); +INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES +(21788, 1, 1902, 0, 0, 0); + +-- Shadowmoon Harbingers +DELETE FROM `creature` WHERE `id1`=21795 AND `guid` IN (7202 ,8311 ,10196,11502,11511,11600,11601,11747,12158,12160,12161,12162,12163,12457,12582,12583,12606,12607,12811,12812,12817,12819,13050,14076,14324,14325,14326,14327,14328,14329,14330,14331,14332,14346,14543,14544,14547,14551,14558,14561,14579,14634,14638,15928,16383,16385,16387,20941,20942,23441,23741,23743,23744); +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`) VALUES +(7202, 21795, 530, 3520, 3745, 0, -4050.8, 2243.12, 112.043, 5.6946, 300, 2, 1, 48069), +(8311, 21795, 530, 3520, 3745, 0, -4080.77, 2180.18, 100.277, 6.24393, 300, 2, 1, 48069), +(10196, 21795, 530, 3520, 3745, 0, -4086.96, 2167.92, 111.387, 0.0649286, 300, 2, 1, 48069), +(11502, 21795, 530, 3520, 3745, 0, -4054.94, 2274.02, 121.762, 3.39019, 300, 2, 1, 48069), +(11511, 21795, 530, 3520, 3745, 0, -3999.76, 2176.03, 104.419, 5.62719, 300, 0, 2, 48069), +(11600, 21795, 530, 3520, 3745, 0, -4070.18, 2227.96, 113.434, 2.43949, 300, 2, 1, 48069), +(11601, 21795, 530, 3520, 3745, 0, -3939.28, 2225.49, 101.916, 3.34277, 300, 3, 1, 48069), +(11747, 21795, 530, 3520, 3745, 0, -4029.85, 2166.81, 106.749, 2.4746, 300, 3, 1, 48069), +(12158, 21795, 530, 3520, 3745, 0, -4085.28, 2247.69, 121.762, 4.80283, 300, 2, 1, 48069), +(12160, 21795, 530, 3520, 3745, 0, -4019.56, 2140.34, 104.301, 4.00924, 300, 2, 1, 48069), +(12161, 21795, 530, 3520, 3745, 0, -4074.58, 2178.52, 107.496, 5.21588, 300, 2, 1, 48069), +(12162, 21795, 530, 3520, 3745, 0, -3984.63, 2198.21, 101.978, 2.99783, 300, 3, 1, 48069), +(12163, 21795, 530, 3520, 3745, 0, -4087, 2244.29, 112.043, 2.76699, 300, 2, 1, 48069), +(12457, 21795, 530, 3520, 3745, 0, -3987.09, 2152.82, 104.346, 5.47441, 300, 3, 1, 48069), +(12582, 21795, 530, 3520, 3745, 0, -4008.08, 2160.41, 105.051, 6.10071, 300, 0, 2, 48069), +(12583, 21795, 530, 3520, 3745, 0, -4092.31, 2182.77, 106.936, 1.42375, 300, 2, 1, 48069), +(12606, 21795, 530, 3520, 3745, 0, -3956.32, 2237.76, 101.962, 2.20807, 300, 0, 2, 48069), +(12607, 21795, 530, 3520, 3745, 0, -4066.46, 2258.75, 94.8242, 5.52225, 300, 2, 1, 48069), +(12811, 21795, 530, 3520, 3745, 0, -3997.78, 2140.65, 104.734, 1.15619, 300, 0, 2, 48069), +(12812, 21795, 530, 3520, 3745, 0, -3941.4, 2192.35, 101.924, 1.11448, 300, 3, 1, 48069), +(12817, 21795, 530, 3520, 3745, 0, -4034.84, 2262.57, 113.434, 3.23854, 300, 2, 1, 48069), +(12819, 21795, 530, 3520, 3745, 0, -4093.05, 2185.36, 100.277, 1.10346, 300, 2, 1, 48069), +(13050, 21795, 530, 3520, 3745, 0, -4070.78, 2261.45, 112.043, 3.61995, 300, 2, 1, 48069), +(14076, 21795, 530, 3520, 3745, 0, -4087.86, 2207.58, 97.2149, 4.31553, 300, 2, 1, 48069), +(14324, 21795, 530, 3520, 3745, 0, -4052.95, 2279.67, 112.043, 1.38974, 300, 2, 1, 48069), +(14325, 21795, 530, 3520, 3745, 0, -3974.89, 2120.57, 104.232, 2.66117, 300, 3, 1, 48069), +(14326, 21795, 530, 3520, 3745, 0, -4074.12, 2266.24, 94.8243, 2.22216, 300, 2, 1, 48069), +(14327, 21795, 530, 3520, 3745, 0, -3939.81, 2152.92, 100.524, 1.08951, 300, 3, 1, 48069), +(14328, 21795, 530, 3520, 3745, 0, -3998.09, 2097.96, 137.242, 2.75096, 300, 0, 2, 48069), +(14329, 21795, 530, 3520, 3745, 0, -3949.75, 2265.68, 99.2305, 3.45364, 300, 3, 1, 48069), +(14330, 21795, 530, 3520, 3745, 0, -4086.29, 2261.55, 103.981, 4.91699, 300, 2, 1, 48069), +(14331, 21795, 530, 3520, 3745, 0, -4069.3, 2287.77, 103.98, 5.17287, 300, 2, 1, 48069), +(14332, 21795, 530, 3520, 3745, 0, -4096.8, 2258.41, 103.98, 4.80697, 300, 2, 1, 48069), +(14346, 21795, 530, 3520, 3745, 0, -3941.76, 2174.4, 101.475, 2.1149, 300, 0, 2, 48069), +(14543, 21795, 530, 3520, 3745, 0, -3915.35, 2108.43, 97.1916, 4.14084, 300, 3, 1, 48069), +(14544, 21795, 530, 3520, 3745, 0, -3914.45, 2103.59, 96.1418, 0.586566, 300, 3, 1, 48069), +(14547, 21795, 530, 3520, 3745, 0, -3858.33, 2202.6, 95.8032, 4.71239, 300, 12, 1, 48069), +(14551, 21795, 530, 3520, 3745, 0, -4070.84, 2292.97, 110.652, 5.08149, 300, 0, 0, 48069), +(14558, 21795, 530, 3520, 3745, 0, -4087.17, 2284.47, 103.98, 0.493549, 300, 0, 0, 48069), +(14561, 21795, 530, 3520, 3745, 0, -4077.56, 2297.66, 121.762, 5.84576, 300, 0, 0, 48069), +(14579, 21795, 530, 3520, 3745, 0, -4103.11, 2262.73, 110.652, 5.04158, 300, 0, 0, 48069), +(14634, 21795, 530, 3520, 3745, 0, -4094.2, 2275.16, 112.043, 1.64821, 300, 0, 0, 48069), +(14638, 21795, 530, 3520, 3745, 0, -4110.22, 2271.54, 121.762, 1.72507, 300, 0, 0, 48069), +(15928, 21795, 530, 3520, 3745, 0, -4109.65, 2297.24, 121.762, 1.22016, 300, 0, 0, 48069), +(16383, 21795, 530, 3520, 3745, 0, -3957.69, 2047.99, 95.1048, 0.965733, 300, 12, 1, 48069), +(16385, 21795, 530, 3520, 3745, 0, -3923.67, 2053.05, 95.1598, 4.87277, 300, 12, 1, 48069), +(16387, 21795, 530, 3520, 3745, 0, -3837.59, 2114.16, 94.0097, 6.05016, 300, 12, 1, 48069), +(20941, 21795, 530, 3520, 3745, 0, -3823.16, 2115.78, 91.368, 6.27049, 300, 12, 1, 48069), +(20942, 21795, 530, 3520, 3745, 0, -3841.24, 2176.07, 95.0957, 2.06718, 300, 12, 1, 48069), +(23441, 21795, 530, 3520, 3745, 0, -3848.2, 2249.49, 96.1485, 2.75056, 300, 0, 0, 48069), +(23741, 21795, 530, 3520, 3745, 0, -3820.97, 2188.18, 91.1958, 2.72862, 300, 12, 1, 48069), +(23743, 21795, 530, 3520, 3745, 0, -3822.84, 2231.41, 92.1447, 2.09902, 300, 0, 0, 48069), +(23744, 21795, 530, 3520, 3745, 0, -3999.95, 1999.96, 95.2805, 5.47502, 300, 0, 0, 48069); + +-- Set movement for every harbinger inside the main building +UPDATE `creature` SET `wander_distance`=2, `MovementType`=1 WHERE `id1`=21795 AND `guid` IN (14332,14331,14330,14328,14326,14076,14324,13050,12817,12819,12607,12583,12158,12161,12163,11600,11502,10196,8311,7202,12161,12583,12160); +UPDATE `creature` SET `wander_distance`=12, `MovementType`=1 WHERE `id1`=21795 AND `guid` IN (16383,16387,20941,23741,20942,14547,16385); + +SET @NPC := 11511; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3999.7612,`position_y`=2176.0293,`position_z`=104.41897 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3999.7612,2176.0293,104.41897,NULL,0,0,0,100,0), +(@PATH,2,-3972.0134,2190.886,101.88503,NULL,0,0,0,100,0), +(@PATH,3,-3972.9146,2202.0095,101.70632,NULL,0,0,0,100,0), +(@PATH,4,-3997.1401,2217.4153,104.72634,NULL,0,0,0,100,0), +(@PATH,5,-4022.4749,2218.094,110.06057,NULL,0,0,0,100,0), +(@PATH,6,-4025.8816,2219.4587,110.31728,NULL,0,0,0,100,0), +(@PATH,7,-4024.3582,2209.3901,109.74197,NULL,0,0,0,100,0), +(@PATH,8,-4020.0977,2186.2214,107.882095,NULL,0,0,0,100,0), +(@PATH,9,-4010.251,2178.6438,105.79164,NULL,0,0,0,100,0); + +SET @NPC := 14346; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3941.764,`position_y`=2174.395,`position_z`=101.47483 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3941.764,2174.395,101.47483,NULL,0,0,0,100,0), +(@PATH,2,-3955.132,2167.856,100.00425,NULL,0,0,0,100,0), +(@PATH,3,-3952.9424,2141.3313,98.55625,NULL,0,0,0,100,0), +(@PATH,4,-3946.266,2130.2925,97.48784,NULL,0,0,0,100,0), +(@PATH,5,-3936.5078,2117.3242,96.29057,NULL,0,0,0,100,0), +(@PATH,6,-3931.6584,2103.5051,94.88107,NULL,0,0,0,100,0), +(@PATH,7,-3920.9348,2093.7053,94.28906,NULL,0,0,0,100,0), +(@PATH,8,-3911.3855,2084.8774,93.98193,NULL,0,0,0,100,0), +(@PATH,9,-3895.2727,2065.3416,94.288475,NULL,0,0,0,100,0), +(@PATH,10,-3911.3855,2084.8774,93.98193,NULL,0,0,0,100,0), +(@PATH,11,-3920.9348,2093.7053,94.28906,NULL,0,0,0,100,0), +(@PATH,12,-3931.6584,2103.5051,94.88107,NULL,0,0,0,100,0), +(@PATH,13,-3936.5078,2117.3242,96.29057,NULL,0,0,0,100,0), +(@PATH,14,-3946.266,2130.2925,97.48784,NULL,0,0,0,100,0), +(@PATH,15,-3952.9424,2141.3313,98.55625,NULL,0,0,0,100,0), +(@PATH,16,-3955.132,2167.856,100.00425,NULL,0,0,0,100,0); + +SET @NPC := 14328; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3998.0916,`position_y`=2097.955,`position_z`=137.24152 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3998.0916,2097.955,137.24152,NULL,0,0,0,100,0), +(@PATH,2,-4033.5908,2115.7417,137.23189,NULL,0,0,0,100,0), +(@PATH,3,-4067.9219,2129.8794,137.2598,NULL,0,0,0,100,0), +(@PATH,4,-4033.5908,2115.7417,137.23189,NULL,0,0,0,100,0); + +SET @NPC := 12811; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3997.7783,`position_y`=2140.6536,`position_z`=104.73433 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3997.7783,2140.6536,104.73433,NULL,0,0,0,100,0), +(@PATH,2,-4000.6433,2133.9727,105.73658,NULL,0,0,0,100,0), +(@PATH,3,-4006.1736,2121.4075,115.08989,NULL,0,0,0,100,0), +(@PATH,4,-4008.0847,2115.1497,115.623795,NULL,0,0,0,100,0), +(@PATH,5,-4047.5369,2133.2236,137.24315,NULL,0,0,0,100,0), +(@PATH,6,-4006.1736,2121.4075,115.08989,NULL,0,0,0,100,0), +(@PATH,7,-4000.6433,2133.9727,105.73658,NULL,0,0,0,100,0); + +SET @NPC := 12582; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-4008.0833,`position_y`=2160.4094,`position_z`=105.05068 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-4008.0833,2160.4094,105.05068,NULL,0,0,0,100,0), +(@PATH,2,-4004.2214,2174.4575,104.94032,NULL,0,0,0,100,0), +(@PATH,3,-4018.816,2179.6648,107.19447,NULL,0,0,0,100,0), +(@PATH,4,-4036.5151,2182.9263,108.911476,NULL,0,0,0,100,0), +(@PATH,5,-4018.816,2179.6648,107.19447,NULL,0,0,0,100,0), +(@PATH,6,-4004.2214,2174.4575,104.94032,NULL,0,0,0,100,0); + +SET @NPC := 12606; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3956.3213,`position_y`=2237.7644,`position_z`=101.96201 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,0,0, '37467 37509'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3956.3213,2237.7644,101.96201,NULL,0,0,0,100,0), +(@PATH,2,-3959.4504,2211.259,101.91565,NULL,0,0,0,100,0), +(@PATH,3,-3969.9905,2205.709,101.76003,NULL,0,0,0,100,0), +(@PATH,4,-3972.0886,2195.8716,101.88503,NULL,0,0,0,100,0), +(@PATH,5,-3962.5134,2186.7585,101.96177,NULL,0,0,0,100,0), +(@PATH,6,-3955.4993,2190.8352,101.79905,NULL,0,0,0,100,0), +(@PATH,7,-3952.0386,2202.4385,101.77075,NULL,0,0,0,100,0), +(@PATH,8,-3958.7395,2211.49,101.91565,NULL,0,0,0,100,0); + +-- Creature Texts +DELETE FROM `creature_text` WHERE `CreatureID` IN (21788, 21795); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(21788, 0, 0, 'We will never dissipate, mortal... Our fate is tied to Gorefiend...', 15, 0, 100, 0, 0, 0, 19444, 0, 'Shadowmoon Zealot'), +(21788, 0, 1, 'Pray that the chilling embrace of Teron Gorefiend does not reach out for you...', 15, 0, 100, 0, 0, 0, 19445, 0, 'Shadowmoon Zealot'), +(21788, 0, 2, 'It is you who have invaded our home. Gorefiend will avenge us!', 15, 0, 100, 0, 0, 0, 19446, 0, 'Shadowmoon Zealot'), +(21788, 0, 3, 'Gorefiend will have your head, interloper!', 15, 0, 100, 0, 0, 0, 19447, 0, 'Shadowmoon Zealot'), +(21788, 0, 4, 'We are bound here... eternally. It is the will of Gorefiend.', 15, 0, 100, 0, 0, 0, 19448, 0, 'Shadowmoon Zealot'), +(21795, 0, 0, 'We will never dissipate, mortal... Our fate is tied to Gorefiend...', 15, 0, 100, 0, 0, 0, 19444, 0, 'Shadowmoon Harbinger'), +(21795, 0, 1, 'Pray that the chilling embrace of Teron Gorefiend does not reach out for you...', 15, 0, 100, 0, 0, 0, 19445, 0, 'Shadowmoon Harbinger'), +(21795, 0, 2, 'It is you who have invaded our home. Gorefiend will avenge us!', 15, 0, 100, 0, 0, 0, 19446, 0, 'Shadowmoon Harbinger'), +(21795, 0, 3, 'Gorefiend will have your head, interloper!', 15, 0, 100, 0, 0, 0, 19447, 0, 'Shadowmoon Harbinger'), +(21795, 0, 4, 'We are bound here... eternally. It is the will of Gorefiend.', 15, 0, 100, 0, 0, 0, 19448, 0, 'Shadowmoon Harbinger'); + +-- SAI +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (21788, 21795); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (21788, 21795) AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21788, 0, 0, 0, 6, 0, 25, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Shadowmoon Zealot - On Death - Say Line 0'), +(21795, 0, 0, 0, 6, 0, 25, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Shadowmoon Harbinger - On Death - Say Line 0'); From 758435632b768d38ae0718ea00aa98550ac67dcd Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:12:57 -0300 Subject: [PATCH 09/32] fix(DB/Creature): Re-Construct The Deathforge spawns (#15037) --- .../rev_1676321187026326300.sql | 393 ++++++++++++++++++ 1 file changed, 393 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676321187026326300.sql diff --git a/data/sql/updates/pending_db_world/rev_1676321187026326300.sql b/data/sql/updates/pending_db_world/rev_1676321187026326300.sql new file mode 100644 index 000000000..cc5bb58c7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676321187026326300.sql @@ -0,0 +1,393 @@ +-- Remove all of the same Ids, remove non-combat pet, remove mines +DELETE FROM `creature` WHERE `id1` IN (19754,19756,19757,19759,19760,20872,20878,20887,21080,21207,21210,21211,21725,22024,18381,22315) AND `map`=530; + +SET @CGUID := 83028; + +DELETE FROM `creature` WHERE `id1` IN (19754,19756,19757,19759,19760,20872,20878,20887,21080,21207,21210,21211,21725,22024) AND `map`=530 AND `ZoneId`=3520 AND `guid` BETWEEN @CGUID+0 AND @CGUID+84; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES +(@CGUID+0 , 19754, 530, 3520, 3748, 1, 1, 0, -3471.39, 2147.28, 33.2387, 5.74268, 300, 4, 1, 0, 0, 48001), +(@CGUID+1 , 19754, 530, 3520, 3748, 1, 1, 0, -3473.13, 2222.15, 33.5265, 0.567704, 300, 0, 0, 0, 0, 48001), +(@CGUID+2 , 19754, 530, 3520, 3748, 1, 1, 0, -3483.68, 2185.69, 33.5114, 3.69491, 300, 4, 1, 0, 0, 48001), +(@CGUID+3 , 19754, 530, 3520, 3748, 1, 1, 0, -3451.49, 2221.58, 33.4266, 5.38249, 300, 0, 0, 0, 0, 48001), +(@CGUID+4 , 19754, 530, 3520, 3748, 1, 1, 0, -3484.9, 2227.74, 33.5262, 1.15788, 300, 5, 1, 0, 0, 48001), +(@CGUID+5 , 19754, 530, 3520, 3748, 1, 1, 0, -3457.4, 2231.82, 33.6344, 3.76717, 300, 0, 0, 0, 0, 48001), +(@CGUID+6 , 19756, 530, 3520, 3748, 1, 1, 0, -3460.3118, 2176.2397, 33.525658, 4.537856101989746093, 300, 0, 0, 0, 0, 48001), +(@CGUID+7 , 19756, 530, 3520, 3748, 1, 1, 0, -3490.547, 2153.1892, 33.485687, 0.03490658476948738, 300, 0, 0, 0, 0, 48001), +(@CGUID+8 , 19756, 530, 3520, 3748, 1, 1, 0, -3470.43, 2181.19, 33.5385, 2.699963, 300, 0, 0, 0, 0, 48001), +(@CGUID+9 , 19756, 530, 3520, 3748, 1, 1, 0, -3466.94, 2202.81, 33.603, 3.31613, 300, 0, 0, 0, 0, 48001), +(@CGUID+10, 19756, 530, 3520, 3748, 1, 1, 0, -3502.97, 2183.39, 33.611, 5.75959, 300, 0, 0, 0, 0, 48001), +(@CGUID+11, 19756, 530, 3520, 3748, 1, 1, 0, -3498.51, 2210.14, 33.6135, 5.72468, 300, 0, 0, 0, 0, 48001), +(@CGUID+12, 19759, 530, 3520, 3748, 1, 1, 0, -3448.43, 2240.86, 33.7625, 2.36354, 300, 5, 1, 0, 0, 48001), +(@CGUID+13, 19759, 530, 3520, 3748, 1, 1, 0, -3555.51, 2190.91, 30.1227, 5.32783, 300, 4, 1, 0, 0, 48001), +(@CGUID+14, 19759, 530, 3520, 3748, 1, 1, 0, -3418.07, 2255.31, 33.6775, 2.97726, 300, 5, 1, 0, 0, 48001), +(@CGUID+15, 19760, 530, 3520, 3748, 1, 1, 0, -3475.41, 2170.14, 32.8636, 5.41052, 300, 0, 0, 33554432, 0, 48001), +(@CGUID+16, 19760, 530, 3520, 3748, 1, 1, 0, -3483.61, 2201.5, 32.8564, 5.06145, 300, 0, 0, 33554432, 0, 48001), +(@CGUID+17, 19760, 530, 3520, 3748, 1, 1, 0, -3554.93, 2140.11, 24.1701, 5.76413, 300, 8, 1, 0, 0, 48001), +(@CGUID+22, 20872, 530, 3520, 3748, 1, 1, 1, -3291.68, 1923.85, 143.069, 5.06823, 300, 0, 0, 0, 0, 48001), +(@CGUID+23, 20872, 530, 3520, 3748, 1, 1, 1, -3223.39, 1961.9, 109.363, 4.30813, 300, 0, 0, 0, 0, 48001), +(@CGUID+24, 20872, 530, 3520, 3748, 1, 1, 1, -3302.89, 2000.53, 46.7258, 5.07585, 300, 0, 0, 0, 0, 48001), +(@CGUID+25, 20872, 530, 3520, 3748, 1, 1, 1, -3275.83, 2026.08, 63.7421, 4.75732, 300, 0, 0, 0, 0, 48001), +(@CGUID+26, 20872, 530, 3520, 3748, 1, 1, 1, -3335.89, 2133.7, -2.183, 2.51327, 300, 0, 0, 0, 0, 48001), +(@CGUID+27, 20872, 530, 3520, 3748, 1, 1, 1, -3361.14, 2088.28, 4.8676, 0.819882, 300, 0, 0, 0, 0, 48001), +(@CGUID+28, 20872, 530, 3520, 3748, 1, 1, 1, -3335.6, 2151.81, -1.21132, 3.00197, 300, 0, 0, 0, 0, 48001), +(@CGUID+29, 20872, 530, 3520, 3748, 1, 1, 1, -3341.74, 2168.38, 2.22799, 3.9968, 300, 0, 0, 0, 0, 48001), +(@CGUID+30, 20872, 530, 3520, 3748, 1, 1, 1, -3415.38, 2095.36, 34.1878, 6.21337, 300, 0, 0, 0, 0, 48001), +(@CGUID+31, 20872, 530, 3520, 3748, 1, 1, 1, -3413.25, 2132.96, 34.4846, 4.97419, 300, 0, 0, 0, 0, 48001), +(@CGUID+32, 20872, 530, 3520, 3748, 1, 1, 1, -3437.93, 2131.51, 33.8578, 5.30604, 300, 0, 0, 0, 0, 48001), +(@CGUID+33, 20872, 530, 3520, 3748, 1, 1, 1, -3410.42, 2321.58, 37.2106, 4.72984, 300, 0, 0, 0, 0, 48001), +(@CGUID+34, 20878, 530, 3520, 3748, 1, 1, 1, -3292.99, 1907.61, 142.326, 0.122173, 300, 0, 0, 0, 0, 48001), +(@CGUID+35, 20878, 530, 3520, 3748, 1, 1, 1, -3223.44, 1969.5, 144.56, 5.32325, 300, 0, 0, 0, 0, 48001), +(@CGUID+36, 20878, 530, 3520, 3748, 1, 1, 1, -3258.72, 2051.92, 74.4014, 1.46608, 300, 0, 0, 0, 0, 48001), +(@CGUID+37, 20878, 530, 3520, 3748, 1, 1, 1, -3216.56, 2054.98, 84.2059, 4.36162, 300, 5, 1, 0, 0, 48001), +(@CGUID+38, 20878, 530, 3520, 3748, 1, 1, 1, -3295, 2059.66, 76.2516, 1.20428, 300, 0, 0, 0, 0, 48001), +(@CGUID+39, 20878, 530, 3520, 3748, 1, 1, 1, -3341.51, 2016.82, 33.6518, 5.42797, 300, 0, 0, 0, 0, 48001), +(@CGUID+40, 20878, 530, 3520, 3748, 1, 1, 1, -3280.61, 2093.41, 82.6315, 5.44455, 300, 10, 1, 0, 0, 48001), +(@CGUID+41, 20878, 530, 3520, 3748, 1, 1, 1, -3285.27, 2135.91, 85.348, 5.00357, 300, 10, 1, 0, 0, 48001), +(@CGUID+42, 20878, 530, 3520, 3748, 1, 1, 1, -3363.54, 2046.37, 39.0521, 5.18363, 300, 0, 0, 0, 0, 48001), +(@CGUID+43, 20878, 530, 3520, 3748, 1, 1, 1, -3356.56, 2107.09, 11.9433, 0.484243, 300, 4, 1, 0, 0, 48001), +(@CGUID+44, 20878, 530, 3520, 3748, 1, 1, 1, -3361.23, 1980.19, 26.3597, 1.76278, 300, 0, 0, 0, 0, 48001), +(@CGUID+45, 20878, 530, 3520, 3748, 1, 1, 1, -3376.09, 2038.66, 37.6801, 5.91667, 300, 0, 0, 0, 0, 48001), +(@CGUID+46, 20878, 530, 3520, 3748, 1, 1, 1, -3396.01, 2036.34, 20.4044, 3.31276, 300, 5, 1, 0, 0, 48001), +(@CGUID+47, 20878, 530, 3520, 3748, 1, 1, 1, -3392.49, 2062.84, 14.4613, 3.0207, 300, 4, 1, 0, 0, 48001), +(@CGUID+48, 20878, 530, 3520, 3748, 1, 1, 1, -3373.86, 2098, 34.0214, 5.07891, 300, 0, 0, 0, 0, 48001), +(@CGUID+49, 20878, 530, 3520, 3748, 1, 1, 1, -3396.89, 2070.46, 34.0593, 5.65487, 300, 0, 0, 0, 0, 48001), +(@CGUID+50, 20878, 530, 3520, 3748, 1, 1, 1, -3396.38, 2101.97, 77.6685, 3.68218, 300, 10, 1, 0, 0, 48001), +(@CGUID+51, 20878, 530, 3520, 3748, 1, 1, 1, -3415.89, 2058.72, 15.4273, 0.96285, 300, 4, 1, 0, 0, 48001), +(@CGUID+52, 20878, 530, 3520, 3748, 1, 1, 1, -3438.19, 2059.36, 15.2807, 2.66248, 300, 4, 1, 0, 0, 48001), +(@CGUID+53, 20878, 530, 3520, 3748, 1, 1, 1, -3387.48, 1996.93, 25.9171, 4.85202, 300, 0, 0, 0, 0, 48001), +(@CGUID+54, 20878, 530, 3520, 3748, 1, 1, 1, -3422.34, 2032.42, 79.414, 6.03884, 300, 10, 1, 0, 0, 48001), +(@CGUID+55, 20878, 530, 3520, 3748, 1, 1, 1, -3455.95, 2136.25, 31.6043, 0.15708, 300, 0, 0, 0, 0, 48001), +(@CGUID+56, 20878, 530, 3520, 3748, 1, 1, 1, -3440.93, 2151.51, 31.6043, 4.57276, 300, 0, 0, 0, 0, 48001), +(@CGUID+57, 20878, 530, 3520, 3748, 1, 1, 1, -3537.11, 2159.12, 34.0734, 0.872665, 300, 0, 0, 0, 0, 48001), +(@CGUID+58, 20878, 530, 3520, 3748, 1, 1, 1, -3541.49, 2176.84, 34.6825, 5.96903, 300, 0, 0, 0, 0, 48001), +(@CGUID+59, 20878, 530, 3520, 3748, 1, 1, 1, -3420.47, 2291.11, 33.8036, 5.11381, 300, 0, 0, 0, 0, 48001), +(@CGUID+60, 20878, 530, 3520, 3748, 1, 1, 1, -3405.89, 2290.53, 34.1082, 4.76475, 300, 0, 0, 0, 0, 48001), +(@CGUID+61, 20887, 530, 3520, 3748, 1, 1, 0, -3292.91, 1928.15, 143.472, 3.89206, 300, 0, 0, 0, 0, 48001), +(@CGUID+62, 20887, 530, 3520, 3748, 1, 1, 0, -3221.2, 1965.33, 109.058, 4.26113, 300, 0, 0, 0, 0, 48001), +(@CGUID+63, 20887, 530, 3520, 3748, 1, 1, 0, -3305.26, 1996.93, 47.4617, 5.07585, 300, 0, 0, 0, 0, 48001), +(@CGUID+64, 20887, 530, 3520, 3748, 1, 1, 0, -3272.2, 2023.24, 63.6514, 4.75732, 300, 0, 0, 0, 0, 48001), +(@CGUID+65, 20887, 530, 3520, 3748, 1, 1, 0, -3360.54, 2094.05, 5.31642, 0.819888, 300, 0, 0, 0, 0, 48001), +(@CGUID+66, 20887, 530, 3520, 3748, 1, 1, 0, -3412.58, 2100.51, 34.1129, 5.8287, 300, 5, 1, 0, 0, 48001), +(@CGUID+67, 20887, 530, 3520, 3748, 1, 1, 0, -3410.94, 2128.02, 34.3914, 6.07672, 300, 5, 1, 0, 0, 48001), +(@CGUID+68, 20887, 530, 3520, 3748, 1, 1, 0, -3433.5, 2131.21, 34.3465, 2.16448, 300, 0, 0, 0, 0, 48001), +(@CGUID+69, 20887, 530, 3520, 3748, 1, 1, 0, -3418.47, 2313.28, 37.0325, 4.43495, 300, 5, 1, 0, 0, 48001), +(@CGUID+70, 21080, 530, 3520, 3748, 1, 1, 0, -3456.48, 2241.29, 33.8697, 4.53786, 300, 0, 0, 0, 0, 48001), +(@CGUID+71, 21080, 530, 3520, 3748, 1, 1, 0, -3439.95, 2250.68, 33.574, 5.42797, 300, 0, 0, 0, 0, 48001), +(@CGUID+72, 21080, 530, 3520, 3748, 1, 1, 0, -3425.34, 2279.42, 33.4432, 1.09956, 300, 0, 0, 0, 0, 48001), +(@CGUID+73, 21080, 530, 3520, 3748, 1, 1, 0, -3404.85, 2266.46, 34.057, 2.74017, 300, 0, 0, 0, 0, 48001), +(@CGUID+74, 21080, 530, 3520, 3748, 1, 1, 0, -3422.23, 2237.42, 34.2742, 2.51327, 300, 0, 0, 0, 0, 48001), +(@CGUID+75, 21207, 530, 3520, 3748, 1, 1, 1, -3350.91, 2151.45, -7.08715, 3.71755, 300, 0, 0, 0, 0, 48001), +(@CGUID+76, 21210, 530, 3520, 3748, 1, 1, 0, -3366.9, 2121.34, -7.62779, 1.78024, 300, 0, 0, 0, 0, 48001), +(@CGUID+77, 21210, 530, 3520, 3748, 1, 1, 0, -3349.4, 2139.45, -7.73881, 3.15905, 300, 0, 0, 0, 0, 48001), +(@CGUID+78, 21210, 530, 3520, 3748, 1, 1, 0, -3368.91, 2145.37, -8.39026, 4.4855, 300, 0, 0, 0, 0, 48001), +(@CGUID+79, 21210, 530, 3520, 3748, 1, 1, 0, -3392.08, 2153.75, -7.5305, 6.16101, 300, 0, 0, 0, 0, 48001), +(@CGUID+80, 21210, 530, 3520, 3748, 1, 1, 0, -3369.89, 2164.47, -7.06302, 4.90438, 300, 0, 0, 0, 0, 48001), +(@CGUID+81, 21211, 530, 3520, 3748, 1, 1, 0, -3369, 2145.35, 2.92919, 1.309, 300, 0, 0, 0, 0, 48001), +(@CGUID+82, 21211, 530, 3520, 3748, 1, 1, 0, -3368.97, 2145.44, -8.01526, 1.13446, 300, 0, 0, 0, 0, 48001), +(@CGUID+83, 21725, 530, 3520, 3748, 1, 1, 0, -3421.36, 2289.39, 33.6348, 3.87463, 300, 0, 0, 0, 0, 48001), +(@CGUID+84, 22024, 530, 3520, 3748, 1, 1, 0, -3412.86, 2291.42, 63.1161, 3.12795, 300, 0, 0, 0, 0, 48001); + +-- Pathing for Deathforge Smith Entry: 19756 +SET @NPC := @CGUID+8; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3479.9746,`position_y`=2202.5378,`position_z`=33.05405 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,0,173,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3479.9746,2202.5378,33.05405,NULL,40000,0,0,100,0), +(@PATH,2,-3477.6575,2191.7336,33.01089,NULL,0,0,0,100,0), +(@PATH,3,-3474.3267,2184.2778,33.403313,NULL,0,0,0,100,0), +(@PATH,4,-3468.784,2179.888,33.52856,NULL,0,0,0,100,0), +(@PATH,5,-3467.121,2176.402,33.92342,NULL,0,0,0,100,0), +(@PATH,6,-3468.7075,2173.587,33.400917,NULL,0,0,0,100,0), +(@PATH,7,-3471.544,2172.4304,33.143215,NULL,0,0,0,100,0), +(@PATH,8,-3491.4849,2167.5889,34.046986,NULL,0,0,0,100,0), +(@PATH,9,-3493.7341,2188.488,33.526424,NULL,0,0,0,100,0), +(@PATH,10,-3487.2883,2193.0696,33.466507,NULL,0,0,0,100,0), +(@PATH,11,-3478.9119,2197.492,32.95795,NULL,0,0,0,100,0), +(@PATH,12,-3478.3247,2201.7632,33.23236,NULL,0,0,0,100,0), +(@PATH,13,-3479.9746,2202.5378,33.05405,NULL,80000,0,0,100,0), +(@PATH,14,-3478.9119,2197.492,32.95795,NULL,0,0,0,100,0), +(@PATH,15,-3477.9863,2199.7947,33.230984,NULL,0,0,0,100,0); +-- 0x2030FC4240134B0000392800016AA0E7 .go xyz -3479.9746 2202.5378 33.05405 + +-- GUID auras +DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+15, @CGUID+16, @CGUID+81,@CGUID+82,86493); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES +(@CGUID+15,0,0,0,0,0,0, '31261'), +(@CGUID+16,0,0,0,0,0,0, '31261'), +(@CGUID+81,0,0,0,0,0,2, '30540'), +(@CGUID+82,0,0,0,0,0,2, ''); + +-- Cooling Infernal Flags +UPDATE `creature_template` SET `unit_flags` = 0 WHERE (`entry` = 19760); + +-- Dormant Infernal Detection range +UPDATE `creature_template` SET `detection_range` = 10 WHERE (`entry` = 21080); + +-- Dormant Infernal SAI +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21080); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21080, 0, 0, 1, 25, 0, 100, 1, 0, 0, 0, 0, 0, 11, 36055, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dormant Infernal - On Reset - Cast \'Stationary Infernal Ball\' (No Repeat)'), +(21080, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 36, 21080, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dormant Infernal - On Reset - Update Template To \'Dormant Infernal\' (No Repeat)'), +(21080, 0, 2, 3, 4, 0, 100, 0, 0, 0, 0, 0, 0, 36, 19759, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dormant Infernal - On Aggro - Update Template To \'Newly Crafted Infernal\''), +(21080, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 36055, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dormant Infernal - On Aggro - Remove Aura \'Stationary Infernal Ball\''); + +-- Refactor +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19756) AND (`source_type` = 0) AND (`id` IN (0, 1)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(19756, 0, 0, 0, 0, 0, 100, 0, 8000, 8000, 10000, 15000, 0, 11, 37580, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Deathforge Smith - In Combat - Cast \'Drill Armor\''), +(19756, 0, 1, 0, 0, 0, 100, 0, 12000, 12000, 12000, 16000, 0, 11, 36225, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Deathforge Smith - In Combat - Cast \'Chaos Nova\''); + +-- Invis Deathforge Caster +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 21210; +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21210); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21210, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 11, 36384, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invis Deathforge Caster - On Reset - Cast \'Skartax Purple Beam\''), +(21210, 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invis Deathforge Caster - On Data Set 1 1 - Despawn Instant'); +-- GUID-Specific +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = -(@CGUID+78)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(-(@CGUID+78), 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 11, 36393, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invis Deathforge Caster - On Reset - Cast \'Deathforge Summon Visual\''), +(-(@CGUID+78), 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Invis Deathforge Caster - On Data Set 1 1 - Despawn Instant'); + +-- Delete old SAI +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-84858,-84857,-84856,-84855,-84854); + +-- Formations +DELETE FROM `creature_formations` WHERE `memberGUID` IN (@CGUID+23,@CGUID+62,@CGUID+32,@CGUID+68,@CGUID+24,@CGUID+63,@CGUID+25,@CGUID+64,@CGUID+22,@CGUID+61,@CGUID+27,@CGUID+65); +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES +(@CGUID+23, @CGUID+23, 0, 0, 3), +(@CGUID+23, @CGUID+62, 3, 90, 515), +(@CGUID+32, @CGUID+32, 0, 0, 3), +(@CGUID+32, @CGUID+68, 3, 90, 515), +(@CGUID+24, @CGUID+24, 0, 0, 3), +(@CGUID+24, @CGUID+63, 3, 90, 515), +(@CGUID+25, @CGUID+25, 0, 0, 3), +(@CGUID+25, @CGUID+64, 3, 90, 515), +(@CGUID+22, @CGUID+22, 0, 0, 3), +(@CGUID+22, @CGUID+61, 3, 90, 515), +(@CGUID+27, @CGUID+27, 0, 0, 3), +(@CGUID+27, @CGUID+65, 3, 90, 515); + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+23; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3249.289,`position_y`=1934.058,`position_z`=106.556366 WHERE `guid`=@CGUID+23; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3249.289,`position_y`=1934.058,`position_z`=106.556366 WHERE `guid`=@CGUID+62; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3249.289,1934.058,106.556366,NULL,0,0,0,100,0), +(@PATH,2,-3240.7952,1940.6029,109.822235,NULL,0,0,0,100,0), +(@PATH,3,-3227.3296,1952.6995,110.57814,NULL,0,0,0,100,0), +(@PATH,4,-3217.4802,1975.721,107.65374,NULL,0,0,0,100,0), +(@PATH,5,-3212.6528,1977.6903,107.03326,NULL,0,0,0,100,0), +(@PATH,6,-3208.2712,1984.3756,106.52736,NULL,0,0,0,100,0), +(@PATH,7,-3199.6099,2005.0332,100.65568,NULL,0,0,0,100,0), +(@PATH,8,-3193.023,2012.7993,97.4439,NULL,0,0,0,100,0), +(@PATH,9,-3181.3623,2027.7971,93.296684,NULL,0,0,0,100,0), +(@PATH,10,-3193.023,2012.7993,97.4439,NULL,0,0,0,100,0), +(@PATH,11,-3199.6099,2005.0332,100.65568,NULL,0,0,0,100,0), +(@PATH,12,-3208.2712,1984.3756,106.52736,NULL,0,0,0,100,0), +(@PATH,13,-3212.646,1977.6931,107.030266,NULL,0,0,0,100,0), +(@PATH,14,-3217.4802,1975.721,107.65374,NULL,0,0,0,100,0), +(@PATH,15,-3227.3296,1952.6995,110.57814,NULL,0,0,0,100,0), +(@PATH,16,-3240.7952,1940.6029,109.822235,NULL,0,0,0,100,0); +-- 0x2030FC424014620000392800006AA0E7 .go xyz -3249.289 1934.058 106.556366 + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+32; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3441.2708,`position_y`=2136.4683,`position_z`=32.785088 WHERE `guid`=@CGUID+32; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3441.2708,`position_y`=2136.4683,`position_z`=32.785088 WHERE `guid`=@CGUID+68; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3441.2708,2136.4683,32.785088,NULL,0,0,0,100,0), +(@PATH,2,-3427.0508,2115.3972,34.58012,NULL,0,0,0,100,0), +(@PATH,3,-3421.247,2109.216,34.44698,NULL,0,0,0,100,0), +(@PATH,4,-3414.311,2109.6887,34.29539,NULL,0,0,0,100,0), +(@PATH,5,-3401.043,2112.6348,34.10258,NULL,0,0,0,100,0), +(@PATH,6,-3393.63,2105.9465,34.051487,NULL,0,0,0,100,0), +(@PATH,7,-3392.7725,2086.0906,34.250164,NULL,0,0,0,100,0), +(@PATH,8,-3382.6184,2065.6775,34.391132,NULL,0,0,0,100,0), +(@PATH,9,-3392.7725,2086.0906,34.250164,NULL,0,0,0,100,0), +(@PATH,10,-3393.63,2105.9465,34.051487,NULL,0,0,0,100,0), +(@PATH,11,-3401.043,2112.6348,34.10258,NULL,0,0,0,100,0), +(@PATH,12,-3414.311,2109.6887,34.29539,NULL,0,0,0,100,0), +(@PATH,13,-3421.247,2109.216,34.44698,NULL,0,0,0,100,0), +(@PATH,14,-3427.0508,2115.3972,34.58012,NULL,0,0,0,100,0); +-- 0x2030FC42401462000039280003EAA0E7 .go xyz -3441.2708 2136.4683 32.785088 + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+24; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3291.386,`position_y`=1982.4796,`position_z`=52.09859 WHERE `guid`=@CGUID+24; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3291.386,`position_y`=1982.4796,`position_z`=52.09859 WHERE `guid`=@CGUID+63; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3291.386,1982.4796,52.09859,NULL,0,0,0,100,0), +(@PATH,2,-3295.9385,1982.7728,51.78304,NULL,0,0,0,100,0), +(@PATH,3,-3299.0688,1990.464,49.55733,NULL,0,0,0,100,0), +(@PATH,4,-3306.1125,2009.0087,43.273743,NULL,0,0,0,100,0), +(@PATH,5,-3312.6907,2016.1764,40.107483,NULL,0,0,0,100,0), +(@PATH,6,-3341.4004,2012.4338,32.729168,NULL,0,0,0,100,0), +(@PATH,7,-3353.0286,1992.3295,29.830502,NULL,0,0,0,100,0), +(@PATH,8,-3361.1333,1987.2513,28.030022,NULL,0,0,0,100,0), +(@PATH,9,-3374.1396,1986.1565,24.836876,NULL,0,0,0,100,0), +(@PATH,10,-3394.2058,1991.6322,25.825983,NULL,0,0,0,100,0), +(@PATH,11,-3374.1396,1986.1565,24.836876,NULL,0,0,0,100,0), +(@PATH,12,-3361.1333,1987.2513,28.030022,NULL,0,0,0,100,0), +(@PATH,13,-3353.0286,1992.3295,29.830502,NULL,0,0,0,100,0), +(@PATH,14,-3341.4004,2012.4338,32.729168,NULL,0,0,0,100,0), +(@PATH,15,-3312.6907,2016.1764,40.107483,NULL,0,0,0,100,0), +(@PATH,16,-3306.1125,2009.0087,43.273743,NULL,0,0,0,100,0), +(@PATH,17,-3299.0688,1990.464,49.55733,NULL,0,0,0,100,0), +(@PATH,18,-3295.9385,1982.7728,51.78304,NULL,0,0,0,100,0); +-- 0x2030FC424014620000392800046AA0E7 .go xyz -3291.386 1982.4796 52.09859 + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+22; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3287.8828,`position_y`=1913.6244,`position_z`=142.81648 WHERE `guid`=@CGUID+22; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3287.8828,`position_y`=1913.6244,`position_z`=142.81648 WHERE `guid`=@CGUID+61; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3287.8828,1913.6244,142.81648,NULL,0,0,0,100,0), +(@PATH,2,-3293.4028,1928.4772,143.56796,NULL,0,0,0,100,0), +(@PATH,3,-3281.6875,1933.6029,144.61272,NULL,0,0,0,100,0), +(@PATH,4,-3270.929,1937.6763,144.4299,NULL,0,0,0,100,0), +(@PATH,5,-3257.2383,1944.8262,143.263,NULL,0,0,0,100,0), +(@PATH,6,-3244.7031,1948.7324,143.88599,NULL,0,0,0,100,0), +(@PATH,7,-3232.3496,1955.7667,145.72418,NULL,0,0,0,100,0), +(@PATH,8,-3219.4329,1965.9182,144.45306,NULL,0,0,0,100,0), +(@PATH,9,-3211.733,1981.3756,141.17262,NULL,0,0,0,100,0), +(@PATH,10,-3219.4329,1965.9182,144.45306,NULL,0,0,0,100,0), +(@PATH,11,-3232.3496,1955.7667,145.72418,NULL,0,0,0,100,0), +(@PATH,12,-3244.7031,1948.7324,143.88599,NULL,0,0,0,100,0), +(@PATH,13,-3257.2383,1944.8262,143.263,NULL,0,0,0,100,0), +(@PATH,14,-3270.929,1937.6763,144.4299,NULL,0,0,0,100,0), +(@PATH,15,-3281.6875,1933.6029,144.61272,NULL,0,0,0,100,0), +(@PATH,16,-3293.4028,1928.4772,143.56796,NULL,0,0,0,100,0); +-- 0x2030FC42401462000039280005EAA0E7 .go xyz -3287.8828 1913.6244 142.81648 + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+27; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3350.4548,`position_y`=2102.0413,`position_z`=6.35183 WHERE `guid`=@CGUID+27; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3350.4548,`position_y`=2102.0413,`position_z`=6.35183 WHERE `guid`=@CGUID+65; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3350.4548,2102.0413,6.35183,NULL,0,0,0,100,0), +(@PATH,2,-3371.799,2078.6301,6.4980073,NULL,0,0,0,100,0), +(@PATH,3,-3393.8728,2072.1277,10.005706,NULL,0,0,0,100,0), +(@PATH,4,-3404.8042,2054.7522,15.128708,NULL,0,0,0,100,0), +(@PATH,5,-3447.9324,2059.6836,15.746407,NULL,0,0,0,100,0), +(@PATH,6,-3406.7312,2053.7075,15.271384,NULL,0,0,0,100,0), +(@PATH,7,-3404.0933,2055.8787,15.2170315,NULL,0,0,0,100,0), +(@PATH,8,-3393.372,2075.341,9.194681,NULL,0,0,0,100,0), +(@PATH,9,-3369.0967,2079.7554,5.8863196,NULL,0,0,0,100,0), +(@PATH,10,-3348.3694,2101.9636,6.004652,NULL,0,0,0,100,0), +(@PATH,11,-3311.7373,2124.7922,8.987838,NULL,0,0,0,100,0), +(@PATH,12,-3350.4548,2102.0413,6.35183,NULL,0,0,0,100,0), +(@PATH,13,-3371.799,2078.6301,6.4980073,NULL,0,0,0,100,0), +(@PATH,14,-3393.8728,2072.1277,10.005706,NULL,0,0,0,100,0), +(@PATH,15,-3404.8042,2054.7522,15.128708,NULL,0,0,0,100,0), +(@PATH,16,-3447.9324,2059.6836,15.746407,NULL,0,0,0,100,0), +(@PATH,17,-3406.7312,2053.7075,15.271384,NULL,0,0,0,100,0), +(@PATH,18,-3395.842,2011.2098,23.021214,NULL,0,0,0,100,0), +(@PATH,19,-3404.0933,2055.8787,15.2170315,NULL,0,0,0,100,0), +(@PATH,20,-3393.372,2075.341,9.194681,NULL,0,0,0,100,0), +(@PATH,21,-3369.0967,2079.7554,5.8863196,NULL,0,0,0,100,0), +(@PATH,22,-3348.3694,2101.9636,6.004652,NULL,0,0,0,100,0), +(@PATH,23,-3311.7373,2124.7922,8.987838,NULL,0,0,0,100,0); +-- 0x2030FC424014620000392800066AA0E7 .go xyz -3350.4548 2102.0413 6.35183 + +-- Pathing for Deathforge Summoner Entry: 20872 +SET @NPC := @CGUID+25; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3276.3625,`position_y`=2037.8624,`position_z`=66.73646 WHERE `guid`=@CGUID+25; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3276.3625,`position_y`=2037.8624,`position_z`=66.73646 WHERE `guid`=@CGUID+64; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1 ,-3275.4268,2016.694,61.82193,NULL,0,0,0,100,0), +(@PATH,2 ,-3276.3625,2037.8624,66.73646,NULL,0,0,0,100,0), +(@PATH,3 ,-3277.2617,2044.0239,68.41358,NULL,0,0,0,100,0), +(@PATH,4 ,-3274.2263,2055.0208,71.28834,NULL,0,0,0,100,0), +(@PATH,5 ,-3260.7517,2071.1848,74.81242,NULL,0,0,0,100,0), +(@PATH,6 ,-3241.4465,2084.1897,77.30461,NULL,0,0,0,100,0), +(@PATH,7 ,-3221.2805,2093.9385,76.65476,NULL,0,0,0,100,0), +(@PATH,8 ,-3210.8396,2101.748,75.629654,NULL,0,0,0,100,0), +(@PATH,9 ,-3221.25,2093.9658,76.65476,NULL,0,0,0,100,0), +(@PATH,10,-3241.4465,2084.1897,77.30461,NULL,0,0,0,100,0), +(@PATH,11,-3260.7517,2071.1848,74.81242,NULL,0,0,0,100,0), +(@PATH,12,-3274.205,2055.045,71.29359,NULL,0,0,0,100,0), +(@PATH,13,-3277.2617,2044.0239,68.41358,NULL,0,0,0,100,0), +(@PATH,14,-3276.3625,2037.8624,66.73646,NULL,0,0,0,100,0); +-- 0x2030FC42401462000039280004EAA0E7 .go xyz -3276.3625 2037.8624 66.73646 + +-- Pathing for Deathforge Tinkerer Entry: 19754 +SET @NPC := @CGUID+1; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3420.1304,`position_y`=2282.9092,`position_z`=33.51472 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3420.1304,2282.9092,33.51472,NULL,0,1,0,100,0), +(@PATH,2,-3417.118,2263.4177,33.64922,NULL,0,1,0,100,0), +(@PATH,3,-3416.865,2254.3262,33.69727,NULL,0,1,0,100,0), +(@PATH,4,-3428.3596,2249.196,33.632732,NULL,0,1,0,100,0), +(@PATH,5,-3435.316,2242.5996,33.767357,NULL,0,1,0,100,0), +(@PATH,6,-3439.7942,2238.186,33.723534,NULL,0,1,0,100,0), +(@PATH,7,-3446.786,2237.977,33.72885,NULL,0,1,0,100,0), +(@PATH,8,-3462.82,2227.9,33.444492,NULL,0,1,0,100,0), +(@PATH,9,-3472.9297,2229.5059,33.525303,NULL,0,1,0,100,0), +(@PATH,10,-3477.2114,2231.8064,33.52516,NULL,0,1,0,100,0), +(@PATH,11,-3462.82,2227.9,33.444492,NULL,0,1,0,100,0), +(@PATH,12,-3452.246,2235.5383,33.707893,NULL,0,1,0,100,0), +(@PATH,13,-3446.786,2237.977,33.72885,NULL,0,1,0,100,0), +(@PATH,14,-3439.7942,2238.186,33.723534,NULL,0,1,0,100,0), +(@PATH,15,-3428.3596,2249.196,33.632732,NULL,0,1,0,100,0), +(@PATH,16,-3416.865,2254.3262,33.69727,NULL,0,1,0,100,0), +(@PATH,17,-3416.4163,2272.8167,33.712013,NULL,0,1,0,100,0); +-- 0x2030FC4240134A8000392800016AA0E7 .go xyz -3420.1304 2282.9092 33.51472 + +-- Pathing for Deathforge Tinkerer Entry: 19754 +-- 0x2030FC4240134A8000392800006AA0E7 .go xyz -3412.3855 2280.988 33.848083 +SET @NPC := @CGUID+5; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3412.3855,`position_y`=2280.988,`position_z`=33.848083 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3412.3855,2280.988,33.848083,NULL,0,1,0,100,0), +(@PATH,2,-3419.7566,2260.3987,33.625275,NULL,0,1,0,100,0), +(@PATH,3,-3432.1763,2248.1692,33.655376,NULL,0,1,0,100,0), +(@PATH,4,-3439.0522,2235.8691,33.697147,NULL,0,1,0,100,0), +(@PATH,5,-3445.5662,2231.0151,33.650684,NULL,0,1,0,100,0), +(@PATH,6,-3452.4036,2231.0183,33.658176,NULL,0,1,0,100,0), +(@PATH,7,-3468.3413,2225.2063,33.525757,NULL,0,1,0,100,0), +(@PATH,8,-3475.888,2220.3936,33.526955,NULL,0,1,0,100,0), +(@PATH,9,-3480.2568,2225.0461,33.526432,NULL,0,1,0,100,0), +(@PATH,10,-3468.3413,2225.2063,33.525757,NULL,0,1,0,100,0), +(@PATH,11,-3457.4155,2230.646,33.613297,NULL,0,1,0,100,0), +(@PATH,12,-3450.227,2229.2805,33.63662,NULL,0,1,0,100,0), +(@PATH,13,-3439.0522,2235.8691,33.697147,NULL,0,1,0,100,0), +(@PATH,14,-3432.1763,2248.1692,33.655376,NULL,0,1,0,100,0), +(@PATH,15,-3426.0977,2255.3433,33.588165,NULL,0,1,0,100,0), +(@PATH,16,-3419.7566,2260.3987,33.625275,NULL,0,1,0,100,0), +(@PATH,17,-3414.0315,2270.5618,33.757763,NULL,0,1,0,100,0); From d3b047c27a2a38e23e6ad3d3fb41b9eec6b1816c Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:13:25 -0300 Subject: [PATCH 10/32] fix(DB/Loot): Darkwater Crocolisk skinning loot (#15027) --- data/sql/updates/pending_db_world/rev_1676319348374000100.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676319348374000100.sql diff --git a/data/sql/updates/pending_db_world/rev_1676319348374000100.sql b/data/sql/updates/pending_db_world/rev_1676319348374000100.sql new file mode 100644 index 000000000..d6e4d548a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676319348374000100.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `skinning_loot_template` WHERE (`Entry` = 17952); + +UPDATE `creature_template` SET `skinloot` = 70068 WHERE (`entry` IN (17952, 22163)); From 59292f5b13c9264818f41cb6eb37ee71f816deb6 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 16 Feb 2023 01:15:49 +0000 Subject: [PATCH 11/32] chore(DB): import pending files Referenced commit(s): d3b047c27a2a38e23e6ad3d3fb41b9eec6b1816c --- .../rev_1676319348374000100.sql => db_world/2023_02_16_00.sql} | 1 + .../rev_1676321187026326300.sql => db_world/2023_02_16_01.sql} | 1 + .../rev_1676495188428976800.sql => db_world/2023_02_16_02.sql} | 1 + .../rev_1676502726004152400.sql => db_world/2023_02_16_03.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1676319348374000100.sql => db_world/2023_02_16_00.sql} (77%) rename data/sql/updates/{pending_db_world/rev_1676321187026326300.sql => db_world/2023_02_16_01.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676495188428976800.sql => db_world/2023_02_16_02.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676502726004152400.sql => db_world/2023_02_16_03.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1676319348374000100.sql b/data/sql/updates/db_world/2023_02_16_00.sql similarity index 77% rename from data/sql/updates/pending_db_world/rev_1676319348374000100.sql rename to data/sql/updates/db_world/2023_02_16_00.sql index d6e4d548a..df51ac363 100644 --- a/data/sql/updates/pending_db_world/rev_1676319348374000100.sql +++ b/data/sql/updates/db_world/2023_02_16_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_15_00 -> 2023_02_16_00 -- DELETE FROM `skinning_loot_template` WHERE (`Entry` = 17952); diff --git a/data/sql/updates/pending_db_world/rev_1676321187026326300.sql b/data/sql/updates/db_world/2023_02_16_01.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676321187026326300.sql rename to data/sql/updates/db_world/2023_02_16_01.sql index cc5bb58c7..e5496d606 100644 --- a/data/sql/updates/pending_db_world/rev_1676321187026326300.sql +++ b/data/sql/updates/db_world/2023_02_16_01.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_16_00 -> 2023_02_16_01 -- Remove all of the same Ids, remove non-combat pet, remove mines DELETE FROM `creature` WHERE `id1` IN (19754,19756,19757,19759,19760,20872,20878,20887,21080,21207,21210,21211,21725,22024,18381,22315) AND `map`=530; diff --git a/data/sql/updates/pending_db_world/rev_1676495188428976800.sql b/data/sql/updates/db_world/2023_02_16_02.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676495188428976800.sql rename to data/sql/updates/db_world/2023_02_16_02.sql index f8f6944ab..81cec3320 100644 --- a/data/sql/updates/pending_db_world/rev_1676495188428976800.sql +++ b/data/sql/updates/db_world/2023_02_16_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_16_01 -> 2023_02_16_02 -- Delete all old spawns DELETE FROM `creature` WHERE `id1` IN (21788, 21795); diff --git a/data/sql/updates/pending_db_world/rev_1676502726004152400.sql b/data/sql/updates/db_world/2023_02_16_03.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676502726004152400.sql rename to data/sql/updates/db_world/2023_02_16_03.sql index 4bb49dfae..aaff3b73f 100644 --- a/data/sql/updates/pending_db_world/rev_1676502726004152400.sql +++ b/data/sql/updates/db_world/2023_02_16_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_16_02 -> 2023_02_16_03 -- Delete all previous spawns DELETE FROM `creature` WHERE `id1`=21815; DELETE FROM `creature_addon` WHERE `guid` BETWEEN 76347 AND 76376; From 9dfae7c7c48f4e9ce57c902464bb3c1bda40c440 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:27:53 -0300 Subject: [PATCH 12/32] fix(DB/Creature): Add another Ghostrider of Karabor group (#15062) --- .../rev_1676509327366634300.sql | 249 ++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676509327366634300.sql diff --git a/data/sql/updates/pending_db_world/rev_1676509327366634300.sql b/data/sql/updates/pending_db_world/rev_1676509327366634300.sql new file mode 100644 index 000000000..956012141 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676509327366634300.sql @@ -0,0 +1,249 @@ +-- Ghostriders of Karabor (Counter-Clockwise Group) +SET @GUID := 77821; + +-- Delete useless SAI and replace with addons +UPDATE `creature_template_addon` SET `bytes1` = 0, `bytes2` = 1, `auras` = '37509 37497' WHERE (`entry` = 21784); +UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 21784; +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21784) AND (`source_type` = 0); + +DELETE FROM `creature_addon` WHERE (`guid`=76082); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(76082, 760820, 0, 0, 1, 0, 0, '37509 37497'); + +-- Adds Counter-Clockwise spawns and pathing +DELETE FROM `creature` WHERE `id1`=21784 AND `guid` BETWEEN @GUID+0 AND @GUID+3; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `VerifiedBuild`) VALUES +(@GUID+0, 21784, 530, 3520, 0, -3819.457763671875, 748.92352294921875, 10.99925899505615234, 0.070442236959934234, 300, 0, 0, 48069), +(@GUID+1, 21784, 530, 3520, 0, -3815.6474609375, 749.24517822265625, 11.05895233154296875, 0.065464057028293609, 300, 0, 0, 48069), +(@GUID+2, 21784, 530, 3520, 0, -3821.62451171875, 748.836181640625, 11.10200881958007812, 0.06403488665819168, 300, 0, 0, 48069), +(@GUID+3, 21784, 530, 3520, 0, -3817.855712890625, 749.68603515625, 11.13191509246826171, 0.257404744625091552, 300, 0, 0, 48069); + +DELETE FROM `creature_formations` WHERE `memberGUID` IN (@GUID+0, @GUID+1, @GUID+2, @GUID+3) AND `leaderGUID`=@GUID+0; +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES +(@GUID+0, @GUID+0, 0, 0, 2), +(@GUID+0, @GUID+1, 7, 180, 514), +(@GUID+0, @GUID+2, 7, 0, 514), +(@GUID+0, @GUID+3, 14, 0, 514); + +SET @NPC := @GUID+0; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3582.0117,`position_y`=738.00085,`position_z`=-11.60027 WHERE `guid`=@NPC; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=0,`position_x`=-3582.0117,`position_y`=738.00085,`position_z`=-11.60027 WHERE `guid` BETWEEN @GUID+1 AND @GUID+3; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, '37509 37497'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-3582.0117,738.00085,-11.60027,NULL,0,1,0,100,0), +(@PATH,2,-3555.0117,736.999,-15.206091,NULL,0,1,0,100,0), +(@PATH,3,-3523.9648,739.6356,-24.99333,NULL,0,1,0,100,0), +(@PATH,4,-3497.655,743.2893,-31.746204,NULL,0,1,0,100,0), +(@PATH,5,-3475.0977,746.03796,-34.793076,NULL,0,1,0,100,0), +(@PATH,6,-3436.73,748.79034,-32.796745,NULL,0,1,0,100,0), +(@PATH,7,-3408.0854,748.2836,-36.34636,NULL,0,1,0,100,0), +(@PATH,8,-3383.3176,751.9549,-32.763138,NULL,0,1,0,100,0), +(@PATH,9,-3350.7744,758.35284,-27.62442,NULL,0,1,0,100,0), +(@PATH,10,-3311.8325,764.73505,-22.817963,NULL,0,1,0,100,0), +(@PATH,11,-3283.9106,770.69055,-20.497715,NULL,0,1,0,100,0), +(@PATH,12,-3263.689,779.30383,-19.28307,NULL,0,1,0,100,0), +(@PATH,13,-3242.6887,782.1927,-19.523304,NULL,0,1,0,100,0), +(@PATH,14,-3213.1897,780.7821,-19.802399,NULL,0,1,0,100,0), +(@PATH,15,-3184.148,778.73895,-20.848785,NULL,0,1,0,100,0), +(@PATH,16,-3159.3918,782.47876,-21.848217,NULL,0,1,0,100,0), +(@PATH,17,-3135.858,792.18317,-21.983227,NULL,0,1,0,100,0), +(@PATH,18,-3121.3635,807.0347,-22.550884,NULL,0,1,0,100,0), +(@PATH,19,-3110.7349,837.2576,-21.119303,NULL,0,1,0,100,0), +(@PATH,20,-3090.6934,860.93164,-20.413082,NULL,0,1,0,100,0), +(@PATH,21,-3086.6228,881.49695,-19.495127,NULL,0,1,0,100,0), +(@PATH,22,-3091.6887,914.3597,-18.61809,NULL,0,1,0,100,0), +(@PATH,23,-3097.855,942.389,-15.7861,NULL,0,1,0,100,0), +(@PATH,24,-3111.2188,959.85547,-12.459139,NULL,0,1,0,100,0), +(@PATH,25,-3116.3645,984.43695,-7.602827,NULL,0,1,0,100,0), +(@PATH,26,-3115.991,1009.3419,-1.9761763,NULL,0,1,0,100,0), +(@PATH,27,-3113.8875,1031.1473,3.3822222,NULL,0,1,0,100,0), +(@PATH,28,-3113.047,1051.9934,8.890436,NULL,0,1,0,100,0), +(@PATH,29,-3115.8875,1075.5958,15.084559,NULL,0,1,0,100,0), +(@PATH,30,-3121.8723,1090.9601,18.347866,NULL,0,1,0,100,0), +(@PATH,31,-3118.568,1109.29,21.958874,NULL,0,1,0,100,0), +(@PATH,32,-3114.959,1130.9893,24.531628,NULL,0,1,0,100,0), +(@PATH,33,-3116.3867,1168.0779,25.999382,NULL,0,1,0,100,0), +(@PATH,34,-3095.2922,1193.738,20.86491,NULL,0,1,0,100,0), +(@PATH,35,-3083.3381,1214.5853,16.09737,NULL,0,1,0,100,0), +(@PATH,36,-3083.523,1240.9,12.7167015,NULL,0,1,0,100,0), +(@PATH,37,-3069.565,1261.482,8.94656,NULL,0,1,0,100,0), +(@PATH,38,-3051.8108,1283.4492,14.047925,NULL,0,1,0,100,0), +(@PATH,39,-3029.4631,1306.8901,8.647018,NULL,0,1,0,100,0), +(@PATH,40,-3004.9902,1327.7563,8.398155,NULL,0,1,0,100,0), +(@PATH,41,-2988.193,1350.7687,9.718176,NULL,0,1,0,100,0), +(@PATH,42,-2987.539,1387.9454,11.595335,NULL,0,1,0,100,0), +(@PATH,43,-2984.721,1419.052,12.349408,NULL,0,1,0,100,0), +(@PATH,44,-2980.0815,1437.6061,12.02513,NULL,0,1,0,100,0), +(@PATH,45,-2947.8293,1453.4999,11.854938,NULL,0,1,0,100,0), +(@PATH,46,-2928.739,1472.8331,12.738223,NULL,0,1,0,100,0), +(@PATH,47,-2915.1843,1477.9686,13.301211,NULL,0,1,0,100,0), +(@PATH,48,-2899.6064,1484.0338,14.062313,NULL,0,1,0,100,0), +(@PATH,49,-2891.6455,1501.3971,16.361866,NULL,0,1,0,100,0), +(@PATH,50,-2884.9421,1523.7585,21.605066,NULL,0,1,0,100,0), +(@PATH,51,-2873.7993,1564.3153,15.587232,NULL,0,1,0,100,0), +(@PATH,52,-2870.468,1578.8677,15.672398,NULL,0,1,0,100,0), +(@PATH,53,-2857.2473,1595.7028,14.916075,NULL,0,1,0,100,0), +(@PATH,54,-2841.8616,1612.7998,13.600535,NULL,0,1,0,100,0), +(@PATH,55,-2825.668,1627.954,13.00577,NULL,0,1,0,100,0), +(@PATH,56,-2820.7559,1640.2091,13.511487,NULL,0,1,0,100,0), +(@PATH,57,-2821.572,1670.0314,18.706371,NULL,0,1,0,100,0), +(@PATH,58,-2823.1855,1683.9355,22.622631,NULL,0,1,0,100,0), +(@PATH,59,-2832.3555,1698.1925,27.174511,NULL,0,1,0,100,0), +(@PATH,60,-2850.1814,1708.6688,32.676376,NULL,0,1,0,100,0), +(@PATH,61,-2864.478,1707.7451,35.981064,NULL,0,1,0,100,0), +(@PATH,62,-2876.0574,1716.8547,38.347626,NULL,0,1,0,100,0), +(@PATH,63,-2882.9565,1742.1371,43.716034,NULL,0,1,0,100,0), +(@PATH,64,-2890.5344,1761.4727,48.10666,NULL,0,1,0,100,0), +(@PATH,65,-2902.9592,1782.6305,53.90005,NULL,0,1,0,100,0), +(@PATH,66,-2911.177,1802.306,60.47678,NULL,0,1,0,100,0), +(@PATH,67,-2918.327,1818.2008,67.8071,NULL,0,1,0,100,0), +(@PATH,68,-2927.1282,1832.0438,74.59665,NULL,0,1,0,100,0), +(@PATH,69,-2943.1077,1848.8529,84.22737,NULL,0,1,0,100,0), +(@PATH,70,-2949.2646,1858.1685,88.558304,NULL,0,1,0,100,0), +(@PATH,71,-2954.5918,1874.0885,93.99742,NULL,0,1,0,100,0), +(@PATH,72,-2955.1777,1886.0771,97.160995,NULL,0,1,0,100,0), +(@PATH,73,-2966.3418,1907.8889,103.50938,NULL,0,1,0,100,0), +(@PATH,74,-2983.3926,1913.6719,106.238396,NULL,0,1,0,100,0), +(@PATH,75,-3003.3296,1914.3873,108.55613,NULL,0,1,0,100,0), +(@PATH,76,-3021.864,1915.1549,110.53001,NULL,0,1,0,100,0), +(@PATH,77,-3040.5696,1924.1992,112.65802,NULL,0,1,0,100,0), +(@PATH,78,-3067.7712,1940.5625,110.8596,NULL,0,1,0,100,0), +(@PATH,79,-3084.0168,1957.625,108.3895,NULL,0,1,0,100,0), +(@PATH,80,-3094.934,1975.8186,103.72227,NULL,0,1,0,100,0), +(@PATH,81,-3107.3618,1995.9705,98.75629,NULL,0,1,0,100,0), +(@PATH,82,-3127.395,2011.118,95.060585,NULL,0,1,0,100,0), +(@PATH,83,-3145.0952,2035.0865,91.13515,NULL,0,1,0,100,0), +(@PATH,84,-3154.4106,2064.3984,85.091934,NULL,0,1,0,100,0), +(@PATH,85,-3165.4097,2090.8713,78.2907,NULL,0,1,0,100,0), +(@PATH,86,-3180.0928,2105.2795,74.66322,NULL,0,1,0,100,0), +(@PATH,87,-3183.9163,2132.2937,72.24159,NULL,0,1,0,100,0), +(@PATH,88,-3185.9082,2166.2275,69.39077,NULL,0,1,0,100,0), +(@PATH,89,-3190.555,2200.3708,64.61389,NULL,0,1,0,100,0), +(@PATH,90,-3209.5652,2229.8103,61.611267,NULL,0,1,0,100,0), +(@PATH,91,-3222.774,2256.2476,60.954983,NULL,0,1,0,100,0), +(@PATH,92,-3229.9875,2283.622,59.82189,NULL,0,1,0,100,0), +(@PATH,93,-3254.781,2289.5452,60.01627,NULL,0,1,0,100,0), +(@PATH,94,-3287.284,2280.2148,60.54257,NULL,0,1,0,100,0), +(@PATH,95,-3318.9583,2280.5662,60.957447,NULL,0,1,0,100,0), +(@PATH,96,-3334.6367,2279.0322,61.08214,NULL,0,1,0,100,0), +(@PATH,97,-3356.0842,2280.439,61.70714,NULL,0,1,0,100,0), +(@PATH,98,-3390.7852,2288.6924,62.45162,NULL,0,1,0,100,0), +(@PATH,99,-3432.105,2291.0093,63.95459,NULL,0,1,0,100,0), +(@PATH,100,-3459.0635,2287.3716,63.49482,NULL,0,1,0,100,0), +(@PATH,101,-3484.7544,2277.8838,64.76956,NULL,0,1,0,100,0), +(@PATH,102,-3518.2925,2275.475,67.45433,NULL,0,1,0,100,0), +(@PATH,103,-3533.47,2289.268,68.338264,NULL,0,1,0,100,0), +(@PATH,104,-3564.415,2310.2537,70.72118,NULL,0,1,0,100,0), +(@PATH,105,-3586.9258,2321.0938,72.65774,NULL,0,1,0,100,0), +(@PATH,106,-3619.1128,2314.7576,74.752235,NULL,0,1,0,100,0), +(@PATH,107,-3655.283,2316.3645,75.673836,NULL,0,1,0,100,0), +(@PATH,108,-3679.8582,2324.0464,76.05544,NULL,0,1,0,100,0), +(@PATH,109,-3686.4944,2345.6753,76.49172,NULL,0,1,0,100,0), +(@PATH,110,-3708.8047,2332.9731,76.40668,NULL,0,1,0,100,0), +(@PATH,111,-3725.7769,2299.8875,76.434105,NULL,0,1,0,100,0), +(@PATH,112,-3742.7925,2271.6106,76.75626,NULL,0,1,0,100,0), +(@PATH,113,-3742.004,2226.5261,76.874565,NULL,0,1,0,100,0), +(@PATH,114,-3741.3706,2195.8499,75.88122,NULL,0,1,0,100,0), +(@PATH,115,-3751.1272,2168.9712,75.63122,NULL,0,1,0,100,0), +(@PATH,116,-3753.1519,2140.9016,76.13715,NULL,0,1,0,100,0), +(@PATH,117,-3756.7126,2111.3694,77.23974,NULL,0,1,0,100,0), +(@PATH,118,-3752.5837,2091.0122,78.475334,NULL,0,1,0,100,0), +(@PATH,119,-3752.1387,2072.0117,80.20922,NULL,0,1,0,100,0), +(@PATH,120,-3755.4336,2054.5112,82.61487,NULL,0,1,0,100,0), +(@PATH,121,-3755.7239,2030.6869,84.53136,NULL,0,1,0,100,0), +(@PATH,122,-3765.3174,2016.2444,85.313705,NULL,0,1,0,100,0), +(@PATH,123,-3783.3508,1997.0756,85.08433,NULL,0,1,0,100,0), +(@PATH,124,-3799.6658,1979.3724,85.55808,NULL,0,1,0,100,0), +(@PATH,125,-3816.697,1959.4935,85.91917,NULL,0,1,0,100,0), +(@PATH,126,-3824.5,1936.44,85.93101,NULL,0,1,0,100,0), +(@PATH,127,-3832.629,1919.7522,85.76732,NULL,0,1,0,100,0), +(@PATH,128,-3841.763,1894.5513,86.151825,NULL,0,1,0,100,0), +(@PATH,129,-3847.7222,1871.7231,87.276825,NULL,0,1,0,100,0), +(@PATH,130,-3849.1125,1848.7759,88.85516,NULL,0,1,0,100,0), +(@PATH,131,-3855.0369,1816.8923,91.29085,NULL,0,1,0,100,0), +(@PATH,132,-3859.1584,1800.7324,92.463455,NULL,0,1,0,100,0), +(@PATH,133,-3871.3525,1781.5446,94.99746,NULL,0,1,0,100,0), +(@PATH,134,-3888.382,1768.2567,96.592064,NULL,0,1,0,100,0), +(@PATH,135,-3912.447,1753.6243,98.84891,NULL,0,1,0,100,0), +(@PATH,136,-3928.9736,1745.6226,98.811676,NULL,0,1,0,100,0), +(@PATH,137,-3948.1199,1731.9373,98.95314,NULL,0,1,0,100,0), +(@PATH,138,-3971.3762,1719.2325,98.42671,NULL,0,1,0,100,0), +(@PATH,139,-3994.591,1694.3868,96.65658,NULL,0,1,0,100,0), +(@PATH,140,-4019.2986,1671.7175,94.96815,NULL,0,1,0,100,0), +(@PATH,141,-4042.7864,1647.2351,94.4459,NULL,0,1,0,100,0), +(@PATH,142,-4053.7595,1618.9377,93.98786,NULL,0,1,0,100,0), +(@PATH,143,-4055.4792,1585.9011,97.43603,NULL,0,1,0,100,0), +(@PATH,144,-4054.496,1562.6348,100.34821,NULL,0,1,0,100,0), +(@PATH,145,-4056.428,1517.8992,91.81193,NULL,0,1,0,100,0), +(@PATH,146,-4052.5383,1490.919,88.903824,NULL,0,1,0,100,0), +(@PATH,147,-4054.3816,1457.9562,86.178566,NULL,0,1,0,100,0), +(@PATH,148,-4058.8274,1424.054,84.51471,NULL,0,1,0,100,0), +(@PATH,149,-4056.784,1402.6115,84.26471,NULL,0,1,0,100,0), +(@PATH,150,-4053.1711,1376.5989,84.72242,NULL,0,1,0,100,0), +(@PATH,151,-4047.0095,1347.4528,90.51227,NULL,0,1,0,100,0), +(@PATH,152,-4041.6316,1313.6207,86.84549,NULL,0,1,0,100,0), +(@PATH,153,-4034.7075,1274.2057,80.36119,NULL,0,1,0,100,0), +(@PATH,154,-4040.3052,1250.1128,75.77411,NULL,0,1,0,100,0), +(@PATH,155,-4044.1711,1228.2257,70.60931,NULL,0,1,0,100,0), +(@PATH,156,-4051.6997,1206.2372,64.14324,NULL,0,1,0,100,0), +(@PATH,157,-4051.033,1181.0485,56.85391,NULL,0,1,0,100,0), +(@PATH,158,-4036.7727,1165.146,51.403164,NULL,0,1,0,100,0), +(@PATH,159,-4016.6936,1152.6305,45.568237,NULL,0,1,0,100,0), +(@PATH,160,-3999.3496,1142.6895,40.69457,NULL,0,1,0,100,0), +(@PATH,161,-3990.227,1123.0391,35.944115,NULL,0,1,0,100,0), +(@PATH,162,-3979.3733,1102.0045,31.078268,NULL,0,1,0,100,0), +(@PATH,163,-3957.9575,1087.949,27.945192,NULL,0,1,0,100,0), +(@PATH,164,-3950.3577,1068.483,26.809206,NULL,0,1,0,100,0), +(@PATH,165,-3932.0112,1050.9928,25.952951,NULL,0,1,0,100,0), +(@PATH,166,-3914.2473,1031.0282,24.950785,NULL,0,1,0,100,0), +(@PATH,167,-3896.0269,1016.1782,23.950865,NULL,0,1,0,100,0), +(@PATH,168,-3883.1223,1005.5522,23.554625,NULL,0,1,0,100,0), +(@PATH,169,-3880.2673,969.4604,23.393902,NULL,0,1,0,100,0), +(@PATH,170,-3883.791,947.73926,22.075474,NULL,0,1,0,100,0), +(@PATH,171,-3884.158,925.04364,20.087063,NULL,0,1,0,100,0), +(@PATH,172,-3880.1401,908.9754,19.519314,NULL,0,1,0,100,0), +(@PATH,173,-3880.5508,892.58185,18.92548,NULL,0,1,0,100,0), +(@PATH,174,-3885.2126,875.7244,17.92841,NULL,0,1,0,100,0), +(@PATH,175,-3888.9866,850.8404,15.379325,NULL,0,1,0,100,0), +(@PATH,176,-3885.3499,832.82404,13.380096,NULL,0,1,0,100,0), +(@PATH,177,-3882.1016,809.5953,11.217621,NULL,0,1,0,100,0), +(@PATH,178,-3884.0886,790.5035,10.055253,NULL,0,1,0,100,0), +(@PATH,179,-3875.6504,768.0508,9.805253,NULL,0,1,0,100,0), +(@PATH,180,-3858.3767,752.1172,10.451253,NULL,0,1,0,100,0), +(@PATH,181,-3830.664,748.1328,11.006915,NULL,0,1,0,100,0), +(@PATH,182,-3796.352,750.55383,10.983474,NULL,0,1,0,100,0), +(@PATH,183,-3775.1267,747.28015,9.225661,NULL,0,1,0,100,0), +(@PATH,184,-3740.4004,751.55273,7.766179,NULL,0,1,0,100,0), +(@PATH,185,-3711.6086,748.41125,4.40273,NULL,0,1,0,100,0), +(@PATH,186,-3683.2083,737.7433,0.52083683,NULL,0,1,0,100,0), +(@PATH,187,-3663.0942,736.6085,-1.9690733,NULL,0,1,0,100,0), +(@PATH,188,-3644.5,729.26465,-4.058429,NULL,0,1,0,100,0), +(@PATH,189,-3626.748,728.89825,-6.407139,NULL,0,1,0,100,0), +(@PATH,190,-3609.681,734.6094,-9.436558,NULL,0,1,0,100,0); + +-- Add pooling for both groups +DELETE FROM `pool_template` WHERE `entry` IN (105, 106, 107) AND `description` LIKE '%Ghostrider of Karabor (21784)%'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(105, 4, 'Ghostrider of Karabor (21784) - Clockwise Group'), +(106, 4, 'Ghostrider of Karabor (21784) - Counterclockwise Group'), +(107, 1, 'Ghostrider of Karabor (21784) - Master Pool'); + +DELETE FROM `pool_pool` WHERE `pool_id` IN (105, 106) AND `mother_pool`=107; +INSERT INTO `pool_pool` (`pool_id`, `mother_pool`, `chance`, `description`) VALUES +(105, 107, 0, 'Ghostrider of Karabor (21784) - Clockwise Group'), +(106, 107, 0, 'Ghostrider of Karabor (21784) - Counterclockwise Group'); + +DELETE FROM `pool_creature` WHERE `pool_entry` IN (105, 106) AND `description` LIKE '%Ghostrider of Karabor (21784)%'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(76082, 105, 0, 'Ghostrider of Karabor (21784) - Clockwise Group'), +(76083, 105, 0, 'Ghostrider of Karabor (21784) - Clockwise Group'), +(76084, 105, 0, 'Ghostrider of Karabor (21784) - Clockwise Group'), +(76085, 105, 0, 'Ghostrider of Karabor (21784) - Clockwise Group'), + +(@GUID+0, 106, 0, 'Ghostrider of Karabor (21784) - Counterclockwise Group'), +(@GUID+1, 106, 0, 'Ghostrider of Karabor (21784) - Counterclockwise Group'), +(@GUID+2, 106, 0, 'Ghostrider of Karabor (21784) - Counterclockwise Group'), +(@GUID+3, 106, 0, 'Ghostrider of Karabor (21784) - Counterclockwise Group'); From df6dcd8888cd8cb90216b4f3d1212e1e0cc24726 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:28:08 -0300 Subject: [PATCH 13/32] =?UTF-8?q?fix(Scripts/GruulsLair):=20Kiggler=20the?= =?UTF-8?q?=20Crazed=20should=20cast=20lightning=20bol=E2=80=A6=20(#15061)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GruulsLair/boss_high_king_maulgar.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 336955441..4217a520a 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -249,8 +249,7 @@ struct boss_olm_the_summoner : public ScriptedAI events.ScheduleEvent(EVENT_ADD_ABILITY2, 30s); break; case EVENT_ADD_ABILITY3: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) - me->CastSpell(target, SPELL_DEATH_COIL, false); + DoCastRandomTarget(SPELL_DEATH_COIL); events.ScheduleEvent(EVENT_ADD_ABILITY3, 20s); break; } @@ -308,16 +307,15 @@ struct boss_kiggler_the_crazed : public ScriptedAI events.ScheduleEvent(EVENT_ADD_ABILITY1, 20s); break; case EVENT_ADD_ABILITY2: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) - me->CastSpell(target, SPELL_LIGHTNING_BOLT, false); + DoCastVictim(SPELL_LIGHTNING_BOLT); events.ScheduleEvent(EVENT_ADD_ABILITY2, 1500ms); break; case EVENT_ADD_ABILITY3: - me->CastSpell(me->GetVictim(), SPELL_ARCANE_SHOCK, false); + DoCastVictim(SPELL_ARCANE_SHOCK); events.ScheduleEvent(EVENT_ADD_ABILITY3, 20s); break; case EVENT_ADD_ABILITY4: - me->CastSpell(me, SPELL_ARCANE_EXPLOSION, false); + DoCastAOE(SPELL_ARCANE_EXPLOSION); events.ScheduleEvent(EVENT_ADD_ABILITY4, 30s); break; } @@ -369,12 +367,14 @@ struct boss_blindeye_the_seer : public ScriptedAI switch (events.ExecuteEvent()) { case EVENT_ADD_ABILITY1: - me->CastSpell(me, SPELL_GREATER_PW_SHIELD, false); + DoCastSelf(SPELL_GREATER_PW_SHIELD); events.ScheduleEvent(EVENT_ADD_ABILITY1, 30s); break; case EVENT_ADD_ABILITY2: if (Unit* target = DoSelectLowestHpFriendly(60.0f, 50000)) - me->CastSpell(target, SPELL_HEAL, false); + { + DoCast(target, SPELL_HEAL); + } events.ScheduleEvent(EVENT_ADD_ABILITY2, 25s); break; case EVENT_ADD_ABILITY3: @@ -439,15 +439,15 @@ struct boss_krosh_firehand : public ScriptedAI switch (events.ExecuteEvent()) { case EVENT_ADD_ABILITY1: - me->CastSpell(me->GetVictim(), SPELL_GREATER_FIREBALL, false); + DoCastVictim(SPELL_GREATER_FIREBALL); events.ScheduleEvent(EVENT_ADD_ABILITY1, 3500ms); break; case EVENT_ADD_ABILITY2: - me->CastSpell(me, SPELL_SPELLSHIELD, false); + DoCastSelf(SPELL_SPELLSHIELD); events.ScheduleEvent(EVENT_ADD_ABILITY2, 40s); break; case EVENT_ADD_ABILITY3: - me->CastSpell(me, SPELL_BLAST_WAVE, false); + DoCastAOE(SPELL_BLAST_WAVE); events.ScheduleEvent(EVENT_ADD_ABILITY3, 20s); break; } From 1967c8d4f668ab340a8f274e81b57d63e56babbd Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 16 Feb 2023 01:30:29 +0000 Subject: [PATCH 14/32] chore(DB): import pending files Referenced commit(s): df6dcd8888cd8cb90216b4f3d1212e1e0cc24726 --- .../rev_1676509327366634300.sql => db_world/2023_02_16_04.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1676509327366634300.sql => db_world/2023_02_16_04.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1676509327366634300.sql b/data/sql/updates/db_world/2023_02_16_04.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676509327366634300.sql rename to data/sql/updates/db_world/2023_02_16_04.sql index 956012141..c30a6aee2 100644 --- a/data/sql/updates/pending_db_world/rev_1676509327366634300.sql +++ b/data/sql/updates/db_world/2023_02_16_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_16_03 -> 2023_02_16_04 -- Ghostriders of Karabor (Counter-Clockwise Group) SET @GUID := 77821; From f84848a95bfb7099e984ec22e0ef145ee9c695d4 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 16 Feb 2023 01:32:49 -0300 Subject: [PATCH 15/32] fix(DB): Fix 2023_02_16_03.sql (#15063) --- data/sql/updates/db_world/2023_02_16_03.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/updates/db_world/2023_02_16_03.sql b/data/sql/updates/db_world/2023_02_16_03.sql index aaff3b73f..8aa82bfe5 100644 --- a/data/sql/updates/db_world/2023_02_16_03.sql +++ b/data/sql/updates/db_world/2023_02_16_03.sql @@ -46,7 +46,7 @@ INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `equipment_id`, `positio DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21815) AND (`source_type` = 0); -- Stationary GUIDs do random emotes (these don't have any other SAI) -DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21815); +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-(@GUID+4 ),-(@GUID+6 ),-(@GUID+7 ),-(@GUID+8 ),-(@GUID+11),-(@GUID+13),-(@GUID+15),-(@GUID+17),-(@GUID+18),-(@GUID+19),-(@GUID+20),-(@GUID+21),-(@GUID+22),-(@GUID+23),-(@GUID+24),-(@GUID+27),-(@GUID+28))); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES (-(@GUID+4 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), (-(@GUID+6 ), 0, 0, 0, 1, 0, 100, 0, 3000, 7000, 3000, 7000, 0, 10, 18, 20, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Cleric of Karabor - Out of Combat - Play Random Emote (18, 20)'), From d7e701a1cb1d1cc5c45f09ccaa3c1ae23939d491 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:11:11 +0100 Subject: [PATCH 16/32] feat(Core/PacketIO): Implement STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT (#15059) Co-authored-by: Vladimir Merzliakov <29081+VladimirMangos@users.noreply.github.com> Co-authored-by: megamage <35114+megamage@users.noreply.github.com> Co-authored-by: Shauren Co-authored-by: Giacomo Pozzoni --- src/server/game/Handlers/MiscHandler.cpp | 4 ++ src/server/game/Handlers/TradeHandler.cpp | 6 +- src/server/game/Server/Protocol/Opcodes.cpp | 4 +- src/server/game/Server/Protocol/Opcodes.h | 3 +- src/server/game/Server/WorldSession.cpp | 65 +++++++++++++++------ src/server/game/Server/WorldSession.h | 4 +- 6 files changed, 62 insertions(+), 24 deletions(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index d78818a47..4d14585a2 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -481,6 +481,10 @@ void WorldSession::HandlePlayerLogoutOpcode(WorldPackets::Character::PlayerLogou void WorldSession::HandleLogoutCancelOpcode(WorldPackets::Character::LogoutCancel& /*logoutCancel*/) { + // Player have already logged out serverside, too late to cancel + if (!GetPlayer()) + return; + SetLogoutStartTime(0); SendPacket(WorldPackets::Character::LogoutCancelAck().Write()); diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index b212e97ad..a4e64b9e7 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -527,7 +527,7 @@ void WorldSession::HandleBeginTradeOpcode(WorldPacket& /*recvPacket*/) void WorldSession::SendCancelTrade() { - if (PlayerLogout()) + if (PlayerRecentlyLoggedOut() || PlayerLogout()) return; SendTradeStatus(TRADE_STATUS_TRADE_CANCELED); @@ -535,7 +535,9 @@ void WorldSession::SendCancelTrade() void WorldSession::HandleCancelTradeOpcode(WorldPacket& /*recvPacket*/) { - _player->TradeCancel(true); + // sended also after LOGOUT COMPLETE + if (_player) // needed because STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT + _player->TradeCancel(true); } void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 77052de11..85bcb4186 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -206,7 +206,7 @@ void OpcodeTable::Initialize() /*0x04B*/ DEFINE_HANDLER(CMSG_LOGOUT_REQUEST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutRequestOpcode ); /*0x04C*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_RESPONSE, STATUS_NEVER); /*0x04D*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_COMPLETE, STATUS_NEVER); - /*0x04E*/ DEFINE_HANDLER(CMSG_LOGOUT_CANCEL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutCancelOpcode ); + /*0x04E*/ DEFINE_HANDLER(CMSG_LOGOUT_CANCEL, STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutCancelOpcode); /*0x04F*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_CANCEL_ACK, STATUS_NEVER); /*0x050*/ DEFINE_HANDLER(CMSG_NAME_QUERY, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleNameQueryOpcode ); /*0x051*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_NAME_QUERY_RESPONSE, STATUS_NEVER); @@ -412,7 +412,7 @@ void OpcodeTable::Initialize() /*0x119*/ DEFINE_HANDLER(CMSG_IGNORE_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleIgnoreTradeOpcode ); /*0x11A*/ DEFINE_HANDLER(CMSG_ACCEPT_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptTradeOpcode ); /*0x11B*/ DEFINE_HANDLER(CMSG_UNACCEPT_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleUnacceptTradeOpcode ); - /*0x11C*/ DEFINE_HANDLER(CMSG_CANCEL_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTradeOpcode ); + /*0x11C*/ DEFINE_HANDLER(CMSG_CANCEL_TRADE, STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTradeOpcode); /*0x11D*/ DEFINE_HANDLER(CMSG_SET_TRADE_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetTradeItemOpcode ); /*0x11E*/ DEFINE_HANDLER(CMSG_CLEAR_TRADE_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleClearTradeItemOpcode ); /*0x11F*/ DEFINE_HANDLER(CMSG_SET_TRADE_GOLD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetTradeGoldOpcode ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 037949916..3eb61151e 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1353,9 +1353,10 @@ typedef Opcodes OpcodeServer; /// Player state enum SessionStatus { - STATUS_AUTHED = 0, // Player authenticated (_player == nullptr, m_GUID has garbage) + STATUS_AUTHED = 0, // Player authenticated (_player == nullptr, m_playerRecentlyLogout = false or will be reset before handler call, m_GUID have garbage) STATUS_LOGGEDIN, // Player in game (_player != nullptr, m_GUID == _player->GetGUID(), inWorld()) STATUS_TRANSFER, // Player transferring to another map (_player != nullptr, m_GUID == _player->GetGUID(), !inWorld()) + STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, // _player != nullptr or _player == nullptr && m_playerRecentlyLogout && m_playerLogout, m_GUID store last _player guid) STATUS_NEVER, // Opcode not accepted from client (deprecated or server side only) STATUS_UNHANDLED, // Opcode not handled yet }; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 90efea5ff..4381e2e03 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -121,6 +121,7 @@ WorldSession::WorldSession(uint32 id, std::string&& name, std::shared_ptrGetDefaultDbcLocale()), m_sessionDbLocaleIndex(locale), @@ -326,28 +327,48 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater) case STATUS_LOGGEDIN: if (!_player) { - // pussywizard: such packets were sent to do something for a character that has already logged out, skip them - } - else if (!_player->IsInWorld()) - { - // pussywizard: such packets may do something important and the player is just being teleported, move to the end of the queue - // pussywizard: previously such were skipped, so leave it as it is xD proper code below if we wish to change that - - // pussywizard: requeue only important packets not related to maps (PROCESS_THREADUNSAFE) - /*if (opHandle.packetProcessing == PROCESS_THREADUNSAFE) + // skip STATUS_LOGGEDIN opcode unexpected errors if player logout sometime ago - this can be network lag delayed packets + //! If player didn't log out a while ago, it means packets are being sent while the server does not recognize + //! the client to be in world yet. We will re-add the packets to the bottom of the queue and process them later. + if (!m_playerRecentlyLogout) { - if (!firstDelayedPacket) - firstDelayedPacket = packet; + requeuePackets.push_back(packet); deletePacket = false; QueuePacket(packet); - }*/ - } - else if (_player->IsInWorld() && AntiDOS.EvaluateOpcode(*packet, currentTime)) - { - if (!sScriptMgr->CanPacketReceive(this, *packet)) - { - break; + + LOG_DEBUG("network", "Re-enqueueing packet with opcode %s with with status STATUS_LOGGEDIN. " + "Player {} is currently not in world yet.", GetOpcodeNameForLogging(static_cast(packet->GetOpcode())), GetPlayerInfo()); } + } + else if (_player->IsInWorld()) + { + if (AntiDOS.EvaluateOpcode(*packet, currentTime)) + { + if (!sScriptMgr->CanPacketReceive(this, *packet)) + { + break; + } + + opHandle->Call(this, *packet); + LogUnprocessedTail(packet); + } + else + processedPackets = MAX_PROCESSED_PACKETS_IN_SAME_WORLDSESSION_UPDATE; // break out of packet processing loop + } + + // lag can cause STATUS_LOGGEDIN opcodes to arrive after the player started a transfer + break; + case STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT: + if (!_player && !m_playerRecentlyLogout) // There's a short delay between _player = null and m_playerRecentlyLogout = true during logout + { + LogUnexpectedOpcode(packet, "STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT", + "the player has not logged in yet and not recently logout"); + } + else if (AntiDOS.EvaluateOpcode(*packet, currentTime)) + { + // not expected _player or must checked in packet hanlder + if (!sScriptMgr->CanPacketReceive(this, *packet)) + break; opHandle->Call(this, *packet); LogUnprocessedTail(packet); @@ -373,6 +394,11 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater) if (m_inQueue) // prevent cheating break; + // some auth opcodes can be recieved before STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT opcodes + // however when we recieve CMSG_CHAR_ENUM we are surely no longer during the logout process. + if (packet->GetOpcode() == CMSG_CHAR_ENUM) + m_playerRecentlyLogout = false; + if (AntiDOS.EvaluateOpcode(*packet, currentTime)) { if (!sScriptMgr->CanPacketReceive(this, *packet)) @@ -714,6 +740,7 @@ void WorldSession::LogoutPlayer(bool save) m_playerLogout = false; m_playerSave = false; + m_playerRecentlyLogout = true; SetLogoutStartTime(0); } @@ -1261,6 +1288,8 @@ void WorldSession::SendAddonsInfo() void WorldSession::SetPlayer(Player* player) { _player = player; + + // set m_GUID that can be used while player loggined and later until m_playerRecentlyLogout not reset if (_player) m_GUIDLow = _player->GetGUID().GetCounter(); } diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 64ce0703f..e6b5de118 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -334,6 +334,7 @@ public: bool PlayerLoading() const { return m_playerLoading; } bool PlayerLogout() const { return m_playerLogout; } + bool PlayerRecentlyLoggedOut() const { return m_playerRecentlyLogout; } bool PlayerLogoutWithSave() const { return m_playerLogout && m_playerSave; } void ReadAddonsInfo(ByteBuffer& data); @@ -1139,7 +1140,7 @@ private: // characters who failed on Player::BuildEnumData shouldn't login GuidSet _legitCharacters; - ObjectGuid::LowType m_GUIDLow; + ObjectGuid::LowType m_GUIDLow; // set logined or recently logout player (while m_playerRecentlyLogout set) Player* _player; std::shared_ptr m_Socket; std::string m_Address; @@ -1160,6 +1161,7 @@ private: bool m_inQueue; // session wait in auth.queue bool m_playerLoading; // code processed in LoginPlayer bool m_playerLogout; // code processed in LogoutPlayer + bool m_playerRecentlyLogout; bool m_playerSave; LocaleConstant m_sessionDbcLocale; LocaleConstant m_sessionDbLocaleIndex; From cb18f73ce7f144c47a37dc43ffee2aa78ac8dc53 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:14:56 -0300 Subject: [PATCH 17/32] fix(DB/Creature): Port Voidhunter Yar from Mangos (#15076) --- .../rev_1676600155710875500.sql | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676600155710875500.sql diff --git a/data/sql/updates/pending_db_world/rev_1676600155710875500.sql b/data/sql/updates/pending_db_world/rev_1676600155710875500.sql new file mode 100644 index 000000000..e5396bd3c --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676600155710875500.sql @@ -0,0 +1,85 @@ +-- +DELETE FROM `creature` WHERE `guid`=151928 AND `id1`=18683; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES (151928, 18683, 530, -2797.86, 8371.15, -39.4439, 0.959005, 43200, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (151928)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(151928, 1519280, 0, 0, 0, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN (1519280); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(1519280, 1, -2797.86, 8371.15, -39.4439), +(1519280, 2, -2769.38, 8427.4, -41.0358), +(1519280, 3, -2745.51, 8451.7, -40.1339), +(1519280, 4, -2719.87, 8475.16, -42.5082), +(1519280, 5, -2646.94, 8516.83, -39.1658), +(1519280, 6, -2569.01, 8520.52, -37.3603), +(1519280, 7, -2537.85, 8512.96, -36.0247), +(1519280, 8, -2521.09, 8506.78, -37.2972), +(1519280, 9, -2433.52, 8462.14, -37.8204), +(1519280, 10, -2395.54, 8415.53, -39.621), +(1519280, 11, -2370.48, 8347.7, -40.1679), +(1519280, 12, -2365.48, 8273.46, -40.3955), +(1519280, 13, -2385.62, 8211.39, -41.404), +(1519280, 14, -2418.92, 8163, -42.0625), +(1519280, 15, -2427.3, 8154, -40.4315), +(1519280, 16, -2436.93, 8143.79, -42.2831), +(1519280, 17, -2533.66, 8092.81, -46.0847), +(1519280, 18, -2620.56, 8092.64, -48.379), +(1519280, 19, -2635.2, 8097.11, -45.711), +(1519280, 20, -2652.55, 8102.41, -47.9662), +(1519280, 21, -2730.78, 8141.86, -48.1224), +(1519280, 22, -2782.87, 8205.79, -47.5376), +(1519280, 23, -2791.14, 8241.92, -45.1802), +(1519280, 24, -2794.04, 8254.55, -46.6515), +(1519280, 25, -2804.39, 8345.89, -40.7947), +(1519280, 26, -2798.9, 8367.5, -39.5606); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18683); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(18683, 0, 0 , 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Reset - Set Event Phase 0'), +(18683, 0, 1 , 2, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Aggro - Say Line 0'), +(18683, 0, 2 , 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Aggro - Set Event Phase 1'), +(18683, 0, 3 , 4, 8, 1, 100, 0, 0, 2, 0, 0, 0, 11, 34336, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Holy\' - Cast \'Damage Reduction: Holy\' (Phase 1)'), +(18683, 0, 4 , 5, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Holy\' - Say Line 1 (Phase 1)'), +(18683, 0, 5 , 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Holy\' - Set Event Phase 2 (Phase 1)'), + +(18683, 0, 6 , 7, 8, 1, 100, 0, 0, 4, 0, 0, 0, 11, 34333, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Fire\' - Cast \'Damage Reduction: Fire\' (Phase 1)'), +(18683, 0, 7 , 8, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Fire\' - Say Line 2 (Phase 1)'), +(18683, 0, 8 , 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Fire\' - Set Event Phase 3 (Phase 1)'), + +(18683, 0, 9 , 10, 8, 1, 100, 0, 0, 8, 0, 0, 0, 11, 34335, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Nature\' - Cast \'Damage Reduction: Nature\' (Phase 1)'), +(18683, 0, 10, 11, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Nature\' - Say Line 3 (Phase 1)'), +(18683, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Nature\' - Set Event Phase 4 (Phase 1)'), + +(18683, 0, 12, 13, 8, 1, 100, 0, 0, 16, 0, 0, 0, 11, 34334, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Frost\' - Cast \'Damage Reduction: Frost\' (Phase 1)'), +(18683, 0, 13, 14, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Frost\' - Say Line 4 (Phase 1)'), +(18683, 0, 14, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Frost\' - Set Event Phase 5 (Phase 1)'), + +(18683, 0, 15, 16, 8, 1, 100, 0, 0, 32, 0, 0, 0, 11, 34338, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Shadow\' - Cast \'Damage Reduction: Shadow\' (Phase 1)'), +(18683, 0, 16, 17, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Shadow\' - Say Line 5 (Phase 1)'), +(18683, 0, 17, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Shadow\' - Set Event Phase 6 (Phase 1)'), + +(18683, 0, 18, 19, 8, 1, 100, 0, 0, 64, 0, 0, 0, 11, 34331, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Arcane\' - Cast \'Damage Reduction: Arcane\' (Phase 1)'), +(18683, 0, 19, 20, 61, 1, 100, 0, 0, 0, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Arcane\' - Say Line 6 (Phase 1)'), +(18683, 0, 20, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - On Spellhit \'Arcane\' - Set Event Phase 7 (Phase 1)'), + +(18683, 0, 21, 0, 9, 0, 100, 0, 0, 30, 14300, 28200, 0, 11, 38051, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - Within 0-30 Range - Cast \'Fel Shackles\''), +(18683, 0, 22, 0, 0, 33, 100, 0, 0, 1000, 3000, 3500, 0, 11, 12471, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Shadow Bolt\' (Phases 1 & 6)'), +(18683, 0, 23, 0, 0, 2, 100, 0, 0, 1000, 2500, 3000, 0, 11, 15498, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Holy Smite\' (Phase 2)'), +(18683, 0, 24, 0, 0, 4, 100, 0, 0, 1000, 3000, 3500, 0, 11, 14034, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Fireball\' (Phase 3)'), +(18683, 0, 25, 0, 0, 8, 100, 0, 0, 1000, 3000, 3500, 0, 11, 12167, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Lightning Bolt\' (Phase 4)'), +(18683, 0, 26, 0, 0, 16, 100, 0, 0, 1000, 3000, 3500, 0, 11, 15497, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Frostbolt\' (Phase 5)'), +(18683, 0, 27, 0, 0, 64, 100, 0, 0, 1000, 1000, 1500, 0, 11, 38204, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Voidhunter Yar - In Combat - Cast \'Arcane Bolt\' (Phase 7)'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` BETWEEN 1868300 AND 1868302); + +DELETE FROM `creature_text` WHERE `CreatureID`=18683; +INSERT INTO `creature_text` (`CreatureID`, `BroadcastTextId`, `GroupID`, `ID`, `Text`, `Type`, `comment`) VALUES +(18683, 19908, 0, 0, 'In the void, no one can hear you scream!', 12, 'Voidhunter Yar'), +(18683, 17110, 1, 0, '%s absorbs the holy energy of the attack.', 16, 'Voidhunter Yar'), +(18683, 17105, 2, 0, '%s absorbs the fire energy of the attack.', 16, 'Voidhunter Yar'), +(18683, 17107, 3, 0, '%s absorbs the nature energy of the attack.', 16, 'Voidhunter Yar'), +(18683, 17106, 4, 0, '%s absorbs the frost energy of the attack.', 16, 'Voidhunter Yar'), +(18683, 17108, 5, 0, '%s absorbs the shadow energy of the attack.', 16, 'Voidhunter Yar'), +(18683, 17109, 6, 0, '%s absorbs the arcane energy of the attack.', 16, 'Voidhunter Yar'); From 7a1e3fb4e4354d92fa80950106f5bdf50e7989a9 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:15:29 -0300 Subject: [PATCH 18/32] fix(DB/Quest): Kill'em With Sleep Deprivation/Look At the Size of It (#15074) Co-authored-by: Dr-J <1444120+dr-j@users.noreply.github.com> --- .../rev_1676596950750457600.sql | 227 ++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676596950750457600.sql diff --git a/data/sql/updates/pending_db_world/rev_1676596950750457600.sql b/data/sql/updates/pending_db_world/rev_1676596950750457600.sql new file mode 100644 index 000000000..b5930f379 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676596950750457600.sql @@ -0,0 +1,227 @@ +-- +-- Searing Gorge Dark Iron Pillow spawns for quest http://www.wowhead.com/quest=7702 retail:28057 +SET @OGUID := 24970; +SET @MOTHER := 8306; +SET @ACTIVE := 8; -- Max number of active spawns +SET @TIMER := 30; -- Respawn timer in seconds + +-- Dark Iron Pillow spawns for Searing Gorge +DELETE FROM `gameobject` WHERE `id`=179828; +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+23; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0, 179828, 0, 1, 1, -6569.39, -1335.83, 210.199, 2.33874, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+1, 179828, 0, 1, 1, -6527.64, -1340.23, 212.095, 1.832595, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+2, 179828, 0, 1, 1, -6518.91, -1364.86, 210.541, 5.654869, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+3, 179828, 0, 1, 1, -6572.96, -1327.58, 212.095, 3.560473, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+4, 179828, 0, 1, 1, -6570.39, -1332.69, 212.095, 5.375615, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+5, 179828, 0, 1, 1, -6547.68, -1325.57, 212.376, 2.757613, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+6, 179828, 0, 1, 1, -6575.96, -1323.57, 210.144, 4.293513, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+7, 179828, 0, 1, 1, -6552.55, -1317.99, 212.64, 4.939284, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+8, 179828, 0, 1, 1, -6576.94, -1319.12, 210.249, 6.03884, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+9, 179828, 0, 1, 1, -6551.49, -1318.46, 210.419, 0.6981314, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+10, 179828, 0, 1, 1, -6528.67, -1339.02, 210.124, 2.670348, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+11, 179828, 0, 1, 1, -6543.81, -1358.71, 210.544, 3.752462, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+12, 179828, 0, 1, 1, -6554.68, -1351.74, 212.682, 2.146753, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+13, 179828, 0, 1, 1, -6562.07, -1344.44, 212.619, 1.256636, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+14, 179828, 0, 1, 1, -6554.33, -1313.8, 210.26, 5.288348, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+15, 179828, 0, 1, 1, -6543.61, -1329.85, 212.564, 5.393069, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+16, 179828, 0, 1, 1, -6544.77, -1329.61, 210.26, 5.305802, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+17, 179828, 0, 1, 1, -6551.14, -1354.85, 210.421, 4.363324, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+18, 179828, 0, 1, 1, -6550.27, -1321.75, 210.433, 5.445428, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+19, 179828, 0, 1, 1, -6518.33, -1342.21, 212.095, 4.991644, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+20, 179828, 0, 1, 1, -6558.36, -1347.93, 210.26, 3.351047, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+21, 179828, 0, 1, 1, -6531.65, -1337.63, 210.18, 4.398232, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+22, 179828, 0, 1, 1, -6508.78, -1365.26, 212.859, 0.6457717, 0, 0, 0, 1, @TIMER, 255, 1), -- Dark Iron Pillow +(@OGUID+23, 179828, 0, 1, 1, -6528.76, -1363.6, 212.657, 2.617989, 0, 0, 0, 1, @TIMER, 255, 1); -- Dark Iron Pillow + +-- Add mother pool to pool template +DELETE FROM `pool_template` WHERE `entry`=@MOTHER; +INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES +(@MOTHER,@ACTIVE, 'Searing Gorge Dark Iron Pillow Mother pool'); + +-- Pool Dark Iron Pillow Spawnpoints +DELETE FROM `pool_gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+23; +INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@OGUID+0,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+1,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+2,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+3,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+4,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+5,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+6,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+7,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+8,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+9,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+10,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+11,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+12,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+13,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+14,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+15,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+16,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+17,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+18,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+19,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+20,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+21,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+22,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'), +(@OGUID+23,@MOTHER,0, 'Searing Gorge Dark Iron Pillow Spawn'); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (14635,14636); +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (179828,179829); +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (179828) AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (17982800,17982801) AND `source_type`=9; +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (14635,14636) AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 1463500 AND 1463519 AND `source_type`=9; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(14635, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 88, 1463500, 1463509, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron - On Just Spawned - Run Random Script'), +(14635, 0, 1, 0, 38, 0, 100, 1, 1, 1, 0, 0, 1, 0, 5000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron - On Data set - Say'), +(14635, 0, 2, 0, 52, 0, 100, 0, 0, 14635, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron - On text over - Say'), +(14636, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Chambermaid Pillaclencher - On Just Spawned - Say'), +(14636, 0, 1, 0, 6, 0, 100, 0, 0, 0, 0, 0, 11, 23408, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Chambermaid Pillaclencher - On Death - Cast Drop Pillow DND'), +(14636, 0, 2, 0, 9, 0, 100, 0, 0, 40, 3000, 15000, 11, 23416, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Chambermaid Pillaclencher - On Range - Cast Pillow Fight'), +(14636, 0, 3, 0, 0, 0, 100, 0, 5000, 9000, 15000, 18000, 11, 23417, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Chambermaid Pillaclencher - IC - Cast Smother'), +(179828, 1, 0, 0, 70, 1, 100, 0, 3, 0, 0, 0, 12, 14636, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6539.3, -1347.27, 208.986, 2.60054, 'Dark Iron Pillow - On State Changed - Summon Chambermaid Pillaclencher'), +(179828, 1, 1, 2, 70, 2, 100, 0, 3, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6577.97, -1289.04, 208.826, 2.60054, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6580.84, -1290.89, 208.826, 2.44346, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6575.2, -1287.64, 208.826, 4.53786, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6573.95, -1291.89, 208.826, 0.0349066, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6576.88, -1295.08, 208.826, 5.46288, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6582.04, -1287.82, 208.826, 4.4855, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6577.63, -1285.87, 208.826, 4.57276, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 8, 9, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6582.85, -1293.73, 208.826, 1.67552, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6571.29, -1286.36, 208.826, 4.11898, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14635, 8, 0, 0, 0, 0, 8, 0, 0, 0, -6580.44, -1285.85, 208.826, 4.45059, 'Dark Iron Pillow - On State Changed - Summon Sleepy Dark Iron Worker'), +(179828, 1, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 14635, 0, 0, 0, 0, 0, 0, 'Dark Iron Pillow - On State Changed - Set data to Sleepy Dark Iron Worker'), +(179828, 1, 12, 0, 64, 0, 100, 0, 2, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dark Iron Pillow - On Gossip Hello - Set Phase 1'), +(179828, 1, 13, 0, 64, 0, 100, 0, 2, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Dark Iron Pillow - On Gossip Hello - Set Phase 2'), +(1463500, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463500, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463501, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463501, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463502, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463502, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463503, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463503, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463504, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463504, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463505, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463505, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463506, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463506, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463507, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463507, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463508, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463508, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'), +(1463509, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 53, 0, 1463509, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Sleepy Dark Iron Worker - Script - Start WP'); + +DELETE FROM `creature_text` WHERE `CreatureID`IN(14636,14635); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES +(14636, 0, 0, 'Thieves! Scallywags! Rapscallions! Come face me gigantic pillas!', 14, 0, 100, 0, 0, 0, 9810, 'Chambermaid Pillaclencher to Player'), +(14635, 0, 0, 'Our pillas! Someone has stolen our pillas!', 14, 0, 100, 0, 0, 0, 9799, 'Sleepy Dark Iron Worker to Player to Player'), +(14635, 1, 0, "We'll not let this act of madness go unpunished!", 14, 0, 100, 0, 0, 0, 9800, 'Sleepy Dark Iron Worker to Player to Player'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=179828 AND `SourceId`=1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 13, 179828, 1, 0, 2, 0, 18943, 19, 0, 0, 0, 0, '', 'Run SAI only if objective count of Kill em with sleep deprivation is 20 Pillows'), +(22, 13, 179828, 1, 0, 2, 0, 18943, 20, 0, 1, 0, 0, '', 'Run SAI only if objective count of Kill em with sleep deprivation is 20 Pillows'), +(22, 13, 179828, 1, 0, 29, 1, 14636, 100, 0, 1, 0, 0, '', 'Run SAI only if there is no Chambermaid Pillaclencher nearby'), +(22, 14, 179828, 1, 0, 2, 0, 18943, 11, 0, 0, 0, 0, '', 'Run SAI only if objective count of Kill em with sleep deprivation is 12 Pillows'), +(22, 14, 179828, 1, 0, 2, 0, 18943, 12, 0, 1, 0, 0, '', 'Run SAI only if objective count of Kill em with sleep deprivation is 12 Pillows'), +(22, 14, 179828, 1, 0, 29, 1, 14635, 100, 0, 1, 0, 0, '', 'Run SAI only if there is no Sleepy Dark Iron Worker nearby'); + +DELETE FROM `waypoints` WHERE `entry` BETWEEN 1463500 AND 1463509; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(1463500,1, -6571.01,-1310.01,208.70,'Dark Iron Worker'), +(1463500,2, -6565.90,-1330.04,208.83,'Dark Iron Worker'), +(1463500,3, -6554.73,-1341.21,208.93,'Dark Iron Worker'), +(1463500,4, -6527.23,-1350.97,209.94,'Dark Iron Worker'), +(1463500,5, -6499.62,-1352.41,210.86,'Dark Iron Worker'), +(1463500,6, -6477.65,-1353.51,212.10,'Dark Iron Worker'), +(1463500,7, -6497.14,-1352.41,210.86,'Dark Iron Worker'), +(1463500,8, -6521.47,-1347.69,209.94,'Dark Iron Worker'), +(1463500,9, -6551.05,-1343.47,208.93,'Dark Iron Worker'), +(1463500,10, -6565.92,-1328.37,208.83,'Dark Iron Worker'), +(1463501,1, -6568.69,-1306.02,208.70,'Dark Iron Worker'), +(1463501,2, -6560.79,-1322.42,208.83,'Dark Iron Worker'), +(1463501,3, -6553.94,-1341.82,208.93,'Dark Iron Worker'), +(1463501,4, -6526.74,-1351.10,209.94,'Dark Iron Worker'), +(1463501,5, -6498.66,-1347.99,210.86,'Dark Iron Worker'), +(1463501,6, -6480.37,-1352.99,212.10,'Dark Iron Worker'), +(1463501,7, -6497.48,-1350.84,210.86,'Dark Iron Worker'), +(1463501,8, -6523.57,-1350.01,209.94,'Dark Iron Worker'), +(1463501,9, -6551.08,-1340.64,208.93,'Dark Iron Worker'), +(1463501,10, -6564.98,-1329.96,208.83,'Dark Iron Worker'), +(1463502,1, -6566.57,-1311.09,208.70,'Dark Iron Worker'), +(1463502,2, -6565.01,-1323.49,208.83,'Dark Iron Worker'), +(1463502,3, -6554.39,-1334.81,208.93,'Dark Iron Worker'), +(1463502,4, -6519.73,-1349.07,209.94,'Dark Iron Worker'), +(1463502,5, -6495.62,-1346.78,210.86,'Dark Iron Worker'), +(1463502,6, -6476.91,-1346.77,212.10,'Dark Iron Worker'), +(1463502,7, -6494.62,-1352.22,210.86,'Dark Iron Worker'), +(1463502,8, -6525.72,-1355.94,209.94,'Dark Iron Worker'), +(1463502,9, -6555.21,-1343.24,208.93,'Dark Iron Worker'), +(1463502,10, -6556.97,-1326.98,208.83,'Dark Iron Worker'), +(1463503,1, -6570.05,-1306.44,208.70,'Dark Iron Worker'), +(1463503,2, -6565.88,-1325.34,208.83,'Dark Iron Worker'), +(1463503,3, -6546.48,-1337.35,208.93,'Dark Iron Worker'), +(1463503,4, -6523.84,-1349.33,209.94,'Dark Iron Worker'), +(1463503,5, -6490.75,-1351.55,210.86,'Dark Iron Worker'), +(1463503,6, -6479.97,-1353.76,212.10,'Dark Iron Worker'), +(1463503,7, -6491.59,-1354.88,210.86,'Dark Iron Worker'), +(1463503,8, -6519.30,-1352.83,209.94,'Dark Iron Worker'), +(1463503,9, -6545.53,-1339.51,208.93,'Dark Iron Worker'), +(1463503,10, -6563.64,-1327.15,208.83,'Dark Iron Worker'), +(1463504,1, -6569.32,-1303.39,208.70,'Dark Iron Worker'), +(1463504,2, -6559.30,-1327.23,208.83,'Dark Iron Worker'), +(1463504,3, -6550.54,-1343.35,208.93,'Dark Iron Worker'), +(1463504,4, -6526.89,-1355.23,209.94,'Dark Iron Worker'), +(1463504,5, -6497.63,-1351.14,210.86,'Dark Iron Worker'), +(1463504,6, -6477.18,-1348.72,212.10,'Dark Iron Worker'), +(1463504,7, -6492.91,-1348.36,210.86,'Dark Iron Worker'), +(1463504,8, -6523.31,-1354.16,209.94,'Dark Iron Worker'), +(1463504,9, -6553.10,-1339.00,208.93,'Dark Iron Worker'), +(1463504,10, -6557.23,-1328.21,208.83,'Dark Iron Worker'), +(1463505,1, -6564.52,-1308.97,208.70,'Dark Iron Worker'), +(1463505,2, -6560.33,-1328.83,208.83,'Dark Iron Worker'), +(1463505,3, -6550.13,-1338.94,208.93,'Dark Iron Worker'), +(1463505,4, -6520.88,-1347.87,209.94,'Dark Iron Worker'), +(1463505,5, -6492.72,-1355.62,210.86,'Dark Iron Worker'), +(1463505,6, -6478.00,-1347.03,212.10,'Dark Iron Worker'), +(1463505,7, -6498.29,-1351.96,210.86,'Dark Iron Worker'), +(1463505,8, -6525.09,-1353.60,209.94,'Dark Iron Worker'), +(1463505,9, -6549.43,-1334.96,208.93,'Dark Iron Worker'), +(1463505,10, -6564.78,-1322.71,208.83,'Dark Iron Worker'), +(1463506,1, -6569.81,-1302.34,208.70,'Dark Iron Worker'), +(1463506,2, -6566.72,-1324.22,208.83,'Dark Iron Worker'), +(1463506,3, -6552.36,-1342.93,208.93,'Dark Iron Worker'), +(1463506,4, -6528.49,-1349.84,209.94,'Dark Iron Worker'), +(1463506,5, -6492.48,-1353.18,210.86,'Dark Iron Worker'), +(1463506,6, -6481.95,-1350.36,212.10,'Dark Iron Worker'), +(1463506,7, -6499.13,-1353.06,210.86,'Dark Iron Worker'), +(1463506,8, -6527.13,-1355.97,209.94,'Dark Iron Worker'), +(1463506,9, -6548.80,-1335.09,208.93,'Dark Iron Worker'), +(1463506,10, -6560.04,-1325.01,208.83,'Dark Iron Worker'), +(1463507,1, -6567.03,-1309.58,208.70,'Dark Iron Worker'), +(1463507,2, -6559.00,-1328.47,208.83,'Dark Iron Worker'), +(1463507,3, -6551.75,-1338.33,208.93,'Dark Iron Worker'), +(1463507,4, -6522.69,-1353.94,209.94,'Dark Iron Worker'), +(1463507,5, -6493.91,-1353.89,210.86,'Dark Iron Worker'), +(1463507,6, -6481.68,-1351.74,212.10,'Dark Iron Worker'), +(1463507,7, -6491.77,-1352.91,210.86,'Dark Iron Worker'), +(1463507,8, -6526.63,-1349.93,209.94,'Dark Iron Worker'), +(1463507,9, -6546.77,-1337.66,208.93,'Dark Iron Worker'), +(1463507,10, -6566.42,-1325.94,208.83,'Dark Iron Worker'), +(1463508,1, -6566.35,-1310.61,208.70,'Dark Iron Worker'), +(1463508,2, -6558.86,-1329.27,208.83,'Dark Iron Worker'), +(1463508,3, -6552.16,-1335.98,208.93,'Dark Iron Worker'), +(1463508,4, -6520.94,-1348.59,209.94,'Dark Iron Worker'), +(1463508,5, -6491.11,-1355.25,210.86,'Dark Iron Worker'), +(1463508,6, -6484.48,-1350.91,212.10,'Dark Iron Worker'), +(1463508,7, -6491.73,-1352.03,210.86,'Dark Iron Worker'), +(1463508,8, -6520.12,-1347.55,209.94,'Dark Iron Worker'), +(1463508,9, -6546.50,-1337.46,208.93,'Dark Iron Worker'), +(1463508,10, -6563.04,-1329.60,208.83,'Dark Iron Worker'), +(1463509,1, -6569.60,-1301.85,208.70,'Dark Iron Worker'), +(1463509,2, -6562.01,-1327.36,208.83,'Dark Iron Worker'), +(1463509,3, -6545.53,-1341.85,208.93,'Dark Iron Worker'), +(1463509,4, -6523.89,-1353.44,209.94,'Dark Iron Worker'), +(1463509,5, -6498.20,-1351.68,210.86,'Dark Iron Worker'), +(1463509,6, -6478.66,-1350.74,212.10,'Dark Iron Worker'), +(1463509,7, -6496.03,-1355.80,210.86,'Dark Iron Worker'), +(1463509,8, -6521.96,-1349.44,209.94,'Dark Iron Worker'), +(1463509,9, -6553.02,-1340.34,208.93,'Dark Iron Worker'), +(1463509,10, -6559.26,-1325.82,208.83,'Dark Iron Worker'); + +UPDATE `gameobject_loot_template` SET `QuestRequired`=0 WHERE (`Entry` = 16841) AND (`Item` IN (18950)); From 10a806932c2b9d74937a8da0211fb7d6f011552e Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:15:59 -0300 Subject: [PATCH 19/32] fix(DB/Creature): Delete extra Chess Square, OUTSIDE BLACK (DND) found in Nagrand (#15073) --- data/sql/updates/pending_db_world/rev_1676596180388597300.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676596180388597300.sql diff --git a/data/sql/updates/pending_db_world/rev_1676596180388597300.sql b/data/sql/updates/pending_db_world/rev_1676596180388597300.sql new file mode 100644 index 000000000..2bc11f52c --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676596180388597300.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `id1`=17316 AND `map`=530 AND `guid` IN (86488, 86489, 86490); From 7e664b62f49935cfa6b77fac8a2549d9d4015035 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:16:15 -0300 Subject: [PATCH 20/32] fix(DB/Creature): Port Goretooth from Mangos (#15072) --- .../rev_1676595406254556000.sql | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676595406254556000.sql diff --git a/data/sql/updates/pending_db_world/rev_1676595406254556000.sql b/data/sql/updates/pending_db_world/rev_1676595406254556000.sql new file mode 100644 index 000000000..9314b4650 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676595406254556000.sql @@ -0,0 +1,119 @@ +-- +DELETE FROM `creature` WHERE `id1`=17144; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(24926, 17144, 530, -1435.07, 7973.82, -107.038, 4.71321, 14400, 2), +(24927, 17144, 530, -1646.8, 8272.69, -33.6335, 2.31382, 14400, 2), +(24928, 17144, 530, -949.341, 7176.31, -8.30241, 4.18856, 14400, 2), +(24929, 17144, 530, -2745.66, 6147.62, -1.31319, 3.78172, 14400, 2), +(24930, 17144, 530, -1762, 8066, -102.192, 5.5675, 28800, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (24926, 24927, 24928, 24929, 24930)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(24926, 249260, 0, 0, 1, 0, 0, ''), +(24927, 249270, 0, 0, 1, 0, 0, ''), +(24928, 249280, 0, 0, 1, 0, 0, ''), +(24929, 249290, 0, 0, 1, 0, 0, ''), +(24930, 249300, 0, 0, 1, 0, 0, ''); + +-- Update Loot +DELETE FROM `creature_loot_template` WHERE (`Entry` = 17144) AND (`Item` IN (31188, 31189, 31191, 31192)); +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(17144, 31188, 0, 0, 0, 1, 1, 1, 1, 'Goretooth - Crocolisk Scale Vambraces'), +(17144, 31189, 0, 0, 0, 1, 1, 1, 1, 'Goretooth - Crocolisk Scale Wristguards'), +(17144, 31191, 0, 0, 0, 1, 1, 1, 1, 'Goretooth - Crocolisk Hide Bracers'), +(17144, 31192, 0, 0, 0, 1, 1, 1, 1, 'Goretooth - Crocolisk Hide Bindings'); + +DELETE FROM `creature_template_movement` WHERE (`CreatureId` = 17144); +INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES +(17144, 1, 1, 0, 0, 0, 0, 0); + +DELETE FROM `waypoint_data` WHERE `id` IN (249260, 249270, 249280, 249290, 249300); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(249260, 1, -1435.07, 7973.82, -107.038), +(249260, 2, -1438.19, 7996.28, -108.117), +(249260, 3, -1473.17, 8005.62, -105.451), +(249260, 4, -1508.29, 8022.74, -105.67), +(249260, 5, -1568.57, 8054.42, -105.633), +(249260, 6, -1593.82, 8070.73, -109.658), +(249260, 7, -1645.49, 8049.52, -105.427), +(249260, 8, -1675.33, 8036.06, -106.024), +(249260, 9, -1710.75, 7946.45, -105.594), +(249260, 10, -1674.18, 7857.94, -105.342), +(249260, 11, -1616.86, 7819.68, -105.161), +(249260, 12, -1565.64, 7824.63, -105.027), +(249260, 13, -1476.77, 7862.88, -106.547), +(249260, 14, -1440.69, 7912.09, -106.079), +(249260, 15, -1435.07, 7973.82, -107.038), +(249270, 1, -1646.8, 8272.69, -33.6335), +(249270, 2, -1678.17, 8373.36, -39.8411), +(249270, 3, -1728.26, 8416.29, -39.6706), +(249270, 4, -1771.04, 8513.16, -39.3933), +(249270, 5, -1849.84, 8558.14, -44.885), +(249270, 6, -1927.33, 8547.43, -41.3868), +(249270, 7, -1947.93, 8454.47, -35.9765), +(249270, 8, -1886.89, 8380.03, -29.667), +(249270, 9, -1841.32, 8346.9, -39.1494), +(249270, 10, -1767.21, 8338.22, -40.2405), +(249270, 11, -1659.08, 8267.08, -33.8249), +(249270, 12, -1622.06, 8247.15, -27.4339), +(249270, 13, -1646.8, 8272.69, -33.6335), +(249280, 1, -949.341, 7176.31, -8.30242), +(249280, 2, -944.134, 7233.3, 7.25756), +(249280, 3, -979.885, 7270.53, 18.8301), +(249280, 4, -1043.22, 7252.75, 23.3884), +(249280, 5, -1095.55, 7127.87, 25.5364), +(249280, 6, -1125.45, 7058.27, 5.58776), +(249280, 7, -1116.44, 6967.46, -4.94588), +(249280, 8, -1147.87, 6922.12, -0.366703), +(249280, 9, -1144.55, 6894.36, -1.12432), +(249280, 10, -1103.36, 6904.63, -8.47688), +(249280, 11, -1032.43, 7002.11, -0.758486), +(249280, 12, -972.927, 7032.61, 21.8791), +(249280, 13, -953.563, 7064.02, 21.0755), +(249280, 14, -952.247, 7134.55, 9.83648), +(249280, 15, -949.341, 7176.31, -8.30242), +(249290, 1, -2745.66, 6147.62, -1.31319), +(249290, 2, -2800.37, 6107.17, -2.92752), +(249290, 3, -2845.19, 6085.77, -0.61166), +(249290, 4, -2905.7, 6059.67, -0.449957), +(249290, 5, -2939.87, 6052.95, -1.30283), +(249290, 6, -2943.38, 6078.47, -1.94811), +(249290, 7, -2913.41, 6092.29, 1.29442), +(249290, 8, -2871.44, 6093.08, -0.180282), +(249290, 9, -2827.64, 6098.19, -0.410839), +(249290, 10, -2781.07, 6137.15, -0.03986), +(249290, 11, -2745.66, 6147.62, -1.31319), +(249300, 1, -1740.9, 8051.62, -102.937), +(249300, 2, -1708.82, 8040.81, -103.195), +(249300, 3, -1670.81, 8060.73, -103.469), +(249300, 4, -1643, 8075.39, -103.492), +(249300, 5, -1618.32, 8086.83, -103.72), +(249300, 6, -1597.2, 8088.66, -103.57), +(249300, 7, -1573.7, 8084.7, -100.683), +(249300, 8, -1536.13, 8057.37, -102.029), +(249300, 9, -1475.08, 8031.87, -103.181), +(249300, 10, -1456.47, 8003.34, -103.717), +(249300, 11, -1447.06, 7955.74, -106.483), +(249300, 12, -1448.9, 7904.67, -105.786), +(249300, 13, -1472.21, 7862.47, -103.765), +(249300, 14, -1490.39, 7833.5, -101.993), +(249300, 15, -1531.48, 7804.46, -100.86), +(249300, 16, -1592.7, 7802.03, -103.307), +(249300, 17, -1636.22, 7805.68, -103.235), +(249300, 18, -1681, 7825.8, -103.226), +(249300, 19, -1715.54, 7865.81, -103.309), +(249300, 20, -1731.75, 7931.25, -103.324), +(249300, 21, -1717.26, 7986.74, -103.363), +(249300, 22, -1725.05, 8021.35, -103.23), +(249300, 23, -1756.38, 8043.37, -100.979); + +DELETE FROM `pool_template` WHERE `entry`=1080 AND `description` LIKE '%Goretooth%'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1080, 1, 'Goretooth (17144)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1080 AND `description` LIKE '%Goretooth%'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(24926, 1080, 0, 'Goretooth (17144)'), +(24927, 1080, 0, 'Goretooth (17144)'), +(24928, 1080, 0, 'Goretooth (17144)'), +(24929, 1080, 0, 'Goretooth (17144)'), +(24930, 1080, 0, 'Goretooth (17144)'); From 1c27934a4bd3b9a6775f274d024cd4e12486c1fe Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 17 Feb 2023 08:18:55 +0000 Subject: [PATCH 21/32] chore(DB): import pending files Referenced commit(s): 7e664b62f49935cfa6b77fac8a2549d9d4015035 --- .../rev_1676595406254556000.sql => db_world/2023_02_17_00.sql} | 1 + .../rev_1676596180388597300.sql => db_world/2023_02_17_01.sql} | 1 + .../rev_1676596950750457600.sql => db_world/2023_02_17_02.sql} | 1 + .../rev_1676600155710875500.sql => db_world/2023_02_17_03.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1676595406254556000.sql => db_world/2023_02_17_00.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676596180388597300.sql => db_world/2023_02_17_01.sql} (68%) rename data/sql/updates/{pending_db_world/rev_1676596950750457600.sql => db_world/2023_02_17_02.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676600155710875500.sql => db_world/2023_02_17_03.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1676595406254556000.sql b/data/sql/updates/db_world/2023_02_17_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676595406254556000.sql rename to data/sql/updates/db_world/2023_02_17_00.sql index 9314b4650..c0e29d51f 100644 --- a/data/sql/updates/pending_db_world/rev_1676595406254556000.sql +++ b/data/sql/updates/db_world/2023_02_17_00.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_16_04 -> 2023_02_17_00 -- DELETE FROM `creature` WHERE `id1`=17144; INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1676596180388597300.sql b/data/sql/updates/db_world/2023_02_17_01.sql similarity index 68% rename from data/sql/updates/pending_db_world/rev_1676596180388597300.sql rename to data/sql/updates/db_world/2023_02_17_01.sql index 2bc11f52c..76991107e 100644 --- a/data/sql/updates/pending_db_world/rev_1676596180388597300.sql +++ b/data/sql/updates/db_world/2023_02_17_01.sql @@ -1,2 +1,3 @@ +-- DB update 2023_02_17_00 -> 2023_02_17_01 -- DELETE FROM `creature` WHERE `id1`=17316 AND `map`=530 AND `guid` IN (86488, 86489, 86490); diff --git a/data/sql/updates/pending_db_world/rev_1676596950750457600.sql b/data/sql/updates/db_world/2023_02_17_02.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676596950750457600.sql rename to data/sql/updates/db_world/2023_02_17_02.sql index b5930f379..c3d8cfbe1 100644 --- a/data/sql/updates/pending_db_world/rev_1676596950750457600.sql +++ b/data/sql/updates/db_world/2023_02_17_02.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_01 -> 2023_02_17_02 -- -- Searing Gorge Dark Iron Pillow spawns for quest http://www.wowhead.com/quest=7702 retail:28057 SET @OGUID := 24970; diff --git a/data/sql/updates/pending_db_world/rev_1676600155710875500.sql b/data/sql/updates/db_world/2023_02_17_03.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676600155710875500.sql rename to data/sql/updates/db_world/2023_02_17_03.sql index e5396bd3c..fc950c40b 100644 --- a/data/sql/updates/pending_db_world/rev_1676600155710875500.sql +++ b/data/sql/updates/db_world/2023_02_17_03.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_02 -> 2023_02_17_03 -- DELETE FROM `creature` WHERE `guid`=151928 AND `id1`=18683; INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES (151928, 18683, 530, -2797.86, 8371.15, -39.4439, 0.959005, 43200, 2); From b3b760ab42d28cc439aa12843c89dda3f416b33e Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:19:52 -0300 Subject: [PATCH 22/32] fix(DB/Creature): Port Mekthorg the Wild from Mangos (#15070) --- .../rev_1676591600464140500.sql | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676591600464140500.sql diff --git a/data/sql/updates/pending_db_world/rev_1676591600464140500.sql b/data/sql/updates/pending_db_world/rev_1676591600464140500.sql new file mode 100644 index 000000000..abcd3bc9f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676591600464140500.sql @@ -0,0 +1,84 @@ +-- +DELETE FROM `creature` WHERE `id1`=18677; +INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(24918, 18677, 530, 1, -101.271, 3075.18, -1.36056, 3.92147, 21600, 2), +(24919, 18677, 530, 1, -221.482, 3098.84, -60.1361, 4.15876, 21600, 2), +(24920, 18677, 530, 1, -974.96, 3384.15, 85.6275, 6.22306, 21600, 2), +(24921, 18677, 530, 1, -1141.97, 2217.95, 38.9775, 6.13274, 21600, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (24918, 24919, 24920, 24921, 151922)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(24918, 249180, 0, 0, 1, 0, 0, ''), +(24919, 249190, 0, 0, 1, 0, 0, ''), +(24920, 249200, 0, 0, 1, 0, 0, ''), +(24921, 249210, 0, 0, 1, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN (249180, 249190, 249200, 249210, 1519220); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(249180, 1, -101.271, 3075.18, -1.36056), +(249180, 2, -131.354, 3072.52, 1.13944), +(249180, 3, -98.6659, 3100.89, 0.0436902), +(249190, 1, -221.482, 3098.84, -60.1358), +(249190, 2, -242.789, 3052.01, -65.5532), +(249190, 3, -255.483, 2973.82, -66.1634), +(249190, 4, -271.69, 2933.8, -61.2217), +(249190, 5, -258.917, 2804.03, -38.9403), +(249190, 6, -250.113, 2708.84, -21.4125), +(249190, 7, -259.258, 2679.84, -16.955), +(249190, 8, -261.718, 2762.64, -31.8066), +(249190, 9, -281.904, 2917.37, -58.7656), +(249190, 10, -318.014, 2962.57, -65.8476), +(249190, 11, -378.32, 3048.69, -62.8578), +(249190, 12, -328.135, 3006.61, -66.2201), +(249190, 13, -291.092, 3005.17, -66.2201), +(249190, 14, -259.706, 3024.96, -66.146), +(249190, 15, -229.574, 3078.48, -62.3166), +(249200, 1, -974.96, 3384.15, 85.6275), +(249200, 2, -945.458, 3380.19, 82.2227), +(249200, 3, -928.032, 3386.34, 82.8514), +(249200, 4, -843.423, 3386.61, 76.2591), +(249200, 5, -794.345, 3356.64, 59.5092), +(249200, 6, -715.729, 3318.94, 31.7372), +(249200, 7, -670.369, 3284.27, 16.67), +(249200, 8, -630.544, 3267.81, 8.81919), +(249200, 9, -572.965, 3237.67, 5.10526), +(249200, 10, -566.145, 3147.39, 4.97542), +(249200, 11, -553.724, 3141.03, 5.34744), +(249200, 12, -546.554, 3154.08, 18.6763), +(249200, 13, -538.377, 3164.28, 18.4966), +(249200, 14, -546.554, 3154.08, 18.6763), +(249200, 15, -553.724, 3141.03, 5.34744), +(249200, 16, -566.145, 3147.39, 4.97542), +(249200, 17, -572.965, 3237.67, 5.10526), +(249200, 18, -630.544, 3267.81, 8.81919), +(249200, 19, -670.369, 3284.27, 16.67), +(249200, 20, -715.729, 3318.94, 31.7372), +(249200, 21, -794.345, 3356.64, 59.5092), +(249200, 22, -843.423, 3386.61, 76.2591), +(249200, 23, -928.032, 3386.34, 82.8514), +(249200, 24, -945.458, 3380.19, 82.2227), +(249200, 25, -974.96, 3384.15, 85.6275), +(249210, 1, -1141.97, 2217.95, 38.9775), +(249210, 2, -1056.16, 2204.01, 20.5715), +(249210, 3, -976.365, 2201.53, 11.475), +(249210, 4, -927.05, 2151.84, 14.4697), +(249210, 5, -881.321, 2068.67, 31.261), +(249210, 6, -927.918, 2022.61, 62.6539), +(249210, 7, -944.76, 2015.79, 66.6124), +(249210, 8, -990.451, 2015.07, 66.9408), +(249210, 9, -1026.87, 2036.99, 66.9915), +(249210, 10, -1033.48, 2063.15, 66.9338), +(249210, 11, -1057.21, 2109.23, 56.5627), +(249210, 12, -1053.45, 2173.46, 26.8283), +(249210, 13, -1100.46, 2210.16, 30.2365), +(249210, 14, -1140.56, 2206.97, 40.1512); + +DELETE FROM `pool_template` WHERE `entry`=1082 AND `description` LIKE '%Mekthorg%'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1082, 1, 'Mekthorg the Wild (18677)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1082 AND `description` LIKE '%Mekthorg%'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(24918, 1082, 0, 'Mekthorg the Wild (18677)'), +(24919, 1082, 0, 'Mekthorg the Wild (18677)'), +(24920, 1082, 0, 'Mekthorg the Wild (18677)'), +(24921, 1082, 0, 'Mekthorg the Wild (18677)'); From 5a813c2dbf2f2d1a2ddc25df6a7385b71f794c22 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:20:14 -0300 Subject: [PATCH 23/32] fix(DB/Creature): Port Dr. Whitherlimb spawns from Mangos (#15069) --- .../rev_1676590661919341700.sql | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676590661919341700.sql diff --git a/data/sql/updates/pending_db_world/rev_1676590661919341700.sql b/data/sql/updates/pending_db_world/rev_1676590661919341700.sql new file mode 100644 index 000000000..7062ab87b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676590661919341700.sql @@ -0,0 +1,69 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 22062); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(22062, 0, 0, 0, 0, 0, 100, 0, 1500, 2500, 4000, 6000, 0, 11, 21067, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Dr. Whitherlimb - In Combat CMC - Cast \'Poison Bolt\''), +(22062, 0, 1, 0, 0, 0, 100, 0, 8000, 15000, 15000, 30000, 0, 11, 38864, 96, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Dr. Whitherlimb - In Combat CMC - Cast \'Withering Poison\''), +(22062, 0, 2, 0, 2, 0, 100, 0, 0, 50, 35000, 45000, 0, 11, 38871, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dr. Whitherlimb - Between 0-50% Health - Cast \'Monstrous Elixir\''), +(22062, 0, 3, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Dr. Whitherlimb - On Aggro - Say Line 0'), +(22062, 0, 4, 0, 5, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Dr. Whitherlimb - On Killed Unit - Say Line 1'); + +DELETE FROM `creature` WHERE `id1`=22062; +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(24911, 22062, 530, 1, 0, 6300.91, -6252.88, 77.8134, 4.92138, 5400, 2), +(24912, 22062, 530, 1, 0, 6305.22, -6475.4, 83.0121, 0.443913, 6300, 2), +(24913, 22062, 530, 1, 0, 7160.29, -6620.61, 60.6592, 5.59064, 7200, 2), +(24914, 22062, 530, 1, 0, 7227.19, -6406.61, 56.1656, 2.77106, 9000, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (24911, 24912, 24913, 24914)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(24911, 249110, 0, 0, 0, 0, 0, ''), +(24912, 249120, 0, 0, 0, 0, 0, ''), +(24913, 249130, 0, 0, 0, 0, 0, ''), +(24914, 249140, 0, 0, 0, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN (249110, 249120, 249130, 249140); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(249110, 1, 6305.4, -6258.75, 77.813), +(249110, 2, 6312.15, -6258.67, 80.813), +(249110, 3, 6319.65, -6250.08, 80.813), +(249110, 4, 6320.9, -6243.77, 77.942), +(249110, 5, 6314.05, -6237.9, 77.813), +(249110, 6, 6305.43, -6238.32, 77.813), +(249110, 7, 6299.6, -6244.36, 77.813), +(249110, 8, 6299.7, -6253.44, 77.813), +(249120, 1, 6294.18, -6468.08, 83.011), +(249120, 2, 6301.18, -6475.33, 83.011), +(249120, 3, 6309.72, -6475.18, 83.011), +(249120, 4, 6315.84, -6468.94, 83.197), +(249120, 5, 6315.23, -6462.81, 86.01), +(249120, 6, 6306.69, -6453.58, 86.01), +(249120, 7, 6300.74, -6453.97, 83.01), +(249120, 8, 6294.72, -6459.48, 83.01), +(249130, 1, 7160.11, -6607.73, 60.658), +(249130, 2, 7157.84, -6617.14, 60.658), +(249130, 3, 7162.99, -6624.5, 60.658), +(249130, 4, 7171.73, -6626.08, 60.864), +(249130, 5, 7176.71, -6622.44, 63.658), +(249130, 6, 7179.54, -6610.65, 63.658), +(249130, 7, 7175.27, -6604.53, 60.658), +(249130, 8, 7167.62, -6603.2, 60.658), +(249140, 1, 7224.31, -6404.75, 56.166), +(249140, 2, 7215.94, -6405.19, 56.166), +(249140, 3, 7211.89, -6409.29, 59.166), +(249140, 4, 7212.47, -6421.64, 59.166), +(249140, 5, 7216.75, -6426.26, 56.166), +(249140, 6, 7225.6, -6425.64, 56.166), +(249140, 7, 7231.39, -6419.25, 56.166), +(249140, 8, 7230.53, -6411.13, 56.166); + +UPDATE `creature_text` SET `Probability`=100 WHERE `CreatureID`=22062 AND `GroupID`=1; + +DELETE FROM `pool_template` WHERE `entry`=1114 AND `description`='Dr. Whitherlimb (22062)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1114, 1, 'Dr. Whitherlimb (22062)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1114 AND `description`='Dr. Whitherlimb (22062)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(24911, 1114, 0, 'Dr. Whitherlimb (22062)'), +(24912, 1114, 0, 'Dr. Whitherlimb (22062)'), +(24913, 1114, 0, 'Dr. Whitherlimb (22062)'), +(24914, 1114, 0, 'Dr. Whitherlimb (22062)'); From f7f187c1ff950146073c4a20dfb09f33e3be76aa Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:20:46 -0300 Subject: [PATCH 24/32] fix(DB/Creature): Port Eldinarcus spawns from Mangos (#15068) --- .../pending_db_world/rev_1676590176130007200.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676590176130007200.sql diff --git a/data/sql/updates/pending_db_world/rev_1676590176130007200.sql b/data/sql/updates/pending_db_world/rev_1676590176130007200.sql new file mode 100644 index 000000000..9ce7111ee --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676590176130007200.sql @@ -0,0 +1,15 @@ +-- +DELETE FROM `creature` WHERE `id1`=16854; +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`) VALUES +(24908, 16854, 530, 1, 9402.33, -7926.69, 12.2609, 0.730068, 5400, 10, 1), +(24909, 16854, 530, 1, 9472.51, -7946.23, 11.6341, 1.48537, 7200, 10, 1), +(24910, 16854, 530, 1, 9580.48, -7874.78, 12.7841, 0.261714, 9000, 10, 1); + +DELETE FROM `pool_template` WHERE `entry`=1113 AND `description`='Eldinarcus (16854)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1113, 1, 'Eldinarcus (16854)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1113 AND `description`='Eldinarcus (16854)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(24908, 1113, 0, 'Eldinarcus (16854)'), +(24909, 1113, 0, 'Eldinarcus (16854)'), +(24910, 1113, 0, 'Eldinarcus (16854)'); From 405d18180b56d836d89513d111b00d089d5f36ea Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:21:03 -0300 Subject: [PATCH 25/32] fix(DB/Creature): Port Morcrush from Mangos (#15067) --- .../rev_1676588846531594400.sql | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676588846531594400.sql diff --git a/data/sql/updates/pending_db_world/rev_1676588846531594400.sql b/data/sql/updates/pending_db_world/rev_1676588846531594400.sql new file mode 100644 index 000000000..2f105da20 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676588846531594400.sql @@ -0,0 +1,134 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18690); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(18690, 0, 0, 0, 9, 0, 100, 0, 0, 5, 12000, 16000, 0, 11, 35238, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Morcrush - Within 0-5 Range - Cast \'War Stomp\''), +(18690, 0, 1, 0, 2, 0, 100, 1, 0, 95, 0, 0, 0, 11, 38888, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Morcrush - Between 0-95% Health - Cast \'Serverside - Summon Morcrush Shardling\' (No Repeat)'), +(18690, 0, 2, 0, 2, 0, 100, 1, 0, 65, 0, 0, 0, 11, 38889, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Morcrush - Between 0-65% Health - Cast \'Serverside - Summon Morcrush Shardling\' (No Repeat)'), +(18690, 0, 3, 0, 2, 0, 100, 1, 0, 30, 0, 0, 0, 11, 38890, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Morcrush - Between 0-30% Health - Cast \'Serverside - Summon Morcrush Shardling\' (No Repeat)'); + +DELETE FROM `creature` WHERE `id1`=18690; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(24904, 18690, 530, 1915.66, 5150.16, 265.69, 1.07605, 32400, 2), +(24905, 18690, 530, 3714.5, 5483.36, -4.96681, 2.55039, 32400, 2), +(24906, 18690, 530, 3349.55, 4597.5, 222.237, 5.97708, 32400, 2), +(24907, 18690, 530, 2819, 5016.11, 268.504, 1.80425, 32400, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (24904, 24905, 24906, 24907)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(24904, 249040, 0, 0, 0, 0, 0, ''), +(24905, 249050, 0, 0, 0, 0, 0, ''), +(24906, 249060, 0, 0, 0, 0, 0, ''), +(24907, 249070, 0, 0, 0, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN (249040, 249050, 249060, 249070); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(249040, 1, 1915.66, 5150.16, 265.601), +(249040, 2, 1995.57, 5118.89, 265.19), +(249040, 3, 2074.8, 5113.67, 265.101), +(249040, 4, 2106.68, 5139.9, 265.215), +(249040, 5, 2082.52, 5179.31, 265.014), +(249040, 6, 2004.78, 5182.66, 265.296), +(249040, 7, 1829.95, 5171.58, 265.936), +(249040, 8, 1790.15, 5150.72, 265.471), +(249040, 9, 1727.85, 5114.07, 264.996), +(249040, 10, 1772.58, 5093.62, 265.549), +(249040, 11, 1828.43, 5091.6, 265.319), +(249040, 12, 1878.12, 5100.98, 265.317), +(249040, 13, 1915.66, 5150.16, 265.601), +(249050, 1, 3714.5, 5483.36, -4.96877), +(249050, 2, 3680.59, 5486.01, -19.131), +(249050, 3, 3630.06, 5478.73, -19.6109), +(249050, 4, 3601.14, 5476.87, -5.91752), +(249050, 5, 3534.92, 5540.57, -0.924066), +(249050, 6, 3484.9, 5619.4, -2.16304), +(249050, 7, 3508.3, 5633.92, -4.94206), +(249050, 8, 3546.86, 5627.75, -3.89208), +(249050, 9, 3606.84, 5601.99, -11.9971), +(249050, 10, 3647.06, 5597.63, -13.9664), +(249050, 11, 3675.07, 5504.26, -18.7066), +(249050, 12, 3714.5, 5483.36, -4.96877), +(249060, 1, 3349.55, 4597.5, 222.237), +(249060, 2, 3354, 4591.42, 222.27), +(249060, 3, 3366.39, 4589.04, 218.593), +(249060, 4, 3395.49, 4595.78, 208.17), +(249060, 5, 3437.07, 4596.08, 202.79), +(249060, 6, 3456.67, 4595.99, 206.177), +(249060, 7, 3486.16, 4607.78, 211.968), +(249060, 8, 3522.15, 4613.45, 218.701), +(249060, 9, 3568.34, 4645.82, 229.211), +(249060, 10, 3579.86, 4692.75, 234.727), +(249060, 11, 3577.91, 4781.2, 243.088), +(249060, 12, 3537.75, 4795.87, 247.217), +(249060, 13, 3508.11, 4789.68, 244.215), +(249060, 14, 3458.1, 4806.37, 259.514), +(249060, 15, 3416.01, 4867.56, 266.052), +(249060, 16, 3403.72, 4943.39, 263.659), +(249060, 17, 3351.51, 4953.37, 264.87), +(249060, 18, 3329.46, 5023.23, 258.801), +(249060, 19, 3312.49, 5076.67, 254.702), +(249060, 20, 3316.77, 5117.35, 248.759), +(249060, 21, 3290.66, 5140.98, 246.99), +(249060, 22, 3256.78, 5143.38, 258.418), +(249060, 23, 3161.24, 5141.15, 266.316), +(249060, 24, 3256.78, 5143.38, 258.418), +(249060, 25, 3290.66, 5140.98, 246.99), +(249060, 26, 3316.77, 5117.35, 248.759), +(249060, 27, 3312.49, 5076.67, 254.702), +(249060, 28, 3329.46, 5023.23, 258.801), +(249060, 29, 3351.51, 4953.37, 264.87), +(249060, 30, 3403.72, 4943.39, 263.659), +(249060, 31, 3416.01, 4867.56, 266.052), +(249060, 32, 3458.1, 4806.37, 259.514), +(249060, 33, 3508.11, 4789.68, 244.215), +(249060, 34, 3537.75, 4795.87, 247.217), +(249060, 35, 3577.91, 4781.2, 243.088), +(249060, 36, 3579.86, 4692.75, 234.727), +(249060, 37, 3568.34, 4645.82, 229.211), +(249060, 38, 3522.15, 4613.45, 218.701), +(249060, 39, 3486.16, 4607.78, 211.968), +(249060, 40, 3456.67, 4595.99, 206.177), +(249060, 41, 3437.07, 4596.08, 202.79), +(249060, 42, 3395.49, 4595.78, 208.17), +(249060, 43, 3366.39, 4589.04, 218.593), +(249060, 44, 3354, 4591.42, 222.27), +(249070, 1, 2819, 5016.11, 268.504), +(249070, 2, 2815.2, 5043.9, 266.924), +(249070, 3, 2771.48, 5055.91, 269.476), +(249070, 4, 2747.78, 5079.35, 268.384), +(249070, 5, 2738.04, 5102.07, 269.113), +(249070, 6, 2748.81, 5132.97, 264.752), +(249070, 7, 2703.21, 5171.69, 265.133), +(249070, 8, 2669.95, 5189.12, 264.859), +(249070, 9, 2636.04, 5225.66, 265.972), +(249070, 10, 2620.75, 5243.66, 266.594), +(249070, 11, 2612.78, 5264.99, 270.87), +(249070, 12, 2601.57, 5300.97, 274.672), +(249070, 13, 2588.37, 5326.82, 268.416), +(249070, 14, 2563.24, 5375.95, 271.407), +(249070, 15, 2536.07, 5404.85, 266.187), +(249070, 16, 2491.2, 5469.08, 263.939), +(249070, 17, 2536.07, 5404.85, 266.187), +(249070, 18, 2563.24, 5375.95, 271.407), +(249070, 19, 2588.37, 5326.82, 268.416), +(249070, 20, 2601.57, 5300.97, 274.672), +(249070, 21, 2612.78, 5264.99, 270.87), +(249070, 22, 2620.75, 5243.66, 266.594), +(249070, 23, 2636.04, 5225.66, 265.972), +(249070, 24, 2669.95, 5189.12, 264.859), +(249070, 25, 2703.21, 5171.69, 265.133), +(249070, 26, 2748.81, 5132.97, 264.752), +(249070, 27, 2738.04, 5102.07, 269.113), +(249070, 28, 2747.78, 5079.35, 268.384), +(249070, 29, 2771.48, 5055.91, 269.476), +(249070, 30, 2815.2, 5043.9, 266.924), +(249070, 31, 2819, 5016.11, 268.504); + +DELETE FROM `pool_template` WHERE `entry`=1112 AND `description`='Morcrush (18690)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1112, 1, 'Morcrush (18690)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1112 AND `description`='Morcrush (18690)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(24904, 1112, 0, 'Morcrush (18690)'), +(24905, 1112, 0, 'Morcrush (18690)'), +(24906, 1112, 0, 'Morcrush (18690)'), +(24907, 1112, 0, 'Morcrush (18690)'); From f108464503414b464331bd4be6594205b2df9f04 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:21:24 -0300 Subject: [PATCH 26/32] fix(DB/Creature): Port Speaker Mar'grom from Mangos (#15066) --- .../rev_1676587051044621200.sql | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676587051044621200.sql diff --git a/data/sql/updates/pending_db_world/rev_1676587051044621200.sql b/data/sql/updates/pending_db_world/rev_1676587051044621200.sql new file mode 100644 index 000000000..115d9f2f0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676587051044621200.sql @@ -0,0 +1,109 @@ +-- Fix obsolete SAI +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18693); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(18693, 0, 0, 0, 1, 0, 100, 0, 1000, 5000, 300000, 600000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - Out of Combat - Say Line 0'), +(18693, 0, 1, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - On Aggro - Say Line 1'), +(18693, 0, 2, 0, 8, 0, 100, 0, 0, 4, 0, 0, 0, 11, 37844, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - On Spellhit \'Fire\' - Cast \'Fire Ward\''), +(18693, 0, 3, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 11, 15497, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - On Aggro - Cast \'Frostbolt\''), +(18693, 0, 4, 0, 0, 0, 100, 0, 4000, 6000, 4000, 9000, 0, 11, 15241, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - In Combat - Cast \'Scorch\''), +(18693, 0, 5, 0, 0, 0, 100, 0, 8000, 10000, 5500, 11000, 0, 11, 12466, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Speaker Mar\'grom - In Combat - Cast \'Fireball\''); + +-- Re-create all spawns, keeping same guids for consistency +DELETE FROM `creature` WHERE `id1`=18693; +INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(151923, 18693, 530, 1, 3423.68, 5234.66, -1.64516, 0.390538, 28800, 2), +(151924, 18693, 530, 1, 3513.65, 5814.84, 1.3485, 5.11864, 28800, 2), +(151925, 18693, 530, 1, 2591.28, 6647.56, 20.5184, 4.27041, 28800, 2), +(151926, 18693, 530, 1, 1597.84, 6302.81, 2.42134, 1.1406, 28800, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (151923, 151924, 151925, 151926)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(151923, 1519230, 0, 0, 1, 0, 0, ''), +(151924, 1519240, 0, 0, 1, 0, 0, ''), +(151925, 1519250, 0, 0, 1, 0, 0, ''), +(151926, 1519260, 0, 0, 1, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN (1519230, 1519240, 1519250, 1519260); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +(1519230, 1, 3423.68, 5234.66, -1.64517), +(1519230, 2, 3464.52, 5243.7, -17.2122), +(1519230, 3, 3494.65, 5255.18, -23.4995), +(1519230, 4, 3599.2, 5285.24, -20.9848), +(1519230, 5, 3615.35, 5303.18, -21.4601), +(1519230, 6, 3685.35, 5305.97, -10.3391), +(1519230, 7, 3696.35, 5341.28, -8.04401), +(1519230, 8, 3684.33, 5307.79, -10.2238), +(1519230, 9, 3662.39, 5293.46, -16.4249), +(1519230, 10, 3634.07, 5265.84, -18.4172), +(1519230, 11, 3498.42, 5246.98, -23.9909), +(1519230, 12, 3428.78, 5232.17, -2.50548), +(1519230, 13, 3423.68, 5234.66, -1.64517), +(1519240, 1, 3513.65, 5814.84, 1.3485), +(1519240, 2, 3512.02, 5799.74, 1.41278), +(1519240, 3, 3530.03, 5783.1, 1.10585), +(1519240, 4, 3520.9, 5718.75, -8.51194), +(1519240, 5, 3491.92, 5678.48, -10.2608), +(1519240, 6, 3477.42, 5677.66, -10.3302), +(1519240, 7, 3373.28, 5709.29, -8.96263), +(1519240, 8, 3345.89, 5723.91, -9.23825), +(1519240, 9, 3293.24, 5717.23, -5.64248), +(1519240, 10, 3259.54, 5712.96, -5.50513), +(1519240, 11, 3221.99, 5698.82, -1.37267), +(1519240, 12, 3199.5, 5701.67, -1.09314), +(1519240, 13, 3190.4, 5719.89, -2.61677), +(1519240, 14, 3192.56, 5751.82, -6.81616), +(1519240, 15, 3168.25, 5778.94, -8.55679), +(1519240, 16, 3127.9, 5805.64, -0.243023), +(1519240, 17, 3105.05, 5814.77, -0.544315), +(1519240, 18, 3098.23, 5844.4, -0.14785), +(1519250, 1, 2591.28, 6647.56, 20.5184), +(1519250, 2, 2565.15, 6596.23, 3.81927), +(1519250, 3, 2579.03, 6559.81, 0.766655), +(1519250, 4, 2629.45, 6529.42, 0.730476), +(1519250, 5, 2664.63, 6524.38, 0.737788), +(1519250, 6, 2661.14, 6500.69, 3.46986), +(1519250, 7, 2636.46, 6505.5, 0.781365), +(1519250, 8, 2628.81, 6528.51, 0.751674), +(1519250, 9, 2581.36, 6554.37, 0.726271), +(1519250, 10, 2532.35, 6552.23, 0.726537), +(1519250, 11, 2502.79, 6559.41, -0.565026), +(1519250, 12, 2455.49, 6590.22, 0.725978), +(1519250, 13, 2428.18, 6580.25, 1.22745), +(1519250, 14, 2361.18, 6573.57, 0.746049), +(1519250, 15, 2396.47, 6640.43, 4.56912), +(1519250, 16, 2348.9, 6666.78, 15.8121), +(1519250, 17, 2340.19, 6641.97, 17.2369), +(1519250, 18, 2355.62, 6660.17, 15.7736), +(1519250, 19, 2394.16, 6648.3, 5.75975), +(1519250, 20, 2454.44, 6593.23, 0.72801), +(1519250, 21, 2511.43, 6577.86, 0.594083), +(1519250, 22, 2550.23, 6602.69, 2.81895), +(1519250, 23, 2582.76, 6638.13, 16.7397), +(1519260, 1, 1597.84, 6302.81, 2.42134), +(1519260, 2, 1648.49, 6315.82, -0.352608), +(1519260, 3, 1699.12, 6286.55, -0.541084), +(1519260, 4, 1647.24, 6317.92, -0.300317), +(1519260, 5, 1637.42, 6358.49, -4.58161), +(1519260, 6, 1642.03, 6389.42, -10.254), +(1519260, 7, 1473.67, 6508.8, -10.3382), +(1519260, 8, 1442.98, 6540.58, -10.2885), +(1519260, 9, 1478.94, 6526.28, -10.3382), +(1519260, 10, 1611.67, 6422.75, -10.3573), +(1519260, 11, 1628.77, 6392.04, -10.2012), +(1519260, 12, 1643.41, 6366.21, -6.10626), +(1519260, 13, 1591.97, 6327.18, 1.16319), +(1519260, 14, 1561.41, 6323.68, 1.16169), +(1519260, 15, 1520.63, 6359.26, 1.01601), +(1519260, 16, 1560.34, 6328.22, 1.06103), +(1519260, 17, 1590.25, 6327.65, 1.15933), +(1519260, 18, 1594.09, 6307.41, 1.97837); + +DELETE FROM `pool_template` WHERE `entry`=1083 AND `description` LIKE '%Speaker Mar%'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1083, 1, 'Speaker Mar\'grom (18693)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1083 AND `description` LIKE '%Speaker Mar%'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(151923, 1083, 0, 'Speaker Mar\'grom (18693)'), +(151924, 1083, 0, 'Speaker Mar\'grom (18693)'), +(151925, 1083, 0, 'Speaker Mar\'grom (18693)'), +(151926, 1083, 0, 'Speaker Mar\'grom (18693)'); From f25c90da37644507439fa23df7b599685275d0b8 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:23:21 -0300 Subject: [PATCH 27/32] fix(DB/SAI): Fix Teron Gorefiend, I am... being uncompletable (#15065) --- .../rev_1676515696524488800.sql | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676515696524488800.sql diff --git a/data/sql/updates/pending_db_world/rev_1676515696524488800.sql b/data/sql/updates/pending_db_world/rev_1676515696524488800.sql new file mode 100644 index 000000000..00dec9acc --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676515696524488800.sql @@ -0,0 +1,85 @@ +-- Delete old stuff +DELETE FROM `creature` WHERE `id1` IN (21797, 22395, 21872, 22417) AND `guid` IN (86139, 78730, 78756, 78757, 76573); + +-- New Altar of Shadows +DELETE FROM `gameobject` WHERE `guid`=25598 AND `id`=184738; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES +(25598, 184738, 530, 3520, 3944, 1, 1, -4547.79541015625, 1018.7100830078125, 10.07028961181640625, 3.900815248489379882, -0.02837467193603515, -0.0582284927368164, -0.92608070373535156, 0.371724128723144531, 120, 255, 1, 48069); + +-- New Creatures +SET @GUID := 24904; + +DELETE FROM `creature` WHERE `id1` IN (21797, 22395, 21872, 22417) AND `guid` BETWEEN @CGUID+0 AND @CGUID+4; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES +(@CGUID+0, 21797, 530, 3520, 3944, 1, 1, 0, -4543.6923828125, 1022.35357666015625, 9.979041099548339843, 3.874630928039550781, 120, 0, 0, 10175, 5325, 0, 0, 0, 0, 48069), +(@CGUID+1, 21872, 530, 3520, 3944, 1, 1, 0, -4540.8115234375, 1018.708984375, 10.46528816223144531, 5.777040004730224609, 120, 0, 0, 2035, 0, 0, 0, 0, 0, 48069), +(@CGUID+2, 22395, 530, 3520, 3944, 1, 1, 0, -4546.8544921875, 1019.9014892578125, 10.90510845184326171, 0.715584993362426757, 120, 0, 0, 2035, 0, 0, 0, 0, 0, 48069), +(@CGUID+3, 22417, 530, 3520, 3944, 1, 1, 0, -4559.91357421875, 1031.919189453125, 20.39095115661621093, 5.462880611419677734, 120, 0, 0, 2035, 0, 0, 0, 0, 0, 48069), +(@CGUID+4, 22417, 530, 3520, 3944, 1, 1, 0, -4532.3037109375, 1004.79168701171875, 22.8793182373046875, 2.39110112190246582, 120, 0, 0, 2035, 0, 0, 0, 0, 0, 48069); +-- (@CGUID+5, 21877, 530, 3520, 3944, 1, 1, 0, -4535.7939453125, 1029.2843017578125, 8.836360931396484375, 3.787364482879638671, 120, 0, 0, 5088, 1704, 0, 0, 0, 0, 48069), -- Tarsius + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2179700); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2179700, 9, 0 , 0, 0, 0, 100, 0, 1400, 1400, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Set Orientation Player (Stored)'), +(2179700, 9, 1 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Say Line 0'), +(2179700, 9, 3 , 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 36, 21867, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Update Template To \'Teron Gorefiend\''), +(2179700, 9, 4 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 18, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Set Flags Immune To Players'), +(2179700, 9, 5 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Set Npc Flag '), +(2179700, 9, 6 , 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 75, 37782, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Add Aura \'Serverside - Disembodied Spirit\''), +(2179700, 9, 7 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 85, 37769, 2, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Invoker Cast \'Serverside - Teron Gorefiend\''), +(2179700, 9, 8 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 37728, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Cast \'Haste\''), +(2179700, 9, 9 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 37789, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Cast \'Teron Freed\''), +(2179700, 9, 10, 0, 0, 0, 100, 512, 2000, 2000, 0, 0, 0, 12, 21877, 1, 300000, 0, 0, 0, 8, 0, 0, 0, 0, -4535.79, 1029.28, 8.83636, 3.78736, 'Ancient Shadowmoon Spirit - Actionlist - Summon Creature \'Karsius the Ancient Watcher\''), +(2179700, 9, 11, 0, 0, 0, 100, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 21877, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Say Line 0'), +(2179700, 9, 12, 0, 0, 0, 100, 512, 9000, 9000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 21872, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Say Line 0'); + +-- Remove invisibility aura from Karsius (not in sniff) +UPDATE `creature_template_addon` SET `auras` = '' WHERE (`entry` = 21877); + +-- Change type for one of Teron's texts +UPDATE `creature_text` SET `Type`=12 WHERE `CreatureID`=21797 AND `GroupID`=0; + +-- Add missing line when Event fails +DELETE FROM `creature_text` WHERE `CreatureID`=21877 AND `Text`='Let this be a lesson to those that would do evil to our lands!'; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `Text`, `Type`, `Probability`, `BroadcastTextId`, `comment`) VALUES +(21877, 2, 'Let this be a lesson to those that would do evil to our lands!', 14, 100, 19505, 'Karsius the Ancient Watcher when Teron Dies'); + +UPDATE `smart_scripts` SET `link`=15 WHERE (`entryorguid` = 21877) AND (`source_type` = 0) AND (`id` IN (10)); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21877) AND (`source_type` = 0) AND (`id` IN (15)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21877, 0, 15, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Karsius the Ancient Watcher - On Evade - Say Line 2'); + +-- Chain of Shadows only spam Enforced Submission on aggro +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 21876; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21876); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21876, 0, 0, 1, 11, 0, 100, 1, 0, 0, 0, 0, 0, 11, 37761, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Chain of Shadows - On Respawn - Cast \'Ancient Draenei Warden\' (No Repeat)'), +(21876, 0, 1, 0, 61, 0, 100, 1, 0, 0, 0, 0, 0, 17, 333, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Chain of Shadows - On Respawn - Set Emote State 333 (No Repeat)'), +(21876, 0, 2, 0, 1, 0, 33, 0, 8000, 21000, 8000, 21000, 0, 11, 37784, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Chain of Shadows - Out of Combat - Cast \'Enforced Submission\''), +(21876, 0, 3, 0, 38, 0, 100, 1, 1, 1, 0, 0, 0, 11, 37784, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Chain of Shadows - On Data Set 1 1 - Cast \'Enforced Submission\' (No Repeat)'); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21877) AND (`source_type` = 0) AND (`id` IN (0)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21877, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 9, 21876, 0, 200, 0, 0, 0, 0, 0, 'Karsius the Ancient Watcher - On Aggro - Chain of Shadows Casts Enforced Submission'); + +-- Improve ending +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 21877) AND (`source_type` = 0) AND (`id` IN (13, 16)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21877, 0, 13, 16, 61, 0, 100, 512, 0, 0, 0, 0, 0, 28, 37748, 0, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 0, 'Karsius the Ancient Watcher - Just Died - Remove Aura Teron Gorefiend from Player'), +(21877, 0, 16, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 28, 37748, 0, 0, 0, 0, 0, 9, 21867, 0, 200, 0, 0, 0, 0, 0, 'Karsius the Ancient Watcher - Just Died - Remove Aura Teron Gorefiend from Teron Gorefiend'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21867); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(21867, 0, 0, 0, 38, 0, 100, 512, 1, 1, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Teron Gorefiend - On Data Set 1 1 - Set Event Phase 1'), +(21867, 0, 1, 0, 1, 0, 100, 513, 1200, 1200, 0, 0, 0, 80, 2179701, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Teron Gorefiend - Out of Combat - Run Script (No Repeat)'), +(21867, 0, 2, 0, 1, 0, 100, 513, 300000, 300000, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Teron Gorefiend - Out of Combat - Despawn Instant (No Repeat)'); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2179701); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(2179701, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Evade'), +(2179701, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 43, 0, 10720, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Mount To Model 10720'), +(2179701, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Say Line 0'), +(2179701, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Say Line 1'), +(2179701, 9, 4, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 53, 1, 21867, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Shadowmoon Spirit - Actionlist - Start Waypoint'); From 30198bf267730636e137776a28b7f60c015de658 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:23:50 -0300 Subject: [PATCH 28/32] fix(DB/Creature): Port Collidus the Warp-Watcher from TBCMangos (#15064) --- .../rev_1676512163963962200.sql | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676512163963962200.sql diff --git a/data/sql/updates/pending_db_world/rev_1676512163963962200.sql b/data/sql/updates/pending_db_world/rev_1676512163963962200.sql new file mode 100644 index 000000000..93bdb090a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676512163963962200.sql @@ -0,0 +1,90 @@ +-- +SET @GUID := 24901; + +DELETE FROM `creature` WHERE `id1`=18694; +INSERT INTO `creature` (`guid`, `id1`, `map`, `ZoneId`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(@GUID+0, 18694, 530, 3520, -4377.75, 372.744, 60.6136, 3.61061, 86400, 2), +(@GUID+1, 18694, 530, 3520, -3016.2, 343.358, 0.342977, 1.68274, 100800, 2), +(@GUID+2, 18694, 530, 3520, -3903.28, 1696.27, 94.722, 0.724555, 115200, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (@GUID+0, @GUID+1, @GUID+2)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(@GUID+0, (@GUID+0)*10, 0, 0, 0, 0, 0, ''), +(@GUID+1, (@GUID+1)*10, 0, 0, 0, 0, 0, ''), +(@GUID+2, (@GUID+2)*10, 0, 0, 0, 0, 0, ''); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+0)*10, (@GUID+1)*10, (@GUID+2)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +((@GUID+0)*10, 1, -4377.75, 372.744, 60.6136), +((@GUID+0)*10, 2, -4418.22, 440.817, 119.472), +((@GUID+0)*10, 3, -4495.65, 594.858, 131.67), +((@GUID+0)*10, 4, -4427.65, 681.4, 171.633), +((@GUID+0)*10, 5, -4418.22, 440.817, 119.472), +((@GUID+0)*10, 6, -4377.75, 372.744, 60.6136), +((@GUID+1)*10, 1, -3016.2, 343.358, 0.341521), +((@GUID+1)*10, 2, -3026.05, 381.531, 2.17483), +((@GUID+1)*10, 3, -3021.31, 445.784, -3.64737), +((@GUID+1)*10, 4, -3006.23, 496.327, -13.6708), +((@GUID+1)*10, 5, -3000.99, 536.875, -5.49321), +((@GUID+1)*10, 6, -2961.61, 548.074, -7.68805), +((@GUID+1)*10, 7, -2892.66, 551.682, -12.8461), +((@GUID+1)*10, 8, -2783.63, 556.649, -15.0085), +((@GUID+1)*10, 9, -2785.17, 590.285, -7.29702), +((@GUID+1)*10, 10, -2754.35, 725.18, 2.95703), +((@GUID+1)*10, 11, -2727.19, 825.413, 6.34833), +((@GUID+1)*10, 12, -2751.82, 982.062, 10.3009), +((@GUID+1)*10, 13, -2843.48, 1081.11, 17.7488), +((@GUID+2)*10, 1, -3868.01, 1718.18, 97.2667), +((@GUID+2)*10, 2, -3847.3, 1740.45, 100.095), +((@GUID+2)*10, 3, -3826.27, 1759.02, 95.8044), +((@GUID+2)*10, 4, -3810.99, 1773.17, 95.6668), +((@GUID+2)*10, 5, -3785.15, 1768.66, 91.3053), +((@GUID+2)*10, 6, -3764.4, 1801.48, 91.3504), +((@GUID+2)*10, 7, -3743.34, 1831.35, 87.6495), +((@GUID+2)*10, 8, -3710.64, 1857.14, 81.6541), +((@GUID+2)*10, 9, -3687.23, 1881.36, 77.9404), +((@GUID+2)*10, 10, -3671.54, 1921.43, 73.2722), +((@GUID+2)*10, 11, -3655.59, 1949.15, 70.6234), +((@GUID+2)*10, 12, -3633.9, 1982.12, 66.5573), +((@GUID+2)*10, 13, -3611.06, 2002.72, 69.0087), +((@GUID+2)*10, 14, -3575.58, 2006.98, 61.9064), +((@GUID+2)*10, 15, -3535.25, 2034.6, 66.588), +((@GUID+2)*10, 16, -3518.48, 2069.63, 74.289), +((@GUID+2)*10, 17, -3509.8, 2111.29, 87.4461), +((@GUID+2)*10, 18, -3533.42, 2146.65, 80.8404), +((@GUID+2)*10, 19, -3554.49, 2164.17, 78.9279), +((@GUID+2)*10, 20, -3576.53, 2186.4, 79.5987), +((@GUID+2)*10, 21, -3595.57, 2217.79, 79.4822), +((@GUID+2)*10, 22, -3617.37, 2233.47, 79.9167), +((@GUID+2)*10, 23, -3595.57, 2217.79, 79.4822), +((@GUID+2)*10, 24, -3576.53, 2186.4, 79.5987), +((@GUID+2)*10, 25, -3554.49, 2164.17, 78.9279), +((@GUID+2)*10, 26, -3533.42, 2146.65, 80.8404), +((@GUID+2)*10, 27, -3509.8, 2111.29, 87.4461), +((@GUID+2)*10, 28, -3518.48, 2069.63, 74.289), +((@GUID+2)*10, 29, -3535.25, 2034.6, 66.588), +((@GUID+2)*10, 30, -3575.58, 2006.98, 61.9064), +((@GUID+2)*10, 31, -3611.06, 2002.72, 69.0087), +((@GUID+2)*10, 32, -3633.9, 1982.12, 66.5573), +((@GUID+2)*10, 33, -3655.59, 1949.15, 70.6234), +((@GUID+2)*10, 34, -3671.54, 1921.43, 73.2722), +((@GUID+2)*10, 35, -3687.23, 1881.36, 77.9404), +((@GUID+2)*10, 36, -3710.64, 1857.14, 81.6541), +((@GUID+2)*10, 37, -3743.34, 1831.35, 87.6495), +((@GUID+2)*10, 38, -3764.4, 1801.48, 91.3504), +((@GUID+2)*10, 39, -3785.15, 1768.66, 91.3053), +((@GUID+2)*10, 40, -3810.99, 1773.17, 95.6668), +((@GUID+2)*10, 41, -3826.27, 1759.02, 95.8044), +((@GUID+2)*10, 42, -3847.27, 1740.48, 100.118), +((@GUID+2)*10, 43, -3868.01, 1718.18, 97.2667), +((@GUID+2)*10, 44, -3903.28, 1696.27, 94.722); + +DELETE FROM `pool_template` WHERE `entry`=108 AND `description`='Collidus the Warp-Watcher (18694)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(108, 1, 'Collidus the Warp-Watcher (18694)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=108 AND `description`='Collidus the Warp-Watcher (18694)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID+0, 108, 0, 'Collidus the Warp-Watcher (18694)'), +(@GUID+1, 108, 0, 'Collidus the Warp-Watcher (18694)'), +(@GUID+2, 108, 0, 'Collidus the Warp-Watcher (18694)'); From 544987d061ef6f42fcf36d0e0681ec1869f919e1 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 17 Feb 2023 08:26:23 +0000 Subject: [PATCH 29/32] chore(DB): import pending files Referenced commit(s): 30198bf267730636e137776a28b7f60c015de658 --- .../rev_1676512163963962200.sql => db_world/2023_02_17_04.sql} | 1 + .../rev_1676515696524488800.sql => db_world/2023_02_17_05.sql} | 1 + .../rev_1676587051044621200.sql => db_world/2023_02_17_06.sql} | 1 + .../rev_1676588846531594400.sql => db_world/2023_02_17_07.sql} | 1 + .../rev_1676590176130007200.sql => db_world/2023_02_17_08.sql} | 1 + .../rev_1676590661919341700.sql => db_world/2023_02_17_09.sql} | 1 + .../rev_1676591600464140500.sql => db_world/2023_02_17_10.sql} | 1 + 7 files changed, 7 insertions(+) rename data/sql/updates/{pending_db_world/rev_1676512163963962200.sql => db_world/2023_02_17_04.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676515696524488800.sql => db_world/2023_02_17_05.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676587051044621200.sql => db_world/2023_02_17_06.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676588846531594400.sql => db_world/2023_02_17_07.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1676590176130007200.sql => db_world/2023_02_17_08.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1676590661919341700.sql => db_world/2023_02_17_09.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1676591600464140500.sql => db_world/2023_02_17_10.sql} (98%) diff --git a/data/sql/updates/pending_db_world/rev_1676512163963962200.sql b/data/sql/updates/db_world/2023_02_17_04.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676512163963962200.sql rename to data/sql/updates/db_world/2023_02_17_04.sql index 93bdb090a..291076fd5 100644 --- a/data/sql/updates/pending_db_world/rev_1676512163963962200.sql +++ b/data/sql/updates/db_world/2023_02_17_04.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_03 -> 2023_02_17_04 -- SET @GUID := 24901; diff --git a/data/sql/updates/pending_db_world/rev_1676515696524488800.sql b/data/sql/updates/db_world/2023_02_17_05.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676515696524488800.sql rename to data/sql/updates/db_world/2023_02_17_05.sql index 00dec9acc..5eb9bb4f9 100644 --- a/data/sql/updates/pending_db_world/rev_1676515696524488800.sql +++ b/data/sql/updates/db_world/2023_02_17_05.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_04 -> 2023_02_17_05 -- Delete old stuff DELETE FROM `creature` WHERE `id1` IN (21797, 22395, 21872, 22417) AND `guid` IN (86139, 78730, 78756, 78757, 76573); diff --git a/data/sql/updates/pending_db_world/rev_1676587051044621200.sql b/data/sql/updates/db_world/2023_02_17_06.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676587051044621200.sql rename to data/sql/updates/db_world/2023_02_17_06.sql index 115d9f2f0..b6e2c2ea4 100644 --- a/data/sql/updates/pending_db_world/rev_1676587051044621200.sql +++ b/data/sql/updates/db_world/2023_02_17_06.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_05 -> 2023_02_17_06 -- Fix obsolete SAI DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18693); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1676588846531594400.sql b/data/sql/updates/db_world/2023_02_17_07.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676588846531594400.sql rename to data/sql/updates/db_world/2023_02_17_07.sql index 2f105da20..1fd38185b 100644 --- a/data/sql/updates/pending_db_world/rev_1676588846531594400.sql +++ b/data/sql/updates/db_world/2023_02_17_07.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_06 -> 2023_02_17_07 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18690); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1676590176130007200.sql b/data/sql/updates/db_world/2023_02_17_08.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1676590176130007200.sql rename to data/sql/updates/db_world/2023_02_17_08.sql index 9ce7111ee..72007ff1d 100644 --- a/data/sql/updates/pending_db_world/rev_1676590176130007200.sql +++ b/data/sql/updates/db_world/2023_02_17_08.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_07 -> 2023_02_17_08 -- DELETE FROM `creature` WHERE `id1`=16854; INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1676590661919341700.sql b/data/sql/updates/db_world/2023_02_17_09.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1676590661919341700.sql rename to data/sql/updates/db_world/2023_02_17_09.sql index 7062ab87b..71e16cc89 100644 --- a/data/sql/updates/pending_db_world/rev_1676590661919341700.sql +++ b/data/sql/updates/db_world/2023_02_17_09.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_08 -> 2023_02_17_09 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 22062); INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1676591600464140500.sql b/data/sql/updates/db_world/2023_02_17_10.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1676591600464140500.sql rename to data/sql/updates/db_world/2023_02_17_10.sql index abcd3bc9f..2567127da 100644 --- a/data/sql/updates/pending_db_world/rev_1676591600464140500.sql +++ b/data/sql/updates/db_world/2023_02_17_10.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_09 -> 2023_02_17_10 -- DELETE FROM `creature` WHERE `id1`=18677; INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES From f31f10fdf7b9b170bed87acb02a35f6fee5bdd6b Mon Sep 17 00:00:00 2001 From: Maelthyr <100411212+Maelthyrr@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:43:43 +0100 Subject: [PATCH 30/32] fix(DB/QuestTemplate): esES and esMX translation (#15049) Co-authored-by: Tony931023 --- .../rev_1676449272003717800.sql | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1676449272003717800.sql diff --git a/data/sql/updates/pending_db_world/rev_1676449272003717800.sql b/data/sql/updates/pending_db_world/rev_1676449272003717800.sql new file mode 100644 index 000000000..c3313aaeb --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1676449272003717800.sql @@ -0,0 +1,131 @@ +-- Authored-by: Tony931023 +UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.' WHERE `ID` = 147 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `Objectives` = 'Mata a 4 sables de la noche y 4 jabalies cardo jovenes.' WHERE `ID` = 456 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `Objectives` = 'Mata a 5 sables de la noche sarnosos y a 5 jabalies Cardo.' WHERE `ID` = 457 AND `locale` = 'esMX'; +UPDATE `quest_template_locale` SET `Title` = 'El veneno de la Tejemadera' WHERE `ID` = 916 AND `locale` = 'esMX'; +UPDATE `quest_template_locale` SET `Objectives` = 'Lleva 10 glándulas de veneno de Tejemadera a Gilshalan Caminaviento a Aldrassil.' WHERE `ID` = 916 AND `locale` = 'esMX'; +UPDATE `quest_template_locale` SET `Details` = 'He venido a Cañada Umbría para observar a las arañas tejemadera de la Gruta Narácnida. Son parientes de unas arañas mucho más pequeñas; creo que el Árbol del Mundo ha tenido un profundo efecto en ellas y quiero estudiar unos especímenes para confirmarlo.$B$BPara empezar, necesito su veneno. Ve a la Gruta Narácnida, que está al norte de aquí, y tráeme glándulas de veneno; así podré compararlo con el veneno de sus parientes más pequeñas.' WHERE `ID` = 916 AND `locale` = 'esMX'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con el vigilante Bel\'dugur al Apothecarium en Entrañas.' WHERE `ID` = 1013 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Bashana Tótem de Runa en Elder Rise en Cima del Trueno.' WHERE `ID` = 6561 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Has limpiado Atiesh' WHERE `ID` = 9257 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Has limpiado Atiesh' WHERE `ID` = 9269 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Has limpiado Atiesh' WHERE `ID` = 9270 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Has limpiado Atiesh' WHERE `ID` = 9271 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Búhicos Cubrebosque inoculados' WHERE `ID` = 9303 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Devuelve la silitista' WHERE `ID` = 9419 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Entrega la silitista' WHERE `ID` = 9422 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `Objectives` = 'El alto señor Darion Mograine quiere que utilices el Filo de las Sombras para matar a 1000 esbirros del Rey Exánime en la Ciudadela de la Corona de Hielo. Las almas se pueden obtener en el modo de 10 ó 25 jugadores.' WHERE `ID` = 24547 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Esencia de Aggonar eliminada' WHERE `ID` = 9427 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Crocolisco capturado alimentado' WHERE `ID` = 9440 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Tumba de Uther profanada' WHERE `ID` = 9444 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Brutos debilitados sanados' WHERE `ID` = 9447 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Pergamino de Reprensión de Carinda utilizado' WHERE `ID` = 9472 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Forestal Canción Eterna bendecido' WHERE `ID` = 9489 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Capitana Alina rescatada' WHERE `ID` = 9524 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Capitán Triturahuesos rescatado' WHERE `ID` = 9525 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Semillas de árbol plantadas' WHERE `ID` = 9526 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Se descubre el traidor' WHERE `ID` = 9531 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cautivo Semprepino liberado' WHERE `ID` = 9544 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cautivo Semprepino liberado' WHERE `ID` = 9546 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Sana a Tavara' WHERE `ID` = 9586 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Chamán fúrbolg joven resucitado' WHERE `ID` = 9600 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Exploradores Cienonegro marcados' WHERE `ID` = 9629 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Gran jefe Semprepino avisado' WHERE `ID` = 9663 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura la Torre de la Corona' WHERE `ID` = 9664 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura la Torre de la Corona' WHERE `ID` = 9665 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Princesa Semprepino salvada' WHERE `ID` = 9667 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Investigador de expedición liberado' WHERE `ID` = 9670 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Realiza la primera prueba' WHERE `ID` = 9678 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Resucitar a Sangrias Hojafirme' WHERE `ID` = 9685 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Control del Lago Umbropantano desactivado' WHERE `ID` = 9720 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Eliminar la protección de la Capilla de Alonsus' WHERE `ID` = 9737 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Vinculador terrestre Rayge descubierto' WHERE `ID` = 9738 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Investigador de expedición liberado' WHERE `ID` = 9749 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Información del Halcón del Sol conseguida' WHERE `ID` = 9756 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Marca de conocimiento' WHERE `ID` = 9785 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cabaña Grande destruida' WHERE `ID` = 9805 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Suelta a los murlocs en la Aldea Dagapantano' WHERE `ID` = 9816 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Lectura del pozo subterráneo' WHERE `ID` = 9824 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Presencia demoníaca destruida' WHERE `ID` = 9844 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Invocar al espíritu serpiente' WHERE `ID` = 9847 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cadáver de habitante de Primasol quemado' WHERE `ID` = 9874 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Primer confalón de batalla colocado' WHERE `ID` = 9910 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Zoquete ha sido interrogado' WHERE `ID` = 9918 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Corki liberado' WHERE `ID` = 9923 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Corki liberado de nuevo' WHERE `ID` = 9924 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Estandarte ogro de Mazo de Guerra colocado' WHERE `ID` = 9927 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Estandarte Mata’penas plantado' WHERE `ID` = 9931 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cadáveres Mata’penas colocados' WHERE `ID` = 9932 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Prisionero Mag\'har liberado' WHERE `ID` = 9948 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Corki liberado' WHERE `ID` = 9955 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Investigar las defensas de Velo Shalas' WHERE `ID` = 9958 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Investigar las defensas de Velo Shalas' WHERE `ID` = 9959 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Objeto extraño examinado' WHERE `ID` = 9971 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Utiliza el talismán de Kokorek' WHERE `ID` = 9975 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Utiliza el talismán de Kokorek' WHERE `ID` = 9976 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Campamento Forja: Odio destruido' WHERE `ID` = 10011 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Iniciado oscuro sonsacado' WHERE `ID` = 10040 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Iniciado oscuro sonsacado' WHERE `ID` = 10041 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Purificar esqueleto pisoteado' WHERE `ID` = 10047 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Lanzacuchillos del este quemado' WHERE `ID` = 10078 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Visita el Puesto Primasol' WHERE `ID` = 10085 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cañón del este quemado' WHERE `ID` = 10087 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 10106 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 10110 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Intenta robar el huevo' WHERE `ID` = 10111 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Antena Legión: Maldad destruida' WHERE `ID` = 10125 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Puerta Murketh destruida' WHERE `ID` = 10129 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Desactivar el Portal Grimh' WHERE `ID` = 10144 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Puerta Murketh destruida' WHERE `ID` = 10146 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Nivel de carga de la batería' WHERE `ID` = 10190 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Conseguir que Grek pruebe el aceite de olemba' WHERE `ID` = 10201 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Excavamática hiperrotacional recuperada' WHERE `ID` = 10203 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Perturbar el Portal Xilus' WHERE `ID` = 10208 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Balista Furia del Sol destruida' WHERE `ID` = 10233 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Manni salvado' WHERE `ID` = 10238 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Activar la runa del este' WHERE `ID` = 10240 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Test de prueba del Atracador desguazador X6000 completado' WHERE `ID` = 10248 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Administra el antídoto' WHERE `ID` = 10255 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Descubre la identidad del maestro de llaves' WHERE `ID` = 10256 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Mata a Veraku' WHERE `ID` = 10274 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Pabellones de internamiento incendiados' WHERE `ID` = 10283 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Destino de Thrall cumplido' WHERE `ID` = 10284 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Dar descanso al espíritu de Belmara' WHERE `ID` = 10305 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Dar descanso al espíritu de Luminrath' WHERE `ID` = 10306 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Dar descanso al espíritu de Cohlien' WHERE `ID` = 10307 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Medidas del conducto Norte tomadas' WHERE `ID` = 10313 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Marcador de reconocimiento uno colocado' WHERE `ID` = 10335 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cadáveres marchitos quemados' WHERE `ID` = 10345 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Capitán Tyralius liberado' WHERE `ID` = 10422 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Probar modulador de campo de energía' WHERE `ID` = 10426 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Diemetradón de fuego vil superior marcado' WHERE `ID` = 10672 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Orbes de luz Razaani atrapados' WHERE `ID` = 10674 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Azaloth liberado' WHERE `ID` = 10688 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Escuchar los planes de los ogros Machacasangre' WHERE `ID` = 10714 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Envenenar el barril de grog de punto verde' WHERE `ID` = 10720 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Coloca Tótems repelentes' WHERE `ID` = 10723 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Filo de las Sombras alimentado con almas' WHERE `ID` = 24547 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 13411 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 13410 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 13409 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Captura La Dominancia' WHERE `ID` = 13408 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Cruzado Escarlata asesinada' WHERE `ID` = 12678 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `Objectives` = '' WHERE `ID` = 2868 AND `locale` = 'esES'; +UPDATE `quest_template_locale` SET `Objectives` = '' WHERE `ID` = 5421 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `Details` = '' WHERE `ID` = 5421 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = '' WHERE `ID` IN (894,902,1046,3301,3921,6134,6361,6362,6363,6364,6365,6384,6385,6386,9645,10068,10069,10070,10071,10072,10073,10198,11196,25055,25092) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Montaraz Pedernal en el Paso de la Puerta Norte en Dun Morogh.' WHERE `ID` = 224 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Magistrado Narizroma en Loch Modan.' WHERE `ID` = 255 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Daryl el Jovenzuelo en la Cabaña del Errante en Loch Modan.' WHERE `ID` IN (257,258,271) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Asterion en el Cabo de la Niebla en Costa Oscura.' WHERE `ID` IN (955,956,957) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Terenthis en Auberdine en Costa Oscura.' WHERE `ID` IN (984,985,986,994,995) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Smeed Mezclatornillos en el Campamento de los Mezclatornillos en Desolace.' WHERE `ID` IN (5561,5581,5821) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Tharnariun Espinarbolado en Auberdine en Costa Oscura.' WHERE `ID` IN (2118,2138,2139) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Thundris Tejevientos en Auberdine en Costa Oscura.' WHERE `ID` IN (958,4762,4763) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Regresa con Kreldig Ungor en Punta Nijel en Desolace.' WHERE `ID` IN (1456,1458,1459,1466) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Regresa con Maniveo Zumbang en Auberdine en Costa Oscura.' WHERE `ID` IN (1579,1580) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Gretta la Mediadora en el Poblado de Brunnhildar en Las Cumbres Tormentosas.' WHERE `ID` IN (13423,13424) AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con Montaraz Muroplof en el Valle de los Reyes en Dun Morogh.' WHERE `ID` = 263 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve a el Capitán Rugelfuss en el Paso de la Puerta Norte en Dun Morogh.' WHERE `ID` = 267 AND `locale` IN ('esES','esMX'); +UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con el Ingeniero jefe Hinderweir VII en la Presa de las Tres Cabezas en Loch Modan.' WHERE `ID` = 278 AND `locale` IN ('esES','esMX'); From 88bfe88abe7f4e3ffcb966ca7f4d282c4ab9d01e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 17 Feb 2023 08:46:36 +0000 Subject: [PATCH 31/32] chore(DB): import pending files Referenced commit(s): f31f10fdf7b9b170bed87acb02a35f6fee5bdd6b --- .../rev_1676449272003717800.sql => db_world/2023_02_17_11.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1676449272003717800.sql => db_world/2023_02_17_11.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1676449272003717800.sql b/data/sql/updates/db_world/2023_02_17_11.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1676449272003717800.sql rename to data/sql/updates/db_world/2023_02_17_11.sql index c3313aaeb..2cbced7ea 100644 --- a/data/sql/updates/pending_db_world/rev_1676449272003717800.sql +++ b/data/sql/updates/db_world/2023_02_17_11.sql @@ -1,3 +1,4 @@ +-- DB update 2023_02_17_10 -> 2023_02_17_11 -- Authored-by: Tony931023 UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.' WHERE `ID` = 147 AND `locale` IN ('esES','esMX'); UPDATE `quest_template_locale` SET `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` IN ('esES','esMX'); From 1e4e663a1a657389a59dda6d668741697bf02a17 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:37:23 -0300 Subject: [PATCH 32/32] fix(DB): Fix 2023_02_17_05.sql (#15081) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 天鹿 <18535853+pklloveyou@users.noreply.github.com> --- data/sql/updates/db_world/2023_02_17_05.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/sql/updates/db_world/2023_02_17_05.sql b/data/sql/updates/db_world/2023_02_17_05.sql index 5eb9bb4f9..4fe9cf57c 100644 --- a/data/sql/updates/db_world/2023_02_17_05.sql +++ b/data/sql/updates/db_world/2023_02_17_05.sql @@ -8,8 +8,9 @@ INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, (25598, 184738, 530, 3520, 3944, 1, 1, -4547.79541015625, 1018.7100830078125, 10.07028961181640625, 3.900815248489379882, -0.02837467193603515, -0.0582284927368164, -0.92608070373535156, 0.371724128723144531, 120, 255, 1, 48069); -- New Creatures -SET @GUID := 24904; +SET @CGUID := 100050; +DELETE FROM `creature` WHERE `id1` IN (21797, 22395, 21872, 22417); DELETE FROM `creature` WHERE `id1` IN (21797, 22395, 21872, 22417) AND `guid` BETWEEN @CGUID+0 AND @CGUID+4; INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES (@CGUID+0, 21797, 530, 3520, 3944, 1, 1, 0, -4543.6923828125, 1022.35357666015625, 9.979041099548339843, 3.874630928039550781, 120, 0, 0, 10175, 5325, 0, 0, 0, 0, 48069),