fix(Scripts/AhnKahet): Spawn Twilight Worshippers at Jedoga encounter… (#23800)

3 files changed, 27 insertions, 1 deletions

diff --git a/data/sql/updates/pending_db_world/rev_1763616362223549900.sql b/data/sql/updates/pending_db_world/rev_1763616362223549900.sql
new file mode 100644
index 0000000000..0274f8ca59
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1763616362223549900.sql
@@ -0,0 +1,13 @@
+--
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 29310 AND `summonerType` = 0 AND `groupId` = 2;
+INSERT INTO `creature_summon_groups`(`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`, `Comment`) VALUES
+(29310, 0, 2, 30111, 434.00433349609375, -702.8974609375, -17.9579715728759765, 3.124139308929443359, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 429.734161376953125, -712.18231201171875, -17.9568767547607421, 2.862339973449707031, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 388.307830810546875, -766.78399658203125, -17.9607582092285156, 2.094395160675048828, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 392.577484130859375, -765.63641357421875, -17.9589138031005859, 2.251474618911743164, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 381.83843994140625, -773.3897705078125, -17.9530143737792968, 1.762782573699951171, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 439.982635498046875, -699.070068359375, -17.9527797698974609, 3.193952560424804687, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 394.354156494140625, -760.810791015625, -17.9546241760253906, 2.443460941314697265, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 434.4365234375, -709.4752197265625, -17.961435317993164, 2.94960641860961914, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 387.0694580078125, -770.94964599609375, -17.957611083984375, 1.972222089767456054, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper'),
+(29310, 0, 2, 30111, 427.302093505859375, -717.3992919921875, -17.9517745971679687, 2.705260276794433593, 8, 0, 'Jedoga Shadowseeker - Twilight Worshipper');
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
index 8b1dd67366..c2ddd3b7e2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
@@ -44,6 +44,7 @@ enum AhnKahetCreatures
     NPC_AMANITAR                    = 30258,
     // Teldaram and Jedoga encounter related
     NPC_JEDOGA_CONTROLLER           = 30181,
+    NPC_TWILIGHT_WORSHIPPER         = 30111
 };
 
 enum AhnkahetSpells
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 adc26fcc97..6392a738ed 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -90,6 +90,7 @@ enum SummonGroups
 {
     SUMMON_GROUP_OOC                        = 0,
     SUMMON_GROUP_OOC_TRIGGERS               = 1,
+    SUMMON_GROUP_IC_WORSHIPPERS             = 2
 };
 
 enum Points
@@ -217,7 +218,7 @@ struct boss_jedoga_shadowseeker : public BossAI
 
     void JustSummoned(Creature* summon) override
     {
-        if (summon->GetEntry() == NPC_JEDOGA_CONTROLLER)
+        if (summon->EntryEquals(NPC_JEDOGA_CONTROLLER, NPC_TWILIGHT_WORSHIPPER))
         {
             summons.Summon(summon);
         }
@@ -326,6 +327,17 @@ struct boss_jedoga_shadowseeker : public BossAI
         _JustEngagedWith();
         Talk(SAY_AGGRO);
         ReschedulleCombatEvents();
+
+        std::list<TempSummon*> tempSummons;
+        me->SummonCreatureGroup(SUMMON_GROUP_IC_WORSHIPPERS, &tempSummons);
+        if (!tempSummons.empty())
+        {
+            for (TempSummon* summon : tempSummons)
+            {
+                if (summon)
+                    summon->SetStandState(UNIT_STAND_STATE_KNEEL);
+            }
+        }
     }
 
     void KilledUnit(Unit* who) override