Scripts/Botanica: Modernize scripts (TrinityCore#31026)

Author: offl

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

@@ -21,7 +21,7 @@
 #include "SpellScript.h"
 #include "the_botanica.h"
 
-enum Texts
+enum SarannisTexts
 {
     SAY_AGGRO                      = 0,
     SAY_SLAY                       = 1,
@@ -31,7 +31,7 @@ enum Texts
     SAY_DEATH                      = 5
 };
 
-enum Spells
+enum SarannisSpells
 {
     SPELL_ARCANE_RESONANCE         = 34794,
     SPELL_ARCANE_DEVASTATION       = 34799,
@@ -43,7 +43,7 @@ enum Spells
     SPELL_SUMMON_RESERVIST_3       = 34819
 };
 
-enum Events
+enum SarannisEvents
 {
     EVENT_ARCANE_DEVASTATION       = 1,
     EVENT_SUMMON_REINFORCEMENTS
@@ -54,6 +54,7 @@ uint32 const SummonReinforcementsSpells[] =
     SPELL_SUMMON_MENDER_1, SPELL_SUMMON_RESERVIST_1, SPELL_SUMMON_RESERVIST_2, SPELL_SUMMON_RESERVIST_3
 };
 
+// 17976 - Commander Sarannis
 struct boss_commander_sarannis : public BossAI
 {
     boss_commander_sarannis(Creature* creature) : BossAI(creature, DATA_COMMANDER_SARANNIS), _summoned(false) { }

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

@@ -20,7 +20,7 @@
 #include "SpellInfo.h"
 #include "the_botanica.h"
 
-enum Texts
+enum FreywinnTexts
 {
     SAY_AGGRO                  = 0,
     SAY_SLAY                   = 1,
@@ -29,7 +29,7 @@ enum Texts
     SAY_OOC_RANDOM             = 4
 };
 
-enum Spells
+enum FreywinnSpells
 {
     SPELL_TRANQUILITY          = 34550,
     SPELL_TREE_FORM            = 34551,
@@ -41,13 +41,14 @@ enum Spells
     SPELL_CANCEL_TRANQUILITY   = 34777
 };
 
-enum Events
+enum FreywinnEvents
 {
     EVENT_PLANT_SEEDLING       = 1,
     EVENT_TREE_FORM,
     EVENT_TRANQUILITY
 };
 
+// 17975 - High Botanist Freywinn
 struct boss_high_botanist_freywinn : public BossAI
 {
     boss_high_botanist_freywinn(Creature* creature) : BossAI(creature, DATA_HIGH_BOTANIST_FREYWINN), _frayersKilled(0) { }

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

@@ -19,12 +19,12 @@
 #include "ScriptedCreature.h"
 #include "the_botanica.h"
 
-enum Texts
+enum LajTexts
 {
     EMOTE_SUMMON               = 0
 };
 
-enum Spells
+enum LajSpells
 {
     SPELL_ALLERGIC_REACTION    = 34697,
     SPELL_TELEPORT_SELF        = 34673,
@@ -42,7 +42,7 @@ enum Spells
     SPELL_TRANSFORM_SHADOW     = 34710
 };
 
-enum Events
+enum LajEvents
 {
     EVENT_TELEPORT             = 1,
     EVENT_EMOTE,
@@ -52,6 +52,7 @@ enum Events
     EVENT_THRASH
 };
 
+// 17980 - Laj
 struct boss_laj : public BossAI
 {
     boss_laj(Creature* creature) : BossAI(creature, DATA_LAJ), _activeTransformAura(0) { }

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

@@ -20,15 +20,15 @@
 #include "SpellInfo.h"
 #include "the_botanica.h"
 
-enum Texts
+enum WarpSplinterTexts
 {
     SAY_AGGRO                 = 0,
     SAY_SLAY                  = 1,
     SAY_SUMMON                = 2,
     SAY_DEATH                 = 3
 };
 
-enum Spells
+enum WarpSplinterSpells
 {
     SPELL_STOMP               = 34716,
     SPELL_ARCANE_VOLLEY       = 36705,
@@ -44,7 +44,7 @@ enum Spells
     SPELL_MOONFIRE_VISUAL     = 36704
 };
 
-enum Events
+enum WarpSplinterEvents
 {
     EVENT_SUMMON              = 1,
     EVENT_STOMP,
@@ -57,6 +57,7 @@ uint32 const SummonSaplingsSpells[] =
     SPELL_SUMMON_SAPLING_4, SPELL_SUMMON_SAPLING_5, SPELL_SUMMON_SAPLING_6
 };
 
+// 17977 - Warp Splinter
 struct boss_warp_splinter : public BossAI
 {
     boss_warp_splinter(Creature* creature) : BossAI(creature, DATA_WARP_SPLINTER) { }
@@ -142,6 +143,7 @@ struct boss_warp_splinter : public BossAI
     }
 };
 
+// 19949 - Sapling
 struct npc_warp_splinter_sapling : public ScriptedAI
 {
     npc_warp_splinter_sapling(Creature* creature) : ScriptedAI(creature) { }