From ce066a478133854cdd23522d10e9eafca748e80e Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Tue, 4 Apr 2023 13:30:59 +0200
Subject: [PATCH 1/7] fix(Scripts/SlavePens): Added waypoint movement to
Quagmirran. (#15582)
* fix(Scripts/SlavePens): Added waypoint movement to Quagmirran.
Fixes #8559
* buildfix.
---
.../rev_1679773328267054300.sql | 17 +++++++
.../SlavePens/instance_the_slave_pens.cpp | 8 ++++
.../SlavePens/the_slave_pens.cpp | 44 +++++++++++++++++++
.../SlavePens/the_slave_pens.h | 3 +-
.../scripts/Outland/outland_script_loader.cpp | 2 +
5 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 data/sql/updates/pending_db_world/rev_1679773328267054300.sql
create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp
diff --git a/data/sql/updates/pending_db_world/rev_1679773328267054300.sql b/data/sql/updates/pending_db_world/rev_1679773328267054300.sql
new file mode 100644
index 000000000..fb89e84b0
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679773328267054300.sql
@@ -0,0 +1,17 @@
+--
+DELETE FROM `areatrigger_scripts` WHERE `entry`=4295;
+INSERT INTO `areatrigger_scripts` VALUES
+(4295,'at_quagmirran_lair');
+
+-- Pathing for Quagmirran Entry: 17942
+SET @PATH := 1794200;
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-272.12997,-671.50586,8.970236,NULL,0,0,0,100,0),
+(@PATH,2,-261.6143,-675.77155,10.541557,NULL,0,0,0,100,0),
+(@PATH,3,-246.73248,-683.1629,15.529007,NULL,0,0,0,100,0),
+(@PATH,4,-238.07864,-686.42316,18.473059,NULL,0,0,0,100,0),
+(@PATH,5,-227.73457,-690.909,22.025816,NULL,0,0,0,100,0),
+(@PATH,6,-217.95325,-695.7503,26.769361,NULL,0,0,0,100,0),
+(@PATH,7,-204.01328,-702.2695,37.230885,NULL,0,0,0,100,0),
+(@PATH,8,-199.49352,-705.59766,37.802734,NULL,0,0,0,100,0);
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
index f48474783..477d2c110 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
@@ -28,6 +28,11 @@
#include "ScriptMgr.h"
#include "the_slave_pens.h"
+ObjectData const creatureData[] =
+{
+ { NPC_QUAGMIRRAN, DATA_QUAGMIRRAN }
+};
+
class instance_the_slave_pens : public InstanceMapScript
{
public:
@@ -38,6 +43,7 @@ public:
instance_the_slave_pens_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
+ LoadObjectData(creatureData, nullptr);
counter = DATA_FLAMECALLER_000;
}
@@ -82,6 +88,8 @@ public:
default:
break;
}
+
+ InstanceScript::OnCreatureCreate(creature);
}
void SetGuidData(uint32 data, ObjectGuid guid) override
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp
new file mode 100644
index 000000000..631a80847
--- /dev/null
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by the
+ * Free Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+#include "the_slave_pens.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+
+class at_quagmirran_lair : public AreaTriggerScript
+{
+public:
+ at_quagmirran_lair() : AreaTriggerScript("at_quagmirran_lair") {}
+
+ bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
+ {
+ if (InstanceScript* instance = player->GetInstanceScript())
+ {
+ if (Creature* quagmirran = instance->GetCreature(DATA_QUAGMIRRAN))
+ {
+ quagmirran->GetMotionMaster()->MovePath(quagmirran->GetEntry() * 100, true);
+ }
+ }
+
+ return true;
+ }
+};
+
+void AddSC_the_slave_pens()
+{
+ new at_quagmirran_lair();
+}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
index 4b3c8369d..e467bcbc0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
@@ -64,7 +64,8 @@ enum SPCreaturesIds
NPC_SHAMAN_BEAM_BUNNY_001 = 25965,
NPC_SHAMAN_BEAM_BUNNY_002 = 25966,
NPC_WHISP_DEST_BUNNY = 26120,
- NPC_WHISP_SOURCE_BUNNY = 26121
+ NPC_WHISP_SOURCE_BUNNY = 26121,
+ NPC_QUAGMIRRAN = 17942
};
enum SPGameObjectIds
diff --git a/src/server/scripts/Outland/outland_script_loader.cpp b/src/server/scripts/Outland/outland_script_loader.cpp
index 976a507d8..272a0c317 100644
--- a/src/server/scripts/Outland/outland_script_loader.cpp
+++ b/src/server/scripts/Outland/outland_script_loader.cpp
@@ -56,6 +56,7 @@ void AddSC_boss_hungarfen();
void AddSC_boss_ghazan();
void AddSC_boss_the_black_stalker();
void AddSC_instance_the_underbog();
+void AddSC_the_slave_pens(); // The Slave Pens
void AddSC_boss_ahune();
void AddSC_instance_the_slave_pens();
void AddSC_boss_gruul(); //Gruul's Lair
@@ -153,6 +154,7 @@ void AddOutlandScripts()
AddSC_boss_ghazan();
AddSC_boss_the_black_stalker();
AddSC_instance_the_underbog();
+ AddSC_the_slave_pens(); // The Slave Pens
AddSC_boss_ahune();
AddSC_instance_the_slave_pens();
AddSC_boss_gruul(); //Gruul's Lair
From ee5df0344e0bd09d94e4325e8e4899f5b3d8c931 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot
Date: Tue, 4 Apr 2023 11:33:55 +0000
Subject: [PATCH 2/7] chore(DB): import pending files
Referenced commit(s): ce066a478133854cdd23522d10e9eafca748e80e
---
.../rev_1679773328267054300.sql => db_world/2023_04_04_08.sql} | 1 +
1 file changed, 1 insertion(+)
rename data/sql/updates/{pending_db_world/rev_1679773328267054300.sql => db_world/2023_04_04_08.sql} (95%)
diff --git a/data/sql/updates/pending_db_world/rev_1679773328267054300.sql b/data/sql/updates/db_world/2023_04_04_08.sql
similarity index 95%
rename from data/sql/updates/pending_db_world/rev_1679773328267054300.sql
rename to data/sql/updates/db_world/2023_04_04_08.sql
index fb89e84b0..03e5f484e 100644
--- a/data/sql/updates/pending_db_world/rev_1679773328267054300.sql
+++ b/data/sql/updates/db_world/2023_04_04_08.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_04_04_07 -> 2023_04_04_08
--
DELETE FROM `areatrigger_scripts` WHERE `entry`=4295;
INSERT INTO `areatrigger_scripts` VALUES
From 28c770a51785b7e6add3fbb6eea0ffa747316a98 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Tue, 4 Apr 2023 08:34:30 -0300
Subject: [PATCH 3/7] =?UTF-8?q?fix(Scripts/IcecrownCitadel):=20Prevent=20S?=
=?UTF-8?q?indragosa's=20landing=20trigger=20fr=E2=80=A6=20(#15814)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fix(Scripts/IcecrownCitadel): Prevent Sindragosa's landing trigger from firing during combat
---
.../scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index a507df8ca..e65cb5391 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -373,6 +373,7 @@ public:
if (me->isDead())
return;
+ instance->SetBossState(DATA_SINDRAGOSA, IN_PROGRESS);
me->setActive(true);
me->SetDisableGravity(true);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -1704,7 +1705,7 @@ public:
if (Creature* rimefang = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_RIMEFANG)))
rimefang->AI()->DoAction(ACTION_START_FROSTWYRM);
- if (!instance->GetData(DATA_SINDRAGOSA_FROSTWYRMS))
+ if (!instance->GetData(DATA_SINDRAGOSA_FROSTWYRMS) && instance->GetBossState(DATA_SINDRAGOSA) != IN_PROGRESS)
{
player->GetMap()->LoadGrid(SindragosaSpawnPos.GetPositionX(), SindragosaSpawnPos.GetPositionY());
if (Creature* sindragosa = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_SINDRAGOSA)))
From 8c9b4f1fb6e24fca6384d5abcdebe68cb32942f5 Mon Sep 17 00:00:00 2001
From: avarishd <46330494+avarishd@users.noreply.github.com>
Date: Tue, 4 Apr 2023 15:34:14 +0300
Subject: [PATCH 4/7] fix(DB/SAI): Port On Nethery Wing visuals from Trinity.
(#15806)
* fix(DB/SAI): Port On Nethery Wing visuals from Trinity.
/TrinityCore/TrinityCore/issues/23905
Co-Authored-By: Dr-J <1444120+dr-j@users.noreply.github.com>
* increase SpellFocusObject from 90 to 150
* correct taxipath and add 4 spawns from TC
---------
Co-authored-by: Dr-J <1444120+dr-j@users.noreply.github.com>
---
.../rev_1680542257068778400.sql | 32 +++++++++++++++++++
src/server/scripts/World/npc_taxi.cpp | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 data/sql/updates/pending_db_world/rev_1680542257068778400.sql
diff --git a/data/sql/updates/pending_db_world/rev_1680542257068778400.sql b/data/sql/updates/pending_db_world/rev_1680542257068778400.sql
new file mode 100644
index 000000000..58b29bc51
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1680542257068778400.sql
@@ -0,0 +1,32 @@
+-- Quest: On Nethery Wings ID 10438
+-- Void Conduit
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 20899 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
+(20899, 0, 0, 1, 25, 0, 100, 0, 0, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Reset - Set Health Regeneration Off'),
+(20899, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Reset - Set ReactState Passive'),
+(20899, 0, 2, 3, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 19554, 100, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Say Line 0 (Dimensius the All-Devouring)'),
+(20899, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 0, 1, 0, 0, 0, 0, 9, 20933, 0, 100, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Set Data 0 1'),
+(20899, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, 19565, 40, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Despawn Instant');
+
+-- Camera Shakers Manaforge Ultris
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20933;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 20933 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
+(20933, 0, 0, 1, 38, 0, 100, 0, 0, 1, 0, 0, 0, 11, 35761, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - On Data Set 0 1 - Cast Ultris Explosion'),
+(20933, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2093300, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - On Data Set 0 1 - Run Script');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2093300 AND `source_type` = 9;
+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
+(2093300, 9, 0, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
+(2093300, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
+(2093300, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
+(2093300, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
+(2093300, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion');
+
+-- Void Conduit Spell Focus
+DELETE FROM `gameobject` WHERE `id` = 184643 AND `map` = 530;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
+(9381, 184643, 530, 0, 0, 1, 1, 3930.18, 2038.26, 383.501, 1.72, 0, 0, 0, 1, 180, 0, 1, '', 0),
+(9385, 184643, 530, 0, 0, 1, 1, 3902.94, 1996.42, 383.644, 3.27509, 0, 0, 0, 1, 180, 0, 1, '', 0),
+(9386, 184643, 530, 0, 0, 1, 1, 3943, 1970.1, 383.321, 5.10507, 0, 0, 0, 1, 180, 0, 1, '', 0),
+(99956, 184643, 530, 0, 0, 1, 1, 3964.1, 2008.44, 383.941, 0.176697, 0, 0, 0, 1, 180, 0, 1, '', 0);
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index a32bb5c77..1fead6c3f 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -169,7 +169,7 @@ public:
{
case GOSSIP_ACTION_INFO_DEF + 1:
CloseGossipMenuFor(player);
- player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
+ player->CastSpell(player, 35731, true); //TaxiPath 628
break;
case GOSSIP_ACTION_INFO_DEF + 3:
CloseGossipMenuFor(player);
From 4e04dc6d4366f3f25513a77dc980050ec2efe610 Mon Sep 17 00:00:00 2001
From: elthehablo <83884799+elthehablo@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:36:19 +0200
Subject: [PATCH 5/7] fix(DB/Creature): fix damage modifier of Razormaw
(#15785)
* fix(DB/Creature): fix damage modifier of Razormaw
from 7.5 to 2.5. probably still a bit high. subject to change
* Update razormawdamageupdate.sql
credits to Gultask for value based on mangos core
* Update data/sql/updates/pending_db_world/razormawdamageupdate.sql
---------
Co-authored-by: Gultask <100873791+Gultask@users.noreply.github.com>
---
data/sql/updates/pending_db_world/razormawdamageupdate.sql | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 data/sql/updates/pending_db_world/razormawdamageupdate.sql
diff --git a/data/sql/updates/pending_db_world/razormawdamageupdate.sql b/data/sql/updates/pending_db_world/razormawdamageupdate.sql
new file mode 100644
index 000000000..ba4d68f88
--- /dev/null
+++ b/data/sql/updates/pending_db_world/razormawdamageupdate.sql
@@ -0,0 +1,2 @@
+-- damage modifier edit of Razormaw from 7.5 to 1.36 based on mangos values
+UPDATE `creature_template` SET `DamageModifier` = 1.36 WHERE `entry` = 17592;
From 32f1716c93e2d36a6729d826dfb85fe818d7c986 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:36:36 -0300
Subject: [PATCH 6/7] fix(DB/Quest): Prevent Earthmender Wilda to fail quest
abruptly (#15816)
* Create rev_1680608649769062300.sql
Co-Authored-By: Samsequel <20357406+Samsequel@users.noreply.github.com>
* Update rev_1680608649769062300.sql
Co-Authored-By: Samsequel <20357406+Samsequel@users.noreply.github.com>
---------
Co-authored-by: Samsequel <20357406+Samsequel@users.noreply.github.com>
---
.../rev_1680608649769062300.sql | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 data/sql/updates/pending_db_world/rev_1680608649769062300.sql
diff --git a/data/sql/updates/pending_db_world/rev_1680608649769062300.sql b/data/sql/updates/pending_db_world/rev_1680608649769062300.sql
new file mode 100644
index 000000000..f28501465
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1680608649769062300.sql
@@ -0,0 +1,21 @@
+--
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` = 3) AND (`SourceEntry` = 20795) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 21027) AND (`ConditionValue2` = 35) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22, 3, 20795, 0, 0, 29, 1, 21027, 35, 0, 0, 0, 0, '', 'Only run if Earthmender Wilda (21027) is within 35y');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-25120, -25121, -25122, -25123, -25124) AND `id` IN (2, 3));
+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
+(-25120, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
+(-25120, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
+(-25121, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
+(-25121, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
+(-25122, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
+(-25122, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
+(-25124, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
+(-25124, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
+(-25123, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
+(-25123, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off');
+
+UPDATE `smart_scripts` SET `action_param3` = 0 WHERE (`entryorguid` BETWEEN 2102900 AND 2102904) AND (`source_type` = 9) AND (`id` IN (3));
+
+UPDATE `creature_template_movement` SET `Ground` = 1, `Flight` = 0 WHERE (`CreatureId` = 21029);
From ed2c319280eb38edf0cd7ffabfc1bf5a441f4dcb Mon Sep 17 00:00:00 2001
From: AzerothCoreBot
Date: Tue, 4 Apr 2023 12:39:15 +0000
Subject: [PATCH 7/7] chore(DB): import pending files
Referenced commit(s): 32f1716c93e2d36a6729d826dfb85fe818d7c986
---
.../razormawdamageupdate.sql => db_world/2023_04_04_09.sql} | 1 +
.../rev_1680542257068778400.sql => db_world/2023_04_04_10.sql} | 1 +
.../rev_1680608649769062300.sql => db_world/2023_04_04_11.sql} | 1 +
3 files changed, 3 insertions(+)
rename data/sql/updates/{pending_db_world/razormawdamageupdate.sql => db_world/2023_04_04_09.sql} (77%)
rename data/sql/updates/{pending_db_world/rev_1680542257068778400.sql => db_world/2023_04_04_10.sql} (99%)
rename data/sql/updates/{pending_db_world/rev_1680608649769062300.sql => db_world/2023_04_04_11.sql} (98%)
diff --git a/data/sql/updates/pending_db_world/razormawdamageupdate.sql b/data/sql/updates/db_world/2023_04_04_09.sql
similarity index 77%
rename from data/sql/updates/pending_db_world/razormawdamageupdate.sql
rename to data/sql/updates/db_world/2023_04_04_09.sql
index ba4d68f88..11f05e6d6 100644
--- a/data/sql/updates/pending_db_world/razormawdamageupdate.sql
+++ b/data/sql/updates/db_world/2023_04_04_09.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_04_04_08 -> 2023_04_04_09
-- damage modifier edit of Razormaw from 7.5 to 1.36 based on mangos values
UPDATE `creature_template` SET `DamageModifier` = 1.36 WHERE `entry` = 17592;
diff --git a/data/sql/updates/pending_db_world/rev_1680542257068778400.sql b/data/sql/updates/db_world/2023_04_04_10.sql
similarity index 99%
rename from data/sql/updates/pending_db_world/rev_1680542257068778400.sql
rename to data/sql/updates/db_world/2023_04_04_10.sql
index 58b29bc51..f20bb5188 100644
--- a/data/sql/updates/pending_db_world/rev_1680542257068778400.sql
+++ b/data/sql/updates/db_world/2023_04_04_10.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_04_04_09 -> 2023_04_04_10
-- Quest: On Nethery Wings ID 10438
-- Void Conduit
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20899 AND `source_type` = 0;
diff --git a/data/sql/updates/pending_db_world/rev_1680608649769062300.sql b/data/sql/updates/db_world/2023_04_04_11.sql
similarity index 98%
rename from data/sql/updates/pending_db_world/rev_1680608649769062300.sql
rename to data/sql/updates/db_world/2023_04_04_11.sql
index f28501465..26eb9b939 100644
--- a/data/sql/updates/pending_db_world/rev_1680608649769062300.sql
+++ b/data/sql/updates/db_world/2023_04_04_11.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_04_04_10 -> 2023_04_04_11
--
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` = 3) AND (`SourceEntry` = 20795) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 21027) AND (`ConditionValue2` = 35) AND (`ConditionValue3` = 0);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES