chore(Scripts/SSC): Move Vashj summons to the new format (azerothcore…

…#21042)
hatersgit · Dec 26, 2024 · aa24f50 · aa24f50
1 parent 59f79b5
commit aa24f50
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -64,6 +64,15 @@ BossBoundaryData const boundaries =
     { DATA_LADY_VASHJ,             new CircleBoundary(Position(29.99f, -922.409f), 83.65f) }
 };
 
+ObjectData const summonData[] =
+{
+    { NPC_ENCHANTED_ELEMENTAL, DATA_LADY_VASHJ },
+    { NPC_COILFANG_ELITE,      DATA_LADY_VASHJ },
+    { NPC_COILFANG_STRIDER,    DATA_LADY_VASHJ },
+    { NPC_TAINTED_ELEMENTAL,   DATA_LADY_VASHJ },
+    { 0, 0 }
+};
+
 class instance_serpent_shrine : public InstanceMapScript
 {
 public:
@@ -81,6 +90,7 @@ class instance_serpent_shrine : public InstanceMapScript
             LoadObjectData(creatureData, gameObjectData);
             LoadMinionData(minionData);
             LoadBossBoundaries(boundaries);
+            LoadSummonData(summonData);
 
             _aliveKeepersCount = 0;
         }
@@ -125,13 +135,6 @@ class instance_serpent_shrine : public InstanceMapScript
                 case NPC_CYCLONE_KARATHRESS:
                     creature->GetMotionMaster()->MoveRandom(50.0f);
                     break;
-                case NPC_ENCHANTED_ELEMENTAL:
-                case NPC_COILFANG_ELITE:
-                case NPC_COILFANG_STRIDER:
-                case NPC_TAINTED_ELEMENTAL:
-                    if (Creature* vashj = GetCreature(DATA_LADY_VASHJ))
-                        vashj->AI()->JustSummoned(creature);
-                    break;
                 case NPC_SEER_OLUM:
                     creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
                     creature->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
@@ -148,15 +151,11 @@ class instance_serpent_shrine : public InstanceMapScript
             {
                 case DATA_PLATFORM_KEEPER_RESPAWNED:
                     if (_aliveKeepersCount < MAX_KEEPER_COUNT)
-                    {
                         ++_aliveKeepersCount;
-                    }
                     break;
                 case DATA_PLATFORM_KEEPER_DIED:
                     if (_aliveKeepersCount > MIN_KEEPER_COUNT)
-                    {
                         --_aliveKeepersCount;
-                    }
                     break;
                 case DATA_BRIDGE_ACTIVATED:
                     SetBossState(DATA_BRIDGE_EMERGED, NOT_STARTED);