fix(Core/RuinsOfAhnQiraj): Kurinnaxx (#12522)

data/sql/updates/pending_db_world/rev_1658689583030214000.sql

@@ -0,0 +1,4 @@
+--
+UPDATE `gameobject_template` SET `ScriptName` = 'go_sand_trap' WHERE `entry` = 180647;
+
+UPDATE `creature_text` SET `TextRange` = 3 WHERE `CreatureID` = 15339 AND `GroupID` = 5;

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp

@@ -16,14 +16,16 @@
  */
 
 #include "CreatureTextMgr.h"
+#include "GameObjectAI.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "TaskScheduler.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Spells
 {
-    SPELL_MORTALWOUND       = 25646,
+    SPELL_MORTAL_WOUND      = 25646,
-    SPELL_SANDTRAP          = 25648,
+    SPELL_SAND_TRAP         = 25648,
     SPELL_ENRAGE            = 26527,
     SPELL_SUMMON_PLAYER     = 26446,
     SPELL_WIDE_SLASH        = 25814
@@ -32,31 +34,26 @@ enum Spells
 enum Events
 {
     EVENT_MORTAL_WOUND      = 1,
-    EVENT_SANDTRAP          = 2,
+    EVENT_SAND_TRAP         = 2,
     EVENT_WIDE_SLASH        = 3
 };
 
 enum Texts
 {
-    SAY_KURINAXX_DEATH      = 5 // Yell by 'Ossirian the Unscarred'
+    SAY_KURINNAXX_DEATH     = 5 // Yell by 'Ossirian the Unscarred'
 };
 
-class boss_kurinnaxx : public CreatureScript
+struct boss_kurinnaxx : public BossAI
 {
-public:
+    boss_kurinnaxx(Creature* creature) : BossAI(creature, DATA_KURINNAXX) {}
-    boss_kurinnaxx() : CreatureScript("boss_kurinnaxx") { }
-
-    struct boss_kurinnaxxAI : public BossAI
-    {
-        boss_kurinnaxxAI(Creature* creature) : BossAI(creature, DATA_KURINNAXX) {}
 
     void Reset() override
     {
-            _Reset();
+        BossAI::Reset();
         _enraged = false;
-            events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(8000, 10000));
+        events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s, 10s);
-            events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
+        events.ScheduleEvent(EVENT_SAND_TRAP, 5s, 15s);
-            events.ScheduleEvent(EVENT_WIDE_SLASH, urand(10000, 15000));
+        events.ScheduleEvent(EVENT_WIDE_SLASH, 10s, 15s);
     }
 
     void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
@@ -68,13 +65,18 @@ public:
         }
     }
 
-        void JustDied(Unit* /*killer*/) override
+    void JustDied(Unit* killer) override
     {
-            _JustDied();
+        if (killer)
-            if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetGuidData(DATA_OSSIRIAN)))
+            killer->GetMap()->LoadGrid(-9502.80f, 2042.65f); // Ossirian grid
+
+        if (Creature* ossirian = instance->GetCreature(DATA_OSSIRIAN))
         {
-                sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE);
+            ossirian->setActive(true);
+            if (ossirian->GetAI())
+                ossirian->AI()->Talk(SAY_KURINNAXX_DEATH);
         }
+        BossAI::JustDied(killer);
     }
 
     void UpdateAI(uint32 diff) override
@@ -92,37 +94,56 @@ public:
             switch (eventId)
             {
                 case EVENT_MORTAL_WOUND:
-                        DoCastVictim(SPELL_MORTALWOUND);
+                    DoCastVictim(SPELL_MORTAL_WOUND);
-                        events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(8000, 10000));
+                    events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s, 10s);
                     break;
-                    case EVENT_SANDTRAP:
+                case EVENT_SAND_TRAP:
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true))
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.f, true))
                     {
-                            target->CastSpell(target, SPELL_SANDTRAP, true);
+                        target->CastSpell(target, SPELL_SAND_TRAP, true, nullptr, nullptr, me->GetGUID());
                     }
