Scripts/Botanica: Update scripts

Author: offl

sql/updates/world/3.3.5/2026_08_140_00_world.sql

@@ -0,0 +1,6 @@
+--
+UPDATE `spell_target_position` SET `Orientation` = 0.017453 WHERE `ID` = 34673;
+UPDATE `spell_target_position` SET `Orientation` = 0.070336774 WHERE `ID` = 34681;
+UPDATE `spell_target_position` SET `Orientation` = 0.506146 WHERE `ID` = 34682;
+UPDATE `spell_target_position` SET `Orientation` = 5.9257417 WHERE `ID` = 34684;
+UPDATE `spell_target_position` SET `Orientation` = 6.126106 WHERE `ID` = 34685;

src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.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 "SpellInfo.h"
@@ -50,7 +54,7 @@ enum SarannisEvents
     EVENT_SUMMON_REINFORCEMENTS
 };
 
-uint32 const SummonReinforcementsSpells[] =
+static constexpr std::array<uint32, 4> SummonReinforcementsSpells =
 {
     SPELL_SUMMON_MENDER_1, SPELL_SUMMON_RESERVIST_1, SPELL_SUMMON_RESERVIST_2, SPELL_SUMMON_RESERVIST_3
 };
@@ -69,10 +73,11 @@ struct boss_commander_sarannis : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
+
         Talk(SAY_AGGRO);
 
         // This is definitely just timed, not scheduled instantly when victim has specific amount of stacks of Arcane Resonance
-        events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, RAND(10s, 15s, 20s, 25s, 30s, 35s));
+        events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 10s, 20s);
         // Timed in heroic (repeatable), on HP PTC in normal (not repeatable)
         if (IsHeroic())
             events.ScheduleEvent(EVENT_SUMMON_REINFORCEMENTS, 1min);
@@ -87,20 +92,26 @@ struct boss_commander_sarannis : public BossAI
         }
     }
 
-    void OnSpellStart(SpellInfo const* spell) override
+    void OnSpellStart(SpellInfo const* spellInfo) override
     {
-        if (spell->Id == SPELL_SUMMON_REINFORCEMENTS)
+        if (spellInfo->Id == SPELL_SUMMON_REINFORCEMENTS)
             Talk(EMOTE_SUMMON);
     }
 
-    void OnSpellCast(SpellInfo const* spell) override
+    void OnSpellCast(SpellInfo const* spellInfo) override
     {
-        // Not always?
-        if (spell->Id == SPELL_ARCANE_DEVASTATION)
-            Talk(SAY_ARCANE_DEVASTATION);
-
-        if (spell->Id == SPELL_SUMMON_REINFORCEMENTS)
-            Talk(SAY_SUMMON);
+        switch (spellInfo->Id)
+        {
+            case SPELL_ARCANE_DEVASTATION:
+                // Not always?
+                Talk(SAY_ARCANE_DEVASTATION);
+                break;
+            case SPELL_SUMMON_REINFORCEMENTS:
+                Talk(SAY_SUMMON);
+                break;
+            default:
+                break;
+        }
     }
 
     // Do not despawn them
@@ -138,7 +149,7 @@ struct boss_commander_sarannis : public BossAI
                 case EVENT_ARCANE_DEVASTATION:
                     // She can cast it if victim has only one stack of Arcane Resonance but can she cast it if victim has no stacks?
                     DoCastVictim(SPELL_ARCANE_DEVASTATION);
-                    events.Repeat(RAND(10s, 15s, 20s, 25s, 30s, 35s));
+                    events.Repeat(10s, 20s);
                     break;
                 case EVENT_SUMMON_REINFORCEMENTS:
                     DoCastSelf(SPELL_SUMMON_REINFORCEMENTS);
@@ -165,7 +176,7 @@ class spell_commander_sarannis_arcane_devastation : public AuraScript
 {
     PrepareAuraScript(spell_commander_sarannis_arcane_devastation);
 
-    bool Validate(SpellInfo const* /*spell*/) override
+    bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ARCANE_RESONANCE });
     }
@@ -194,8 +205,8 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScript
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         Unit* caster = GetCaster();
-        for (uint32 spells : SummonReinforcementsSpells)
-            caster->CastSpell(caster, spells, true);
+        for (uint32 spell : SummonReinforcementsSpells)
+            caster->CastSpell(nullptr, spell, true);
     }
 
     void Register() override

src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp

