Core/Scripts: Move some speed values & UNIT_FLAG_NOT_SELECTABLE to DB

14 files changed, 18 insertions, 31 deletions

diff --git a/sql/updates/world/3.3.5/2021_02_04_00_world.sql b/sql/updates/world/3.3.5/2021_02_04_00_world.sql
new file mode 100644
index 00000000000..ffa4bc226c9
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_02_04_00_world.sql
@@ -0,0 +1,17 @@
+--
+UPDATE `creature_template` SET `speed_run` = 0.67857142857 WHERE `entry` = 21538; -- Raging Flames (1)
+UPDATE `creature_template` SET `minlevel` = 73, `maxlevel` = 73, `speed_walk` = 0.8, `speed_run` = 0.85714285714, `unit_flags` = 33587200 WHERE `entry` = 24136; -- Feather Vortex
+UPDATE `creature_template` SET `RangeAttackTime` = 2000, `unit_flags` = 32832 WHERE `entry` = 17977; -- Warp Splinter
+UPDATE `creature_template` SET `minlevel` = 72, `maxlevel` = 72, `speed_walk` = 2, `speed_run` = 1.428571462631225585, `BaseAttackTime` = 2000, `unit_flags` = 32832 WHERE `entry` = 21582; -- Warp Splinter (1)
+-- Speed - movementId
+UPDATE `creature_template` SET `speed_walk` = 1.6, `speed_run` = 0.571429, `unit_flags` = 33554432 WHERE `entry` = 25267; -- Demonic Vapor (Trail)
+-- Speed - movementId
+UPDATE `creature_template` SET `speed_walk` = 2.4, `speed_run` = 0.85714, `unit_flags` = 33554432 WHERE `entry` = 25265; -- Demonic Vapor
+UPDATE `creature_template` SET `unit_flags` = 33554688 WHERE `entry` = 17838; -- Time Rift
+UPDATE `creature_template` SET `unit_flags` = 33554432+32768 WHERE `entry` = 22104; -- Cyclone (Karathress)
+UPDATE `creature_template` SET `unit_flags` = 33554432+768 WHERE `entry` = 21934; -- Hydross Cleansing Field Helper
+UPDATE `creature_template` SET `unit_flags` = 33554432+768 WHERE `entry` = 19870; -- Invis KV Shield Generator
+UPDATE `creature_template` SET `unit_flags` = 33554432+32768 WHERE `entry` = 21913; -- Water Globule
+UPDATE `creature_template` SET `minlevel` = 70, `maxlevel` = 70, `speed_walk` = 1, `speed_run` = 0.85714285714, `RangeAttackTime` = 2000, `unit_flags` = 33554432, `unit_flags2` = 0 WHERE `entry` = 17471; -- Lesser Shadow Fissure
+UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 0.85714285714, `BaseAttackTime` = 2000, `unit_flags` = 33554432, `unit_flags2` = 0 WHERE `entry` = 20570; -- Lesser Shadow Fissure (1)
+UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 0.85714285714, `unit_flags` = 33554432, `unit_flags2` = 0 WHERE `entry` = 21369; -- Flame Strike Trigger (Kael)
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index b3c395e0f83..09062b079fd 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -676,7 +676,6 @@ public:
 
         void Reset() override
         {
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             Initialize();
         }
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 1cb67d9e2d0..c45e06b3c9f 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -526,11 +526,7 @@ public:
 
     struct npc_felmyst_vaporAI : public ScriptedAI
     {
-        npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature)
-        {
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-            me->SetSpeedRate(MOVE_RUN, 0.8f);
-        }
+        npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature) { }
 
         void Reset() override { }
         void JustEngagedWith(Unit* /*who*/) override
@@ -562,7 +558,6 @@ public:
     {
         npc_felmyst_trailAI(Creature* creature) : ScriptedAI(creature)
         {
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             DoCast(me, SPELL_TRAIL_TRIGGER, true);
             me->SetTarget(me->GetGUID());
             me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index d7dcb81cc0e..14acd6b3140 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -467,9 +467,7 @@ public:
                     summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false);
                     break;
                 case NPC_ANVEENA:
-                    summoned->SetDisableGravity(true);
                     summoned->CastSpell(summoned, SPELL_ANVEENA_PRISON, true);
-                    summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     break;
                 case NPC_KILJAEDEN:
                     summoned->CastSpell(summoned, SPELL_REBIRTH, false);
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 3d4fdd89cd6..76488837c73 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -325,8 +325,6 @@ class boss_zuljin : public CreatureScript
                                 {
                                     Vortex->CastSpell(Vortex, SPELL_CYCLONE_PASSIVE, true);
                                     Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true);
-                                    Vortex->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                                    Vortex->SetSpeedRate(MOVE_RUN, 1.0f);
                                     Vortex->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0));
                                     DoZoneInCombat(Vortex);
                                 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
index 3ab5c1a31b6..e8c6b8e6259 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
@@ -298,9 +298,6 @@ public:
                     TEMPSUMMON_CORPSE_DESPAWN);
                 if (temp)
                 {
-                    temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                    temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-
                     if (Creature* boss = SummonedPortalBoss(temp))
                     {
                         if (boss->GetEntry() == NPC_AEONUS)
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 080bb6f432b..3c8851aed19 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -662,7 +662,6 @@ public:
                 if (Creature* Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 15s))
                 {
                     Cyclone->SetObjectScale(3.0f);
-                    Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     Cyclone->SetFaction(me->GetFaction());
                     Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true);
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index b6ce615a642..79d488c56ed 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -152,7 +152,6 @@ public:
             {
                 beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
                 beamer->SetDisplayId(11686);  //invisible
-                beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 beams[0] = beamer->GetGUID();
             }
             beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN);
@@ -160,7 +159,6 @@ public:
             {
                 beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
                 beamer->SetDisplayId(11686);  //invisible
-                beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 beams[1] = beamer->GetGUID();
             }
         }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 677ced1fafd..68c9e7de352 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -851,8 +851,6 @@ public:
         {
             Initialize();
             me->SetDisplayId(11686); // invisible
-
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         }
 
         void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 0e9d24c9cd5..a752c81adaa 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -320,8 +320,6 @@ public:
         {
             Initialize();
 
-            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             me->SetFaction(FACTION_MONSTER);
         }
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index b22c1a27be8..453397b67e8 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -207,10 +207,6 @@ class boss_grand_warlock_nethekurse : public CreatureScript
 
             void JustSummoned(Creature* summoned) override
             {
-                summoned->SetFaction(FACTION_MONSTER_2);
-                summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-
                 //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid?
                 summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true);
                 summoned->CastSpell(summoned, SPELL_CONSUMPTION, CastSpellExtraArgs().SetOriginalCaster(me->GetGUID()));
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index aaf5e440609..ba46b07b361 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1278,9 +1278,6 @@ class npc_kael_flamestrike : public CreatureScript
             void Reset() override
             {
                 Initialize();
-
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                me->SetFaction(FACTION_MONSTER);
             }
 
             void MoveInLineOfSight(Unit* /*who*/) override { }
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index c5566eb3a8c..6266bbe7fa0 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -178,7 +178,6 @@ class npc_ragin_flames : public CreatureScript
                 void Reset() override
                 {
                     Initialize();
-                    me->SetSpeedRate(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f));
                 }
 
                 void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 0355bff93bf..277d7ef348e 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -167,8 +167,6 @@ class boss_warp_splinter : public CreatureScript
             void Reset() override
             {
                 Initialize();
-
-                me->SetSpeedRate(MOVE_RUN, 0.7f);
             }
 
             void JustEngagedWith(Unit* /*who*/) override