fix(Scripts/Karazhan): Fix Shade of Aran Blizzard and use proper spel… (#17329)

* fix(Scripts/Karazhan): Fix Shade of Aran Blizzard and use proper spells to summon elementals * Update boss_shade_of_aran.cpp * Update boss_shade_of_aran.cpp * Update rev_1695546719351253200.sql * missing sql
2026-02-14 07:53:44 +00:00 · 2023-09-25 06:41:21 -03:00
parent 84d4d60cfc
commit 4a0b879ee3
3 changed files with 91 additions and 49 deletions
--- a/data/sql/updates/pending_db_world/rev_1695546719351253200.sql
+++ b/data/sql/updates/pending_db_world/rev_1695546719351253200.sql
@@ -0,0 +1,40 @@
+--
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` IN (29962, 37051, 37052, 37053, 29969));
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 29962, 0, 0, 31, 0, 3, 17172, 0, 0, 0, 0, '', 'Summon Water Elementals (29962) can only target Shade of Aran Teleport NE (17172)'),
+(13, 1, 37051, 0, 0, 31, 0, 3, 17175, 0, 0, 0, 0, '', 'Summon Water Elementals (37051) can only target Shade of Aran Teleport NW (17175)'),
+(13, 1, 37052, 0, 0, 31, 0, 3, 17174, 0, 0, 0, 0, '', 'Summon Water Elementals (37052) can only target Shade of Aran Teleport SW (17174)'),
+(13, 1, 37053, 0, 0, 31, 0, 3, 17173, 0, 0, 0, 0, '', 'Summon Water Elementals (37053) can only target Shade of Aran Teleport SE (17173)'),
+(13, 1, 29969, 0, 0, 31, 0, 3, 17161, 0, 0, 0, 0, '', 'Summon Blizzard (29969) can only target Blizzard (Shade of Aran) (17161)');
+
+SET @NPC := 135127;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-11179.069,`position_y`=-1903.9922,`position_z`=231.99551 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,-11179.069,-1903.9922,231.99551,NULL,0,0,0,100,0),
+(@PATH,2,-11175.637,-1898.6766,231.99551,NULL,0,0,0,100,0),
+(@PATH,3,-11170.077,-1896.4208,231.99551,NULL,0,0,0,100,0),
+(@PATH,4,-11163.756,-1896.4015,231.99551,NULL,0,0,0,100,0),
+(@PATH,5,-11157.39,-1897.875,231.99551,NULL,0,0,0,100,0),
+(@PATH,6,-11152.051,-1901.6866,231.99551,NULL,0,0,0,100,0),
+(@PATH,7,-11148.58,-1906.875,231.99551,NULL,0,0,0,100,0),
+(@PATH,8,-11148.341,-1914.24,231.99551,NULL,0,0,0,100,0),
+(@PATH,9,-11149.94,-1919.9163,231.99551,NULL,0,0,0,100,0),
+(@PATH,10,-11154.768,-1924.6886,231.99551,NULL,0,0,0,100,0),
+(@PATH,11,-11160.866,-1927.3403,231.99551,NULL,0,0,0,100,0),
+(@PATH,12,-11166.848,-1927.012,231.99551,NULL,0,0,0,100,0),
+(@PATH,13,-11173.295,-1925.4417,231.99551,NULL,0,0,0,100,0),
+(@PATH,14,-11178.082,-1922.4479,231.99551,NULL,0,0,0,100,0),
+(@PATH,15,-11180.802,-1915.3156,231.99551,NULL,0,0,0,100,0),
+(@PATH,16,-11181.109,-1909.6647,231.99551,NULL,0,0,0,100,0);
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 17161;
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 17161) AND (`source_type` = 0) AND (`id` IN (0, 1, 2));
+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
+(17161, 0, 0, 0, 8, 0, 100, 0, 29969, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blizzard (Shade of Aran) - On Spellhit \'Summon Blizzard\' - Set Event Phase 1'),
+(17161, 0, 1, 0, 60, 1, 100, 0, 1000, 1000, 2000, 2000, 0, 11, 29951, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blizzard (Shade of Aran) - On Update - Cast \'Blizzard\' (Phase 1)'),
+(17161, 0, 2, 0, 60, 1, 100, 0, 20000, 20000, 20000, 20000, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blizzard (Shade of Aran) - On Update - Set Event Phase 0 (Phase 1)');
--- a/src/server/game/Spells/SpellInfoCorrections.cpp
+++ b/src/server/game/Spells/SpellInfoCorrections.cpp
@@ -4574,6 +4574,12 @@ void SpellMgr::LoadSpellInfoCorrections()
        spellInfo->ProcChance = 3;
    });

+    // Summon Water Elementals
+    ApplySpellFix({ 29962, 37051, 37052, 37053 }, [](SpellInfo* spellInfo)
+    {
+        spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(13); // 50000yd
+    });
+
    for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i)
    {
        SpellInfo* spellInfo = mSpellInfoMap[i];
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -22,45 +22,52 @@
 #include "karazhan.h"
 #include "TaskScheduler.h"

-enum ShadeOfAran
+enum Texts
 {
-    SAY_AGGRO = 0,
+    SAY_AGGRO       = 0,
    SAY_FLAMEWREATH = 1,
-    SAY_BLIZZARD = 2,
-    SAY_EXPLOSION = 3,
-    SAY_DRINK = 4,
-    SAY_ELEMENTALS = 5,
-    SAY_KILL = 6,
-    SAY_TIMEOVER = 7,
-    SAY_DEATH = 8,
+    SAY_BLIZZARD    = 2,
+    SAY_EXPLOSION   = 3,
+    SAY_DRINK       = 4,
+    SAY_ELEMENTALS  = 5,
+    SAY_KILL        = 6,
+    SAY_TIMEOVER    = 7,
+    SAY_DEATH       = 8
+};

+enum Spells
+{
    //Spells
-    SPELL_FROSTBOLT = 29954,
-    SPELL_FIREBALL = 29953,
-    SPELL_ARCMISSLE = 29955,
-    SPELL_CHAINSOFICE = 29991,
-    SPELL_DRAGONSBREATH = 29964,
-    SPELL_MASSSLOW = 30035,
-    SPELL_FLAME_WREATH = 29946,
-    SPELL_AOE_CS = 29961,
-    SPELL_PLAYERPULL = 32265,
-    SPELL_AEXPLOSION = 29973,
-    SPELL_MASS_POLY = 29963,
-    SPELL_BLINK_CENTER = 29967,
-    SPELL_ELEMENTALS = 29962,
-    SPELL_CONJURE = 29975,
-    SPELL_DRINK = 30024,
-    SPELL_POTION = 32453,
-    SPELL_AOE_PYROBLAST = 29978,
+    SPELL_FROSTBOLT           = 29954,
+    SPELL_FIREBALL            = 29953,
+    SPELL_ARCMISSLE           = 29955,
+    SPELL_CHAINSOFICE         = 29991,
+    SPELL_DRAGONSBREATH       = 29964,
+    SPELL_MASSSLOW            = 30035,
+    SPELL_FLAME_WREATH        = 29946,
+    SPELL_AOE_CS              = 29961,
+    SPELL_PLAYERPULL          = 32265,
+    SPELL_AEXPLOSION          = 29973,
+    SPELL_MASS_POLY           = 29963,
+    SPELL_BLINK_CENTER        = 29967,
+    SPELL_CONJURE             = 29975,
+    SPELL_DRINK               = 30024,
+    SPELL_POTION              = 32453,
+    SPELL_AOE_PYROBLAST       = 29978,

-    //Creature Spells
-    SPELL_CIRCULAR_BLIZZARD = 29951,
-    SPELL_SHADOW_PYRO = 29978,
+    SPELL_SUMMON_WELEMENTAL_1 = 29962,
+    SPELL_SUMMON_WELEMENTAL_2 = 37051,
+    SPELL_SUMMON_WELEMENTAL_3 = 37052,
+    SPELL_SUMMON_WELEMENTAL_4 = 37053,

-    //Creatures
-    NPC_WATER_ELEMENTAL = 17167,
-    NPC_SHADOW_OF_ARAN = 18254,
-    NPC_ARAN_BLIZZARD = 17161,
+    SPELL_SUMMON_BLIZZARD     = 29969, // Activates the Blizzard NPC
+
+    SPELL_SHADOW_PYRO         = 29978
+};
+
+enum Creatures
+{
+    NPC_SHADOW_OF_ARAN  = 18254
 };

 enum SuperSpell
@@ -133,17 +140,11 @@ struct boss_shade_of_aran : public BossAI
        ScheduleHealthCheckEvent(40, [&]{
            Talk(SAY_ELEMENTALS);

-            for(Position pos : elementalPos)
+            std::vector<uint32> elementalSpells = { SPELL_SUMMON_WELEMENTAL_1, SPELL_SUMMON_WELEMENTAL_2, SPELL_SUMMON_WELEMENTAL_3, SPELL_SUMMON_WELEMENTAL_4 };
+
+            for (auto const& spell : elementalSpells)
            {
-                if(Creature* elemental = me->SummonCreature(NPC_WATER_ELEMENTAL, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000))
-                {
-                    if(Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true))
-                    {
-                        DoStartNoMovement(target);
-                        elemental->SetInCombatWithZone();
-                        elemental->CombatStart(target);
-                    }
-                }
+                DoCastAOE(spell, true);
            }
        });
    }
@@ -341,12 +342,7 @@ struct boss_shade_of_aran : public BossAI

                    case SUPER_BLIZZARD:
                        Talk(SAY_BLIZZARD);
-
-                        if (Creature* pSpawn = me->SummonCreature(NPC_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000))
-                        {
-                            pSpawn->SetFaction(me->GetFaction());
-                            pSpawn->CastSpell(me, SPELL_CIRCULAR_BLIZZARD, false);
-                        }
+                        DoCastAOE(SPELL_SUMMON_BLIZZARD);
                        break;
                }
            }