@@ -31,13 +31,13 @@ enum FreywinnTexts
 
 enum FreywinnSpells
 {
-    SPELL_TRANQUILITY          = 34550,
-    SPELL_TREE_FORM            = 34551,
-    SPELL_SUMMON_FRAYER        = 34557,
     SPELL_PLANT_WHITE          = 34759,
     SPELL_PLANT_GREEN          = 34761,
     SPELL_PLANT_BLUE           = 34762,
     SPELL_PLANT_RED            = 34763,
+    SPELL_TREE_FORM            = 34551,
+    SPELL_SUMMON_FRAYER        = 34557,
+    SPELL_TRANQUILITY          = 34550,
     SPELL_CANCEL_TRANQUILITY   = 34777
 };
 
@@ -62,7 +62,9 @@ struct boss_high_botanist_freywinn : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
+
         Talk(SAY_AGGRO);
+
         events.ScheduleEvent(EVENT_PLANT_SEEDLING, 6s);
         events.ScheduleEvent(EVENT_TREE_FORM, 30s);
     }
@@ -74,6 +76,17 @@ struct boss_high_botanist_freywinn : public BossAI
             DoZoneInCombat(summon);
     }
 
+    void OnSpellCast(SpellInfo const* spellInfo) override
+    {
+        if (spellInfo->Id == SPELL_TREE_FORM)
+        {
+            _frayersKilled = 0;
+            Talk(SAY_TREE);
+            DoCastSelf(SPELL_SUMMON_FRAYER);
+            events.ScheduleEvent(EVENT_TRANQUILITY, 1s);
+        }
+    }
+
     void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override
     {
         // Completely guessed, may be actually not used
@@ -120,14 +133,8 @@ struct boss_high_botanist_freywinn : public BossAI
                     events.Repeat(6s);
                     break;
                 case EVENT_TREE_FORM:
-                    // Reset counter in case not all frayers were killed and tree phase was ended, otherwise next time it will be enough to
-                    // kill only 1 or 2 to stop phase. It's an edge case, quite possible it was not even supported
-                    _frayersKilled = 0;
-                    Talk(SAY_TREE);
-                    DoCastSelf(SPELL_SUMMON_FRAYER);
                     DoCastSelf(SPELL_TREE_FORM);
                     events.Repeat(60s);
-                    events.ScheduleEvent(EVENT_TRANQUILITY, 1s);
                     break;
                 case EVENT_TRANQUILITY:
                     DoCastSelf(SPELL_TRANQUILITY);

src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp

@@ -15,7 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
+#include "Containers.h"
 #include "ScriptedCreature.h"
 #include "the_botanica.h"
 
@@ -44,9 +49,9 @@ enum LajSpells
 
 enum LajEvents
 {
-    EVENT_TELEPORT             = 1,
-    EVENT_EMOTE,
-    EVENT_SUMMON,
+    EVENT_SEQUENCE_1             = 1,
+    EVENT_SEQUENCE_2,
+    EVENT_SEQUENCE_3,
     EVENT_ALLERGIC_REACTION,
     EVENT_TRANSFORM,
     EVENT_THRASH
@@ -55,18 +60,22 @@ enum LajEvents
 // 17980 - Laj
 struct boss_laj : public BossAI
 {
-    boss_laj(Creature* creature) : BossAI(creature, DATA_LAJ), _activeTransformAura(0) { }
+    boss_laj(Creature* creature) : BossAI(creature, DATA_LAJ), _lastTransformSpell(0), _isFirstTransform(true) { }
 
     void Reset() override
     {
         _Reset();
-        _activeTransformAura = 0;
+        _lastTransformSpell = 0;
+        _isFirstTransform = true;
+
+        me->SetReactState(REACT_AGGRESSIVE);
     }
 
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_TELEPORT, 15s, 25s);
+
+        events.ScheduleEvent(EVENT_SEQUENCE_1, 15s, 25s);
         events.ScheduleEvent(EVENT_ALLERGIC_REACTION, 10s, 20s);
         events.ScheduleEvent(EVENT_TRANSFORM, 20s, 30s);
         events.ScheduleEvent(EVENT_THRASH, 0s, 10s);
@@ -94,24 +103,22 @@ struct boss_laj : public BossAI
             switch (eventId)
             {
                 // Teleport sequence
-                case EVENT_TELEPORT:
+                case EVENT_SEQUENCE_1:
                     DoCastSelf(SPELL_TELEPORT_SELF);
                     me->SetReactState(REACT_PASSIVE);
                     events.Repeat(25s, 40s);
-                    events.ScheduleEvent(EVENT_EMOTE, 2s);
+                    events.ScheduleEvent(EVENT_SEQUENCE_2, 2s);
                     break;
-                case EVENT_EMOTE:
+                case EVENT_SEQUENCE_2:
                     Talk(EMOTE_SUMMON);
-                    events.ScheduleEvent(EVENT_SUMMON, 1s);
+                    events.ScheduleEvent(EVENT_SEQUENCE_3, 1s);
                     break;
-                case EVENT_SUMMON:
-                    // He can summon 2 creatures of one type or 2 different. He always spawns them at 2 platforms(despite there are 4 in the room)
-                    // Even if he uses other 4 spells, that does not make sense because the only difference between them is spells entries
-                    // Best guess other spells were added on early development stage for second pair of platforms and were never used on live
-                    DoCastSelf(RAND(SPELL_SUMMON_LASHER_1, SPELL_SUMMON_FLAYER_1), true);
-                    DoCastSelf(RAND(SPELL_SUMMON_LASHER_2, SPELL_SUMMON_FLAYER_2), true);
+                case EVENT_SEQUENCE_3:
+                    DoCastSelf(RAND(SPELL_SUMMON_LASHER_1, SPELL_SUMMON_FLAYER_1));
+                    DoCastSelf(RAND(SPELL_SUMMON_LASHER_2, SPELL_SUMMON_FLAYER_2));
                     me->SetReactState(REACT_AGGRESSIVE);
                     break;
+
                 // Abilities
                 case EVENT_ALLERGIC_REACTION:
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 8.f))
@@ -120,13 +127,25 @@ struct boss_laj : public BossAI
                     break;
                 case EVENT_TRANSFORM:
                 {
-                    /// @todo: Don't apply same aura twice in a row and don't transform to shadow if the event is executed first time
-                    if (_activeTransformAura)
-                        me->RemoveAurasDueToSpell(_activeTransformAura);
+                    std::vector<uint32> transformSpells = { SPELL_TRANSFORM_ARCANE, SPELL_TRANSFORM_FIRE, SPELL_TRANSFORM_FROST, SPELL_TRANSFORM_NATURE, SPELL_TRANSFORM_SHADOW };
+
+                    if (_isFirstTransform)
+                    {
+                        std::erase(transformSpells, SPELL_TRANSFORM_SHADOW);
+                        _isFirstTransform = false;
+                    }
+
+                    if (_lastTransformSpell)
+                    {
+                        std::erase(transformSpells, _lastTransformSpell);
+                        me->RemoveAurasDueToSpell(_lastTransformSpell);
+                    }
+
+                    uint32 selectedSpell = Trinity::Containers::SelectRandomContainerElement(transformSpells);
+
+                    _lastTransformSpell = selectedSpell;
 
-                    uint32 spell = RAND(SPELL_TRANSFORM_ARCANE, SPELL_TRANSFORM_FIRE, SPELL_TRANSFORM_FROST, SPELL_TRANSFORM_NATURE, SPELL_TRANSFORM_SHADOW);
-                    DoCastSelf(spell);
-                    _activeTransformAura = spell;
+                    DoCastSelf(selectedSpell);
                     events.Repeat(25s, 45s);
                     break;
                 }
@@ -146,7 +165,8 @@ struct boss_laj : public BossAI
     }
 
 private:
-    uint32 _activeTransformAura;
+    uint32 _lastTransformSpell;
+    bool _isFirstTransform;
 };
 
 void AddSC_boss_laj()

src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.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 "SpellInfo.h"
@@ -81,24 +85,26 @@ struct boss_thorngrin_the_tender : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
+
         Talk(SAY_AGGRO);
+
         events.ScheduleEvent(EVENT_SACRIFICE, 30s, 40s);
         events.ScheduleEvent(EVENT_HELLFIRE, 5s, 15s);
         events.ScheduleEvent(EVENT_ENRAGE, 30s, 40s);
     }
 
-    void OnSpellStart(SpellInfo const* spell) override
+    void OnSpellStart(SpellInfo const* spellInfo) override
     {
-        if (spell->Id == SPELL_SACRIFICE)
+        if (spellInfo->Id == SPELL_SACRIFICE)
             Talk(SAY_CAST_SACRIFICE);
     }
 
-    void OnSpellCast(SpellInfo const* spell) override
+    void OnSpellCast(SpellInfo const* spellInfo) override
     {
-        if (spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_HELLFIRE, me))
+        if (spellInfo->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_HELLFIRE, me))
             Talk(SAY_CAST_HELLFIRE);
 
-        if (spell->Id == SPELL_ENRAGE)
+        if (spellInfo->Id == SPELL_ENRAGE)
             Talk(EMOTE_ENRAGE);
     }
 
@@ -109,6 +115,7 @@ struct boss_thorngrin_the_tender : public BossAI
             _phase++;
             Talk(SAY_50_PERCENT_HP);
         }
+
         if (_phase < PHASE_HEALTH_20 && me->HealthBelowPctDamaged(20, damage))
         {
             _phase++;