Merge pull request #10 from elthehablo/akama-reset

Akama reset
elthehablo · Sep 28, 2024 · 7314458 · 7314458
2 parents 8bf3595 + 0a78475
commit 7314458
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/data/sql/updates/db_world/2024_09_28_01.sql b/data/sql/updates/db_world/2024_09_28_01.sql
@@ -0,0 +1,3 @@
+-- DB update 2024_09_28_00 -> 2024_09_28_01
+--
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & ~2048 WHERE (`entry` = 22056);
diff --git a/data/sql/updates/pending_db_world/super-healing-extra.sql b/data/sql/updates/pending_db_world/super-healing-extra.sql
@@ -0,0 +1,2 @@
+DELETE FROM `skill_extra_item_template` WHERE `spellId` = 28551;
+INSERT INTO `skill_extra_item_template` (`spellId`, `requiredSpecialization`, `additionalCreateChance`, `additionalMaxNum`) VALUES (28551, 28675, 14, 4);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -105,10 +105,12 @@ struct boss_shade_of_akama : public BossAI
     {
         channelers.clear();
         generators.clear();
-
+        allPlayersInactive = false;
         me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
         me->SetWalk(true);
         me->SetReactState(REACT_DEFENSIVE);
+        CreaturesAttackAkama();
+        _shadeMinionList.clear();
         BossAI::Reset();
     }
 
@@ -196,8 +198,24 @@ struct boss_shade_of_akama : public BossAI
 
         DoMeleeAttackIfReady();
     }
+
+    void CreaturesAttackAkama()
+    {
+        // populate list of creatures to keep attacking Akama
+        me->GetCreaturesWithEntryInRange(_shadeMinionList, 100.0f, NPC_ASHTONGUE_SPIRITBIND);
+        me->GetCreaturesWithEntryInRange(_shadeMinionList, 100.0f, NPC_ASHTONGUE_DEFENDER);
+        me->GetCreaturesWithEntryInRange(_shadeMinionList, 100.0f, NPC_ASHTONGUE_ELEMENTAL);
+        me->GetCreaturesWithEntryInRange(_shadeMinionList, 100.0f, NPC_ASHTONGUE_ROGUE);
+        for (Creature* minion : _shadeMinionList)
+            if (minion->IsAlive())
+                minion->SetInCombatWith(instance->GetCreature(DATA_AKAMA_SHADE));
+    }
+private:
+    std::list<Creature* > _shadeMinionList;
+    bool allPlayersInactive;
 };
 
+
 struct npc_akama_shade : public ScriptedAI
 {
     npc_akama_shade(Creature* creature) : ScriptedAI(creature)
@@ -222,6 +240,7 @@ struct npc_akama_shade : public ScriptedAI
         _sayLowHealth = false;
         _died = false;
         scheduler.CancelAll();
+        _generators.clear();
     }
 
     void MovementInform(uint32 type, uint32 point) override
@@ -279,6 +298,11 @@ struct npc_akama_shade : public ScriptedAI
         else if (damage >= me->GetHealth() && !_died)
         {
             _died = true;
+            me->GetCreatureListWithEntryInGrid(_generators, NPC_CREATURE_GENERATOR_AKAMA, 150.0f);
+            me->Yell(std::to_string(_generators.size()), LANG_UNIVERSAL);
+            for (Creature* generator : _generators)
+                generator->AI()->DoAction(ACTION_GENERATOR_DESPAWN_ALL);
+
             damage = me->GetHealth() - 1;
             Talk(SAY_DEATH);
             if (Creature* shade = instance->GetCreature(DATA_SHADE_OF_AKAMA))
@@ -342,6 +366,7 @@ struct npc_akama_shade : public ScriptedAI
     private:
         bool _sayLowHealth;
         bool _died;
+        std::list<Creature *> _generators;
 };
 
 struct npc_creature_generator_akama : public ScriptedAI
@@ -355,14 +380,14 @@ struct npc_creature_generator_akama : public ScriptedAI
 
     void Reset() override
     {
-        summons.DespawnAll();
         scheduler.CancelAll();
     }
 
     void JustSummoned(Creature* summon) override
     {
         spawnCounter++;
         ScriptedAI::JustSummoned(summon);
+        summons.Summon(summon);
 
         switch (summon->GetEntry())
         {
@@ -374,14 +399,11 @@ struct npc_creature_generator_akama : public ScriptedAI
                 summon->GetMotionMaster()->MovePoint(POINT_ENGAGE, x, y, z);
             }
             break;
-        case NPC_ASHTONGUE_DEFENDER:
+        default:
             summon->SetFaction(FACTION_DEFENDER);
             if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE))
                 summon->AI()->AttackStart(akama);
             break;
-        default:
-            summon->SetInCombatWithZone();
-            break;
         }
     }