Scripts/Slave Pens: Update scripts (TrinityCore#31918)

Author: offl

src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp

@@ -15,6 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
@@ -52,12 +56,14 @@ struct boss_mennu_the_betrayer : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s, 40s);
-        events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20s, 30s);
-        events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 20s, 30s);
+
+        Talk(SAY_AGGRO);
+
+        events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 15s, 20s);
+        events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 25s, 40s);
+        events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 25s, 35s);
         events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, 15s, 25s);
         events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 10s, 20s);
-        Talk(SAY_AGGRO);
     }
 
     void KilledUnit(Unit* /*victim*/) override
@@ -87,19 +93,19 @@ struct boss_mennu_the_betrayer : public BossAI
             {
                 case EVENT_TAINTED_STONESKIN_TOTEM:
                     DoCastSelf(SPELL_TAINTED_STONESKIN_TOTEM);
-                    events.Repeat(35s, 40s);
+                    events.Repeat(30s, 35s);
                     break;
                 case EVENT_TAINTED_EARTHGRAB_TOTEM:
                     DoCastSelf(SPELL_TAINTED_EARTHGRAB_TOTEM);
-                    events.Repeat(35s, 40s);
+                    events.Repeat(30s, 40s);
                     break;
                 case EVENT_CORRUPTED_NOVA_TOTEM:
                     DoCastSelf(SPELL_CORRUPTED_NOVA_TOTEM);
                     events.Repeat(35s, 40s);
                     break;
                 case EVENT_MENNUS_HEALING_WARD:
                     DoCastSelf(SPELL_MENNUS_HEALING_WARD);
-                    events.Repeat(35s, 40s);
+                    events.Repeat(15s, 25s);
                     break;
                 case EVENT_LIGHTNING_BOLT:
                     DoCastVictim(SPELL_LIGHTNING_BOLT);

src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp

@@ -15,6 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
@@ -43,10 +47,11 @@ struct boss_quagmirran : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_ACID_SPRAY, 25s);
-        events.ScheduleEvent(EVENT_CLEAVE, 9s);
-        events.ScheduleEvent(EVENT_UPPERCUT, 20s);
-        events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31s);
+
+        events.ScheduleEvent(EVENT_ACID_SPRAY, 20s, 35s);
+        events.ScheduleEvent(EVENT_CLEAVE, 8s, 20s);
+        events.ScheduleEvent(EVENT_UPPERCUT, 20s, 35s);
+        events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 20s, 30s);
     }
 
     void UpdateAI(uint32 diff) override
@@ -64,21 +69,21 @@ struct boss_quagmirran : public BossAI
             switch (eventId)
             {
                 case EVENT_ACID_SPRAY:
-                    DoCastAOE(SPELL_ACID_SPRAY);
-                    events.Repeat(20s, 25s);
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f))
+                        DoCast(target, SPELL_ACID_SPRAY);
+                    events.Repeat(40s, 50s);
                     break;
                 case EVENT_CLEAVE:
                     DoCastVictim(SPELL_CLEAVE);
-                    events.Repeat(18s, 34s);
+                    events.Repeat(20s, 25s);
                     break;
                 case EVENT_UPPERCUT:
-                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 10.0f, true))
-                    DoCast(target, SPELL_UPPERCUT);
-                    events.Repeat(22s);
+                    DoCastVictim(SPELL_UPPERCUT);
+                    events.Repeat(20s, 30s);
                     break;
                 case EVENT_POISON_BOLT_VOLLEY:
                     DoCastSelf(SPELL_POISON_BOLT_VOLLEY);
-                    events.Repeat(24s);
+                    events.Repeat(20s, 35s);
                     break;
                 default:
                     break;

src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp

@@ -15,6 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "the_slave_pens.h"
@@ -49,14 +53,15 @@ struct boss_rokmar_the_crackler : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10s);
-        events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s);
-        events.ScheduleEvent(EVENT_WATER_SPIT, 14s);
+
+        events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10s, 25s);
+        events.ScheduleEvent(EVENT_ENSNARING_MOSS, 10s, 25s);
+        events.ScheduleEvent(EVENT_WATER_SPIT, 5s, 20s);
     }
 
     void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
     {
-        if (!_frenzied && me->HealthBelowPctDamaged(10, damage))
+        if (!_frenzied && me->HealthBelowPctDamaged(20, damage))
         {
             _frenzied = true;
             events.ScheduleEvent(EVENT_FRENZY, 0s);
@@ -82,12 +87,13 @@ struct boss_rokmar_the_crackler : public BossAI
                     events.Repeat(20s, 30s);
                     break;
                 case EVENT_ENSNARING_MOSS:
-                    DoCastAOE(SPELL_ENSNARING_MOSS);
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
+                        DoCast(target, SPELL_ENSNARING_MOSS);
                     events.Repeat(20s, 30s);
                     break;
                 case EVENT_WATER_SPIT:
                     DoCastAOE(SPELL_WATER_SPIT);
-                    events.Repeat(14s, 18s);
+                    events.Repeat(10s, 25s);
                     break;
                 case EVENT_FRENZY:
                     DoCastSelf(SPELL_FRENZY);