diff --git a/data/sql/updates/pending_db_world/rev_1643155057631411400.sql b/data/sql/updates/pending_db_world/rev_1643155057631411400.sql new file mode 100644 index 000000000..04f332fc3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1643155057631411400.sql @@ -0,0 +1,107 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1643155057631411400'); + +DELETE FROM `creature_text` WHERE `CreatureID` = 6109; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(6109, 0, 0, 'Come, little ones. Face me!', 14, 0, 100, 0, 0, 0, 9071, 2, 'Azuregos - On Teleport'), +(6109, 1, 0, 'This place is under my protection. The mysteries of the arcane shall remain inviolate.', 14, 0, 100, 0, 0, 0, 9072, 2, 'Azuregos - On Aggro'), +(6109, 2, 0, 'Such is the price of curiosity.', 14, 0, 100, 0, 0, 0, 9073, 2, 'Azuregos - On Unit Killed'); + +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_arcane_vacuum', 'spell_mark_of_frost_freeze'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(21147, 'spell_arcane_vacuum'), +(23183, 'spell_mark_of_frost_freeze'); + +UPDATE `spell_dbc` SET `DurationIndex` = 1, `EffectRadiusIndex_1` = 11 WHERE `ID` = 23183; + +SET @NPC := 52349; +SET @PATH := @NPC * 10; + +UPDATE `creature` SET `MovementType` = 2 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, ''); + +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, 2623.38, -5977.86, 100.642, 3.86238, 0, 0, 0, 100, 0), +(@PATH, 2, 2652.61, -6023.30, 97.2364, 4.28178, 0, 0, 0, 100, 0), +(@PATH, 3, 2637.75, -6057.12, 100.789, 4.96744, 0, 0, 0, 100, 0), +(@PATH, 4, 2650.16, -6101.06, 99.1050, 4.99335, 0, 0, 0, 100, 0), +(@PATH, 5, 2659.07, -6142.42, 100.017, 5.61225, 0, 0, 0, 100, 0), +(@PATH, 6, 2699.18, -6169.74, 97.2345, 5.90834, 0, 0, 0, 100, 0), +(@PATH, 7, 2748.81, -6216.27, 102.323, 5.52506, 0, 0, 0, 100, 0), +(@PATH, 8, 2728.22, -6259.92, 99.7664, 1.50304, 0, 0, 0, 100, 0), +(@PATH, 9, 2701.59, -6292.38, 98.4016, 1.01845, 0, 0, 0, 100, 0), +(@PATH, 10, 2665.81, -6316.73, 100.927, 3.15866, 0, 0, 0, 100, 0), +(@PATH, 11, 2639.08, -6319.14, 93.82, 3.16179, 0, 0, 0, 100, 0), +(@PATH, 12, 2609.81, -6316.40, 95.62, 2.8822, 0, 0, 0, 100, 0), +(@PATH, 13, 2593.02, -6298.90, 103.16, 2.55862, 0, 0, 0, 100, 0), +(@PATH, 14, 2502.05, -6238.91, 102.5, 2.55862, 0, 0, 0, 100, 0), +(@PATH, 15, 2484.14, -6233.41, 101.99, 3.24663, 0, 0, 0, 100, 0), +(@PATH, 16, 2450.22, -6182.88, 101.45, 2.20912, 0, 0, 0, 100, 0), +(@PATH, 17, 2411.61, -6157.76, 101.92, 3.54822, 0, 0, 0, 100, 0), +(@PATH, 18, 2361.36, -6203.64, 104.65, 4.13334, 0, 0, 0, 100, 0), +(@PATH, 19, 2336.04, -6248.55, 106.4, 4.62264, 0, 0, 0, 100, 0), +(@PATH, 20, 2361.63, -6203.64, 104.65, 0.89043, 0, 0, 0, 100, 0), +(@PATH, 21, 2406.65, -6164.80, 100.57, 0.92734, 0, 0, 0, 100, 0), +(@PATH, 22, 2407.32, -6147.17, 100.29, 2.08345, 0, 0, 0, 100, 0), +(@PATH, 23, 2352.5 , -6106.48, 110.44, 2.66543, 0, 0, 0, 100, 0), +(@PATH, 24, 2294.35, -6064.86, 107.44, 2.19419, 0, 0, 0, 100, 0), +(@PATH, 25, 2352.5 , -6106.48, 110.44, 2.66543, 0, 0, 0, 100, 0), +(@PATH, 26, 2406.58, -6133.30, 99.69, 5.90284, 0, 0, 0, 100, 0), +(@PATH, 27, 2439.64, -6126.91, 105.12, 0.38778, 0, 0, 0, 100, 0), +(@PATH, 28, 2501.26, -6091.94, 99.97, 0.60926, 0, 0, 0, 100, 0), +(@PATH, 29, 2535.65, -6010.90, 99.62, 1.07893, 0, 0, 0, 100, 0), +(@PATH, 30, 2578.13, -5963.59, 97.82, 0.00136, 0, 0, 0, 100, 0); + +SET @NPC := 35867; +SET @PATH := @NPC * 10; + +UPDATE `creature` SET `MovementType` = 2 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,4097,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, 2578.13, -5963.59, 97.82, 0.00136, 0, 0, 0, 100, 0), +(@PATH, 2, 2535.65, -6010.90, 99.62, 1.07893, 0, 0, 0, 100, 0), +(@PATH, 3, 2501.26, -6091.94, 99.97, 0.60926, 0, 0, 0, 100, 0), +(@PATH, 4, 2439.64, -6126.91, 105.12, 0.38778, 0, 0, 0, 100, 0), +(@PATH, 5, 2406.58, -6133.30, 99.69, 5.90284, 0, 0, 0, 100, 0), +(@PATH, 6, 2352.50, -6106.48, 110.44, 2.66543, 0, 0, 0, 100, 0), +(@PATH, 7, 2294.35, -6064.86, 107.44, 2.19419, 0, 0, 0, 100, 0), +(@PATH, 8, 2352.50, -6106.48, 110.44, 2.66543, 0, 0, 0, 100, 0), +(@PATH, 9, 2407.32, -6147.17, 100.29, 2.08345, 0, 0, 0, 100, 0), +(@PATH, 10, 2406.65, -6164.80, 100.57, 0.92734, 0, 0, 0, 100, 0), +(@PATH, 11, 2361.63, -6203.64, 104.65, 0.89043, 0, 0, 0, 100, 0), +(@PATH, 12, 2336.04, -6248.55, 106.40, 4.62264, 0, 0, 0, 100, 0), +(@PATH, 13, 2361.36, -6203.64, 104.65, 4.13334, 0, 0, 0, 100, 0), +(@PATH, 14, 2411.61, -6157.76, 101.92, 3.54822, 0, 0, 0, 100, 0), +(@PATH, 15, 2450.22, -6182.88, 101.45, 2.20912, 0, 0, 0, 100, 0), +(@PATH, 16, 2484.14, -6233.41, 101.99, 3.24663, 0, 0, 0, 100, 0), +(@PATH, 17, 2502.05, -6238.91, 102.50, 2.55862, 0, 0, 0, 100, 0), +(@PATH, 18, 2593.02, -6298.90, 103.16, 2.55862, 0, 0, 0, 100, 0), +(@PATH, 19, 2609.81, -6316.40, 95.62, 2.8822, 0, 0, 0, 100, 0), +(@PATH, 20, 2639.08, -6319.14, 93.82, 3.16179, 0, 0, 0, 100, 0), +(@PATH, 21, 2665.81, -6316.73, 100.927, 3.15866, 0, 0, 0, 100, 0), +(@PATH, 22, 2701.59, -6292.38, 98.4016, 1.01845, 0, 0, 0, 100, 0), +(@PATH, 23, 2728.22, -6259.92, 99.7664, 1.50304, 0, 0, 0, 100, 0), +(@PATH, 24, 2748.81, -6216.27, 102.323, 5.52506, 0, 0, 0, 100, 0), +(@PATH, 25, 2699.18, -6169.74, 97.2345, 5.90834, 0, 0, 0, 100, 0), +(@PATH, 26, 2659.07, -6142.42, 100.017, 5.61225, 0, 0, 0, 100, 0), +(@PATH, 27, 2650.16, -6101.06, 99.105, 4.99335, 0, 0, 0, 100, 0), +(@PATH, 28, 2637.75, -6057.12, 100.789, 4.96744, 0, 0, 0, 100, 0), +(@PATH, 29, 2652.61, -6023.30, 97.2364, 4.28178, 0, 0, 0, 100, 0), +(@PATH, 30, 2623.38, -5977.86, 100.642, 3.86238, 0, 0, 0, 100, 0); + +UPDATE `creature_template` SET `npcflag` = `npcflag`|1, `gossip_menu_id` = 15000 WHERE `entry` = 6109; +DELETE FROM `gossip_menu` WHERE `MenuID` = 15000; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES +(15000, 7880); + +DELETE FROM `gossip_menu_option` WHERE `MenuID` = 15000; +INSERT INTO `gossip_menu_option` (`MenuID`,`OptionID`,`OptionIcon`,`OptionText`,`OptionBroadcastTextID`,`OptionType`,`OptionNpcFlag`,`ActionMenuID`,`ActionPoiID`,`BoxCoded`,`BoxMoney`,`BoxText`,`BoxBroadcastTextID`,`VerifiedBuild`) VALUES +(15000, 0, 0, 'I am a treasure hunter in search of powerful artifacts. Give them to me and you will not be harmed.', 11016, 1, 1, 0, 0, 0, 0, '', 0, 12340); diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index cd769c809..94a28970b 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4141,6 +4141,13 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_1].SpellClassMask[1] = 0x00020000; }); + // Arcane Vacuum + ApplySpellFix({ 21147 }, [](SpellInfo* spellInfo) + { + spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(4); // 30 yards + spellInfo->AttributesEx3 |= SPELL_ATTR3_ONLY_ON_PLAYER; + }); + // Focused Assault // Brutal Assault ApplySpellFix({ 46392, 46393 }, [](SpellInfo* spellInfo) diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 7988b0be4..20234dfbd 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -15,156 +15,220 @@ * with this program. If not, see . */ -/* ScriptData -SDName: Boss_Azuregos -SD%Complete: 90 -SDComment: Teleport not included, spell reflect not effecting dots (Core problem) -SDCategory: Azshara -EndScriptData */ - -#include "ScriptMgr.h" +#include "Player.h" +#include "ScriptedGossip.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "TaskScheduler.h" enum Say { - SAY_TELEPORT = 0 + SAY_TELEPORT = 0, + SAY_AGGRO, + SAY_KILL, }; enum Spells { - SPELL_MARKOFFROST = 23182, - SPELL_MANASTORM = 21097, - SPELL_CHILL = 21098, - SPELL_FROSTBREATH = 21099, - SPELL_REFLECT = 22067, - SPELL_CLEAVE = 8255, //Perhaps not right ID - SPELL_ENRAGE = 23537 + SPELL_MARK_OF_FROST = 23182, + SPELL_MARK_OF_FROST_AURA = 23184, + SPELL_AURA_OF_FROST = 23186, + SPELL_MANA_STORM = 21097, + SPELL_CHILL = 21098, + SPELL_FROST_BREATH = 21099, + SPELL_REFLECT = 22067, + SPELL_CLEAVE = 19983, + SPELL_ARCANE_VACUUM = 21147, + SPELL_ARCANE_VACUUM_TP = 21150 }; class boss_azuregos : public CreatureScript { public: + boss_azuregos() : CreatureScript("boss_azuregos") { } + struct boss_azuregosAI : public ScriptedAI + { + boss_azuregosAI(Creature* creature) : ScriptedAI(creature) + { + _scheduler.SetValidator([this] + { + return !me->HasUnitState(UNIT_STATE_CASTING); + }); + } + + void Reset() override + { + me->RemoveAurasDueToSpell(SPELL_MARK_OF_FROST_AURA); + _scheduler.CancelAll(); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->RestoreFaction(); + me->GetMap()->DoForAllPlayers([&](Player* p) + { + if (p->GetZoneId() == me->GetZoneId()) + { + + p->RemoveAurasDueToSpell(SPELL_MARK_OF_FROST); + p->RemoveAurasDueToSpell(SPELL_AURA_OF_FROST); + p->RemoveAurasDueToSpell(SPELL_CHILL); + p->RemoveAurasDueToSpell(SPELL_FROST_BREATH); + } + }); + } + + void KilledUnit(Unit* victim) override + { + if (victim && victim->GetTypeId() == TYPEID_PLAYER) + { + Talk(SAY_KILL); + victim->CastSpell(victim, SPELL_MARK_OF_FROST, true); + } + } + + void EnterCombat(Unit* /*who*/) override + { + DoCastSelf(SPELL_MARK_OF_FROST_AURA); + Talk(SAY_AGGRO); + + _scheduler + .Schedule(7s, [this](TaskContext context) + { + DoCastVictim(SPELL_CLEAVE); + context.Repeat(7s); + }) + .Schedule(5s, 17s, [this](TaskContext context) + { + DoCastRandomTarget(SPELL_MANA_STORM); + context.Repeat(7s, 13s); + }) + .Schedule(10s, 30s, [this](TaskContext context) + { + DoCastVictim(SPELL_CHILL); + context.Repeat(13s, 25s); + }) + .Schedule(2s, 8s, [this](TaskContext context) + { + DoCastVictim(SPELL_FROST_BREATH); + context.Repeat(10s, 15s); + }) + .Schedule(30s, [this](TaskContext context) + { + Talk(SAY_TELEPORT); + DoCastAOE(SPELL_ARCANE_VACUUM); + DoResetThreat(); + context.Repeat(30s); + }) + .Schedule(15s, 30s, [this](TaskContext context) + { + DoCastSelf(SPELL_REFLECT); + context.Repeat(20s, 35s); + }); + } + + void JustDied(Unit* /*killer*/) override + { + me->RemoveAurasDueToSpell(SPELL_MARK_OF_FROST); + me->GetMap()->DoForAllPlayers([&](Player* p) + { + if (p->GetZoneId() == me->GetZoneId()) + { + + p->RemoveAurasDueToSpell(SPELL_MARK_OF_FROST); + p->RemoveAurasDueToSpell(SPELL_AURA_OF_FROST); + p->RemoveAurasDueToSpell(SPELL_CHILL); + p->RemoveAurasDueToSpell(SPELL_FROST_BREATH); + } + }); + } + + void UpdateAI(uint32 diff) override + { + if (!UpdateVictim()) + { + return; + } + + _scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); + } + + protected: + TaskScheduler _scheduler; + }; + + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) override + { + CloseGossipMenuFor(player); + creature->SetFaction(FACTION_ENEMY); + creature->AI()->AttackStart(player); + return true; + } + CreatureAI* GetAI(Creature* creature) const override { return new boss_azuregosAI(creature); } +}; - struct boss_azuregosAI : public ScriptedAI +// Arcane Vacuum: 21147 +class spell_arcane_vacuum : public SpellScript +{ + PrepareSpellScript(spell_arcane_vacuum); + + bool Validate(SpellInfo const* /*spellInfo*/) override { - boss_azuregosAI(Creature* creature) : ScriptedAI(creature) { } + return ValidateSpellInfo({ SPELL_ARCANE_VACUUM_TP }); + } - uint32 MarkOfFrostTimer; - uint32 ManaStormTimer; - uint32 ChillTimer; - uint32 BreathTimer; - uint32 TeleportTimer; - uint32 ReflectTimer; - uint32 CleaveTimer; - uint32 EnrageTimer; - bool Enraged; - - void Reset() override + void HandleOnHit() + { + Unit* caster = GetCaster(); + Unit* hitUnit = GetHitUnit(); + if (caster && hitUnit && hitUnit->ToPlayer()) { - MarkOfFrostTimer = 35000; - ManaStormTimer = urand(5000, 17000); - ChillTimer = urand(10000, 30000); - BreathTimer = urand(2000, 8000); - TeleportTimer = 30000; - ReflectTimer = urand(15000, 30000); - CleaveTimer = 7000; - EnrageTimer = 0; - Enraged = false; + caster->CastSpell(hitUnit, SPELL_ARCANE_VACUUM_TP, true); } + } - void EnterCombat(Unit* /*who*/) override { } + void Register() override + { + OnHit += SpellHitFn(spell_arcane_vacuum::HandleOnHit); + } +}; - void UpdateAI(uint32 diff) override +// Mark of Frost - Triggered Spell +class spell_mark_of_frost_freeze : public SpellScript +{ + PrepareSpellScript(spell_mark_of_frost_freeze); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_MARK_OF_FROST, SPELL_AURA_OF_FROST }); + } + + void HandleOnHit() + { + Unit* caster = GetCaster(); + Unit* hitUnit = GetHitUnit(); + if (caster && hitUnit && hitUnit->HasAura(SPELL_MARK_OF_FROST) && !hitUnit->HasAura(SPELL_AURA_OF_FROST)) { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (TeleportTimer <= diff) - { - Talk(SAY_TELEPORT); - ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); - for (auto i = threatlist.begin(); i != threatlist.end(); ++i) - { - Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()); - if (unit && (unit->GetTypeId() == TYPEID_PLAYER)) - { - DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 3, unit->GetOrientation()); - } - } - - DoResetThreat(); - TeleportTimer = 30000; - } - else TeleportTimer -= diff; - - // //MarkOfFrostTimer - // if (MarkOfFrostTimer <= diff) - // { - // DoCastVictim(SPELL_MARKOFFROST); - // MarkOfFrostTimer = 25000; - // } else MarkOfFrostTimer -= diff; - - //ChillTimer - if (ChillTimer <= diff) - { - DoCastVictim(SPELL_CHILL); - ChillTimer = urand(13000, 25000); - } - else ChillTimer -= diff; - - //BreathTimer - if (BreathTimer <= diff) - { - DoCastVictim(SPELL_FROSTBREATH); - BreathTimer = urand(10000, 15000); - } - else BreathTimer -= diff; - - //ManaStormTimer - if (ManaStormTimer <= diff) - { - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) - DoCast(target, SPELL_MANASTORM); - ManaStormTimer = urand(7500, 12500); - } - else ManaStormTimer -= diff; - - //ReflectTimer - if (ReflectTimer <= diff) - { - DoCast(me, SPELL_REFLECT); - ReflectTimer = urand(20000, 35000); - } - else ReflectTimer -= diff; - - //CleaveTimer - if (CleaveTimer <= diff) - { - DoCastVictim(SPELL_CLEAVE); - CleaveTimer = 7000; - } - else CleaveTimer -= diff; - - //EnrageTimer - if (HealthBelowPct(26) && !Enraged) - { - DoCast(me, SPELL_ENRAGE); - Enraged = true; - } - - DoMeleeAttackIfReady(); + hitUnit->CastSpell(hitUnit, SPELL_AURA_OF_FROST, true); } - }; + } + + void Register() override + { + OnHit += SpellHitFn(spell_mark_of_frost_freeze::HandleOnHit); + } }; void AddSC_boss_azuregos() { new boss_azuregos(); + RegisterSpellScript(spell_arcane_vacuum); + RegisterSpellScript(spell_mark_of_frost_freeze); }