-                        events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
+                    events.ScheduleEvent(EVENT_SAND_TRAP, 5s, 15s);
                     break;
                 case EVENT_WIDE_SLASH:
                     DoCastSelf(SPELL_WIDE_SLASH);
-                        events.ScheduleEvent(EVENT_WIDE_SLASH, urand(12000, 15000));
+                    events.ScheduleEvent(EVENT_WIDE_SLASH, 12s, 15s);
                     break;
                 default:
                     break;
             }
         }
+
         DoMeleeAttackIfReady();
     }
 private:
     bool _enraged;
 };
 
-    CreatureAI* GetAI(Creature* creature) const override
+struct go_sand_trap : public GameObjectAI
 {
-        return GetRuinsOfAhnQirajAI<boss_kurinnaxxAI>(creature);
+    go_sand_trap(GameObject* go) : GameObjectAI(go) { }
+
+    void Reset() override
+    {
+        _scheduler.Schedule(5s, [this](TaskContext /*context*/)
+        {
+            if (InstanceScript* instance = me->GetInstanceScript())
+                if (Creature* kurinnaxx = instance->GetCreature(DATA_KURINNAXX))
+                    me->Use(kurinnaxx);
+        });
     }
+
+    void UpdateAI(uint32 const diff) override
+    {
+        _scheduler.Update(diff);
+    }
+
+protected:
+    TaskScheduler _scheduler;
 };
 
 void AddSC_boss_kurinnaxx()
 {
-    new boss_kurinnaxx();
+    RegisterRuinsOfAhnQirajCreatureAI(boss_kurinnaxx);
+    RegisterGameObjectAI(go_sand_trap);
 }

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp

@@ -19,6 +19,12 @@
 #include "ScriptMgr.h"
 #include "ruins_of_ahnqiraj.h"
 
+ObjectData const creatureData[] =
+{
+    { NPC_OSSIRIAN,  DATA_OSSIRIAN },
+    { NPC_KURINNAXX, DATA_KURINNAXX }
+};
+
 class instance_ruins_of_ahnqiraj : public InstanceMapScript
 {
 public:
@@ -29,14 +35,17 @@ public:
         instance_ruins_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map)
         {
             SetBossNumber(NUM_ENCOUNTER);
+            LoadObjectData(creatureData, nullptr);
         }
 
         void OnCreatureCreate(Creature* creature) override
         {
+            InstanceScript::OnCreatureCreate(creature);
+
             switch (creature->GetEntry())
             {
-                case NPC_KURINAXX:
+                case NPC_KURINNAXX:
-                    _kurinaxxGUID = creature->GetGUID();
+                    _kurinnaxxGUID = creature->GetGUID();
                     break;
                 case NPC_RAJAXX:
                     _rajaxxGUID = creature->GetGUID();
@@ -75,7 +84,7 @@ public:
             switch (type)
             {
                 case DATA_KURINNAXX:
-                    return _kurinaxxGUID;
+                    return _kurinnaxxGUID;
                 case DATA_RAJAXX:
                     return _rajaxxGUID;
                 case DATA_MOAM:
@@ -137,7 +146,7 @@ public:
         }
 
     private:
-        ObjectGuid _kurinaxxGUID;
+        ObjectGuid _kurinnaxxGUID;
         ObjectGuid _rajaxxGUID;
         ObjectGuid _moamGUID;
         ObjectGuid _buruGUID;

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h

@@ -37,7 +37,7 @@ enum DataTypes
 
 enum Creatures
 {
-    NPC_KURINAXX                = 15348,
+    NPC_KURINNAXX               = 15348,
     NPC_RAJAXX                  = 15341,
     NPC_MOAM                    = 15340,
     NPC_BURU                    = 15370,
@@ -66,4 +66,6 @@ inline AI* GetRuinsOfAhnQirajAI(T* obj)
     return GetInstanceAI<AI>(obj, RuinsOfAhnQirajScriptName);
 }
 
+#define RegisterRuinsOfAhnQirajCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetRuinsOfAhnQirajAI)
+
 #endif