Merge ca10c7cbe245745719395be58077b8b5bd14dd6e into 835283bf26b02bd3c6e88505b123ad65aa9d0e98

Referenced commit(s): 96e7a20bd9325618b7adbd1381aa4e0e50bdba23

apps/codestyle/codestyle-sql.py

@@ -234,7 +234,7 @@ def backtick_check(file: io, file_path: str) -> None:
                 # Skip SQL keywords
                 if word.upper() in {"SELECT", "FROM", "JOIN", "WHERE", "GROUP", "BY", "ORDER", 
                                     "DELETE", "UPDATE", "INSERT", "INTO", "SET", "VALUES", "AND",
-                                    "IN", "OR", "REPLACE"}:
+                                    "IN", "OR", "REPLACE", "NOT"}:
                     continue
 
                 # Make sure the word is enclosed in backticks

data/sql/updates/db_world/2025_02_24_00.sql

@@ -0,0 +1,3 @@
+-- DB update 2025_02_22_00 -> 2025_02_24_00
+--
+UPDATE `creature_template` SET `flags_extra` = `flags_extra`|512|2147483648 WHERE `entry` = 25038;

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -633,6 +633,7 @@ void BossAI::_Reset()
     me->ResetLootMode();
     events.Reset();
     scheduler.CancelAll();
+    me->m_Events.KillAllEvents(false);
     summons.DespawnAll();
     ClearUniqueTimedEventsDone();
     _healthCheckEvents.clear();
@@ -787,6 +788,20 @@ void BossAI::ScheduleHealthCheckEvent(std::initializer_list<uint8> healthPct, st
     _nextHealthCheck = _healthCheckEvents.front();
 }
 
+void BossAI::ScheduleEnrageTimer(uint32 spellId, Milliseconds timer, uint8 textId /*= 0*/)
+{
+    me->m_Events.AddEventAtOffset([this, spellId, textId]
+    {
+        if (!me->IsAlive())
+            return;
+
+        if (textId)
+            Talk(textId);
+
+        DoCastSelf(spellId, true);
+    }, timer);
+}
+
 // WorldBossAI - for non-instanced bosses
 
 WorldBossAI::WorldBossAI(Creature* creature) :

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -485,6 +485,12 @@ public:
     void ScheduleHealthCheckEvent(uint32 healthPct, std::function<void()> exec);
     void ScheduleHealthCheckEvent(std::initializer_list<uint8> healthPct, std::function<void()> exec);
 
+    // @brief Casts the spell after the fixed time and says the text id if provided. Timer will run even if the creature is casting or out of combat.
+    // @param spellId The spell to cast.
+    // @param timer The time to wait before casting the spell.
+    // @param textId The text id to say.
+    void ScheduleEnrageTimer(uint32 spellId, Milliseconds timer, uint8 textId = 0);
+
     // Hook used to execute events scheduled into EventMap without the need
     // to override UpdateAI
     // note: You must re-schedule the event within this method if the event

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp

@@ -83,7 +83,6 @@ struct boss_sacrolash : public BossAI
         _isSisterDead = false;
         BossAI::Reset();
         me->SetLootMode(0);
-        me->m_Events.KillAllEvents(false);
     }
 
     void DoAction(int32 param) override
@@ -124,10 +123,7 @@ struct boss_sacrolash : public BossAI
             if (alythess->IsAlive() && !alythess->IsInCombat())
                 alythess->AI()->AttackStart(who);
 
