Scripts/Hellfire Ramparts: Update Gargolmar (TrinityCore#31774)

Author: offl

sql/updates/world/3.3.5/2026_04_27_01_world.sql

@@ -0,0 +1,22 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 30642;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,30642,0,0,31,0,3,17309,0,0,0,0,"","Group 0: Spell 'Request Heal' (Effect 0) targets creature 'Hellfire Watcher'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 17309;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17309,0,0,"We are the true Horde!",12,0,100,0,0,0,16697,0,"Hellfire Watcher"),
+(17309,0,1,"For Kargath!  For Victory!",12,0,100,0,0,0,16698,0,"Hellfire Watcher"),
+(17309,0,2,"Gakarah ma!",12,0,100,0,0,0,16699,0,"Hellfire Watcher"),
+(17309,0,3,"The blood is our power! ",12,0,100,0,0,0,16700,0,"Hellfire Watcher"),
+(17309,0,4,"Lok'tar Illadari!\n",12,0,100,0,0,0,16701,0,"Hellfire Watcher"),
+(17309,0,5,"This world is OURS!",12,0,100,0,0,0,16702,0,"Hellfire Watcher"),
+(17309,0,6,"Lok narash!",12,0,100,0,0,0,16703,0,"Hellfire Watcher");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17309 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17309,0,0,0,4,0,15,0,0,0,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,0,"Hellfire Watcher - On Aggro - Say Line 0"),
+(17309,0,1,0,0,0,100,0,2400,6100,10500,23400,0,11,14032,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Hellfire Watcher - In Combat - Cast 'Shadow Word: Pain'"),
+(17309,0,2,0,74,0,100,0,0,50,20000,25000,40,11,8362,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Hellfire Watcher - On Friendly Between 0-50% Health - Cast 'Renew'"),
+(17309,0,3,0,74,0,100,0,0,40,12000,20000,40,11,12039,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Hellfire Watcher - On Friendly Between 0-40% Health - Cast 'Heal'"),
+(17309,0,4,0,8,0,100,0,30642,0,0,0,0,11,30643,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Hellfire Watcher - On Spellhit 'Request Heal' - Cast 'Heal'");

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp

@@ -15,8 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Missing adds to heal him
- * Surge should be used on target furthest away, not random */
+/*
+ * Timers requires to be revisited
+ */
 
 #include "ScriptMgr.h"
 #include "hellfire_ramparts.h"
@@ -36,16 +37,17 @@ enum GargolmarSpells
 {
     SPELL_MORTAL_WOUND     = 30641,
     SPELL_SURGE            = 34645,
+    SPELL_REQUEST_HEAL     = 30642,
     SPELL_RETALIATION      = 22857
 };
 
 enum GargolmarEvents
 {
-    EVENT_MORTAL_WOUND     = 1,
+    EVENT_TAUNT            = 1,
+    EVENT_MORTAL_WOUND,
     EVENT_SURGE,
-    EVENT_RETALIATION,
-    EVENT_TAUNT,
-    EVENT_HEAL
+    EVENT_REQUEST_HEAL,
+    EVENT_RETALIATION
 };
 
 enum GargolmarMisc
@@ -56,7 +58,7 @@ enum GargolmarMisc
 // 17306 - Watchkeeper Gargolmar
 struct boss_watchkeeper_gargolmar : public BossAI
 {
-    boss_watchkeeper_gargolmar(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR), _yelledForHeal(false), _retaliation(false) { }
+    boss_watchkeeper_gargolmar(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR), _hasRequestedHeal(false), _hasRetaliation(false) { }
 
     void JustAppeared() override
     {
@@ -67,37 +69,49 @@ struct boss_watchkeeper_gargolmar : public BossAI
     void Reset() override
     {
         _Reset();
-        _yelledForHeal = false;
-        _retaliation = false;
+        _hasRequestedHeal = false;
+        _hasRetaliation = false;
     }
 
     void JustEngagedWith(Unit* who) override
     {
-        Talk(SAY_AGGRO);
         BossAI::JustEngagedWith(who);
+
+        Talk(SAY_AGGRO);
+
         events.ScheduleEvent(EVENT_MORTAL_WOUND, 5s, 10s);
         events.ScheduleEvent(EVENT_SURGE, 3s, 5s);
     }
 
     void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
     {
-        if (!_yelledForHeal && me->HealthBelowPctDamaged(40, damage))
+        if (!_hasRequestedHeal && me->HealthBelowPctDamaged(40, damage))
         {
-            _yelledForHeal = true;
-            events.ScheduleEvent(EVENT_HEAL, 0s);
+            _hasRequestedHeal = true;
+            events.ScheduleEvent(EVENT_REQUEST_HEAL, 0s);
         }
-        if (!_retaliation && me->HealthBelowPctDamaged(20, damage))
+
+        if (!_hasRetaliation && me->HealthBelowPctDamaged(20, damage))
         {
-            _retaliation = true;
+            _hasRetaliation = true;
             events.ScheduleEvent(EVENT_RETALIATION, 0s);
         }
     }
 
-    void OnSpellCast(SpellInfo const* spell) override
+    void OnSpellCast(SpellInfo const* spellInfo) override
     {
-        if (spell->Id == SPELL_SURGE)
-            if (roll_chance_i(50))
-                Talk(SAY_SURGE);
+        switch (spellInfo->Id)
+        {
+            case SPELL_SURGE:
+                if (roll_chance_i(50))
+                    Talk(SAY_SURGE);
+                break;
+            case SPELL_REQUEST_HEAL:
+                Talk(SAY_HEAL);
+                break;
+            default:
+                break;
+        }
     }
 
     void KilledUnit(Unit* /*victim*/) override
@@ -128,6 +142,9 @@ struct boss_watchkeeper_gargolmar : public BossAI
 
         events.Update(diff);
 
+        if (me->HasUnitState(UNIT_STATE_CASTING))
+            return;
+
         while (uint32 eventId = events.ExecuteEvent())
         {
             switch (eventId)
@@ -137,28 +154,31 @@ struct boss_watchkeeper_gargolmar : public BossAI
                     events.Repeat(5s, 15s);
                     break;
                 case EVENT_SURGE:
-                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
+                    if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0))
                         DoCast(target, SPELL_SURGE);
                     events.Repeat(15s, 40s);
                     break;
+                case EVENT_REQUEST_HEAL:
+                    DoCastSelf(SPELL_REQUEST_HEAL);
+                    break;
                 case EVENT_RETALIATION:
                     DoCastSelf(SPELL_RETALIATION);
                     events.Repeat(30s);
                     break;
-                case EVENT_HEAL:
-                    Talk(SAY_HEAL);
-                    break;
                 default:
                     break;
             }
+
+            if (me->HasUnitState(UNIT_STATE_CASTING))
+                return;
         }
 
         DoMeleeAttackIfReady();
     }
 
 private:
-    bool _yelledForHeal;
-    bool _retaliation;
+    bool _hasRequestedHeal;
+    bool _hasRetaliation;
 };
 
 void AddSC_boss_watchkeeper_gargolmar()