-        me->m_Events.AddEventAtOffset([&] {
-            Talk(YELL_BERSERK);
-            DoCastSelf(SPELL_ENRAGE, true);
-        }, 6min);
+        ScheduleEnrageTimer(SPELL_ENRAGE, 6min, YELL_BERSERK);
 
         ScheduleTimedEvent(10s, [&] {
             DoCastSelf(SPELL_SHADOW_BLADES);
@@ -195,7 +191,6 @@ struct boss_alythess : public BossAI
         _isSisterDead = false;
         BossAI::Reset();
         me->SetLootMode(0);
-        me->m_Events.KillAllEvents(false);
     }
 
     void DoAction(int32 param) override
@@ -236,10 +231,7 @@ struct boss_alythess : public BossAI
             if (sacrolash->IsAlive() && !sacrolash->IsInCombat())
                 sacrolash->AI()->AttackStart(who);
 
-        me->m_Events.AddEventAtOffset([&] {
-            Talk(YELL_BERSERK);
-            DoCastSelf(SPELL_ENRAGE, true);
-        }, 6min);
+        ScheduleEnrageTimer(SPELL_ENRAGE, 6min, YELL_BERSERK);
 
         ScheduleTimedEvent(1s, [&] {
             DoCastVictim(SPELL_BLAZE);

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp

@@ -134,7 +134,7 @@ struct boss_felmyst : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        me->CastSpell(me, SPELL_NOXIOUS_FUMES, true);
+
         me->m_Events.AddEventAtOffset([&] {
             Talk(YELL_BERSERK);
             DoCastSelf(SPELL_BERSERK, true);
@@ -144,7 +144,7 @@ struct boss_felmyst : public BossAI
 
         Position landPos = who->GetPosition();
         me->m_Events.AddEventAtOffset([&, landPos] {
-            me->GetMotionMaster()->MovePoint(POINT_GROUND, landPos, false, true);
+            me->GetMotionMaster()->MoveLand(POINT_GROUND, landPos);
         }, 2s);
     }
 
@@ -168,11 +168,14 @@ struct boss_felmyst : public BossAI
 
     void MovementInform(uint32 type, uint32 point) override
     {
-        if (type != POINT_MOTION_TYPE)
+        if (type != EFFECT_MOTION_TYPE && type != POINT_MOTION_TYPE)
             return;
 
         if (point == POINT_GROUND)
         {
+            if (!me->HasAura(SPELL_NOXIOUS_FUMES))
+                DoCastSelf(SPELL_NOXIOUS_FUMES, true);
+
             me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
             me->SetCanFly(false);
             me->SetDisableGravity(false);

src/server/scripts/Spells/spell_druid.cpp

@@ -64,7 +64,14 @@ enum DruidSpells
 
 enum DruidIcons
 {
-    SPELL_ICON_REVITALIZE                   = 2862
+    SPELL_ICON_REVITALIZE                   = 2862,
+    SPELL_ICON_FUROR                        = 210,
+    SPELL_ICON_MOONKINAURA                  = 46, // SpellId: 24907
+    SPELL_ICON_MASTER_SHAPESHIFTER          = 2851, // SpellId: 48421
+    SPELL_ICON_NURTURING_INSTINCT           = 2254, // SpellId: 47180
+    SPELL_ICON_FERAL_SWIFTNESS_PASSIVE_2A   = 67, // SpellId: 24864
+    SPELL_ICON_LEADER_OF_THE_PACK           = 312, //SpellId: 24932
+    SPELL_ICON_TREE_OF_LIFE                 = 2257 //SpellId: 34123
 };
 
 // 1178 - Bear Form (Passive)
@@ -223,6 +230,24 @@ class spell_dru_omen_of_clarity : public AuraScript
             if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID)
             {
                 // Exclude shapeshifting
+                if (spellInfo->SpellIconID == SPELL_ICON_MOONKINAURA)
+                    return false;
+
+                if (spellInfo->SpellIconID == SPELL_ICON_MASTER_SHAPESHIFTER)
+                    return false;
+
+                if (spellInfo->SpellIconID == SPELL_ICON_NURTURING_INSTINCT)
+                    return false;
+
+                if (spellInfo->SpellIconID == SPELL_ICON_FERAL_SWIFTNESS_PASSIVE_2A)
+                    return false;
+
+                if (spellInfo->SpellIconID == SPELL_ICON_LEADER_OF_THE_PACK)
+                    return false;
+
+                if (spellInfo->SpellIconID == SPELL_ICON_TREE_OF_LIFE)
+                    return false;
+
                 return !spellInfo->HasAura(SPELL_AURA_MOD_SHAPESHIFT);
             }
 
@@ -235,6 +260,12 @@ class spell_dru_omen_of_clarity : public AuraScript
             return false;
         }
 
+        // Furor 210
+        if (spellInfo->SpellIconID == SPELL_ICON_FUROR)
+        {
+            return false;
+        }
+
         return true;
     }