From 4d8be337a80fe05d953f79dbd9195532d706eb0c Mon Sep 17 00:00:00 2001 From: M'Dic Date: Tue, 13 Dec 2022 11:43:45 -0500 Subject: [PATCH 01/83] update (core): Continue Taxi Flight support helper (#14211) Thank you for the review approval --- src/server/game/Entities/Player/Player.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d2ef52e30..c2cc2685e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -10225,6 +10225,8 @@ void Player::ContinueTaxiFlight() RemoveAurasByType(SPELL_AURA_MOUNTED); } + SetCanTeleport(true); + GetSession()->SendDoFlight(mountDisplayId, path, startNode); } From 81d050685eba5fd416970bf77f8a182c82e8c33b Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Tue, 13 Dec 2022 13:32:14 -0500 Subject: [PATCH 02/83] fix(DB/GameObject): Add Mailbox in Nighthaven. (#14126) --- data/sql/updates/pending_db_world/nighthaven-mailbox.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/nighthaven-mailbox.sql diff --git a/data/sql/updates/pending_db_world/nighthaven-mailbox.sql b/data/sql/updates/pending_db_world/nighthaven-mailbox.sql new file mode 100644 index 000000000..359d21ca0 --- /dev/null +++ b/data/sql/updates/pending_db_world/nighthaven-mailbox.sql @@ -0,0 +1,3 @@ +SET @guid := 92053; +DELETE FROM `gameobject` WHERE `guid` = @guid; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES (@guid, 195218, 1, 493, 2361, 8008.7421875, -2668.053955078125, 512.06414794921875, 2.757613182067871093, 0.981626510620117187, 0.190812408924102783, 120, 255, 1, 46902); From 79708758b594d195b0f20a6807040880e573337e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 13 Dec 2022 18:34:26 +0000 Subject: [PATCH 03/83] chore(DB): import pending files Referenced commit(s): 81d050685eba5fd416970bf77f8a182c82e8c33b --- .../nighthaven-mailbox.sql => db_world/2022_12_13_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/nighthaven-mailbox.sql => db_world/2022_12_13_00.sql} (91%) diff --git a/data/sql/updates/pending_db_world/nighthaven-mailbox.sql b/data/sql/updates/db_world/2022_12_13_00.sql similarity index 91% rename from data/sql/updates/pending_db_world/nighthaven-mailbox.sql rename to data/sql/updates/db_world/2022_12_13_00.sql index 359d21ca0..6329a1cfd 100644 --- a/data/sql/updates/pending_db_world/nighthaven-mailbox.sql +++ b/data/sql/updates/db_world/2022_12_13_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_12_01 -> 2022_12_13_00 SET @guid := 92053; DELETE FROM `gameobject` WHERE `guid` = @guid; INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES (@guid, 195218, 1, 493, 2361, 8008.7421875, -2668.053955078125, 512.06414794921875, 2.757613182067871093, 0.981626510620117187, 0.190812408924102783, 120, 255, 1, 46902); From ae9bfaa291d3641d7283b38d365ea9604c061895 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:35:08 -0600 Subject: [PATCH 04/83] fix(DB/Loot): Improve Tirisfal Glade unique drops (#14197) * fix(DB/loot): Improve Tirisfal Glade unique drops * Update rev_1670828923247478600.sql --- .../sql/updates/pending_db_world/rev_1670828923247478600.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1670828923247478600.sql diff --git a/data/sql/updates/pending_db_world/rev_1670828923247478600.sql b/data/sql/updates/pending_db_world/rev_1670828923247478600.sql new file mode 100644 index 000000000..e3a36bd68 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1670828923247478600.sql @@ -0,0 +1,5 @@ +-- +-- 3329 Spiked Wooden Plank too high rate on AC +UPDATE `creature_loot_template` SET `Chance`=1.25 WHERE `Entry`=1753 AND `Item`=3329 AND `Reference`=0 AND `GroupId`=0; +-- 3335 Farmer's Broom cleanup drop rate on AC +UPDATE `creature_loot_template` SET `Chance`=7 WHERE `Entry`=1935 AND `Item`=3335 AND `Reference`=0 AND `GroupId`=0; From 3251e7f4219a5b573118b2d974da370b3c2e5f21 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 13 Dec 2022 18:37:20 +0000 Subject: [PATCH 05/83] chore(DB): import pending files Referenced commit(s): ae9bfaa291d3641d7283b38d365ea9604c061895 --- .../rev_1670828923247478600.sql => db_world/2022_12_13_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1670828923247478600.sql => db_world/2022_12_13_01.sql} (88%) diff --git a/data/sql/updates/pending_db_world/rev_1670828923247478600.sql b/data/sql/updates/db_world/2022_12_13_01.sql similarity index 88% rename from data/sql/updates/pending_db_world/rev_1670828923247478600.sql rename to data/sql/updates/db_world/2022_12_13_01.sql index e3a36bd68..40ce6ec65 100644 --- a/data/sql/updates/pending_db_world/rev_1670828923247478600.sql +++ b/data/sql/updates/db_world/2022_12_13_01.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_13_00 -> 2022_12_13_01 -- -- 3329 Spiked Wooden Plank too high rate on AC UPDATE `creature_loot_template` SET `Chance`=1.25 WHERE `Entry`=1753 AND `Item`=3329 AND `Reference`=0 AND `GroupId`=0; From 8379166f3f4cc3b19df87eac361b9f328a8aa64a Mon Sep 17 00:00:00 2001 From: Bing Zhe <9061@163.com> Date: Wed, 14 Dec 2022 16:43:26 +0800 Subject: [PATCH 06/83] fix(DB/Creature): Incorrect jewelcrafting trainer (#14213) * fix(DB/Creature): Incorrect jewelcrafting trainer Shattrath Jewelcrafting trainer should not be able to learn grand master jewelcrafter. The NPC name is Hamanar(entry:19063) ,location is aldor area in shattrath. * Rename db-fix-npc_trainer to db-fix-npc_trainer.sql * Update data/sql/updates/pending_db_world/db-fix-npc_trainer.sql Co-authored-by: Gultask <100873791+Gultask@users.noreply.github.com> Co-authored-by: Gultask <100873791+Gultask@users.noreply.github.com> --- data/sql/updates/pending_db_world/db-fix-npc_trainer.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 data/sql/updates/pending_db_world/db-fix-npc_trainer.sql diff --git a/data/sql/updates/pending_db_world/db-fix-npc_trainer.sql b/data/sql/updates/pending_db_world/db-fix-npc_trainer.sql new file mode 100644 index 000000000..4aedb935b --- /dev/null +++ b/data/sql/updates/pending_db_world/db-fix-npc_trainer.sql @@ -0,0 +1 @@ +DELETE FROM `npc_trainer` WHERE `ID` = 19063 AND `SpellID` = -201026; From 1386f86bc2ba0922e266bdb3b896e1825dcdfb0c Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 14 Dec 2022 08:45:36 +0000 Subject: [PATCH 07/83] chore(DB): import pending files Referenced commit(s): 8379166f3f4cc3b19df87eac361b9f328a8aa64a --- .../db-fix-npc_trainer.sql => db_world/2022_12_14_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/db-fix-npc_trainer.sql => db_world/2022_12_14_00.sql} (61%) diff --git a/data/sql/updates/pending_db_world/db-fix-npc_trainer.sql b/data/sql/updates/db_world/2022_12_14_00.sql similarity index 61% rename from data/sql/updates/pending_db_world/db-fix-npc_trainer.sql rename to data/sql/updates/db_world/2022_12_14_00.sql index 4aedb935b..796fe93ee 100644 --- a/data/sql/updates/pending_db_world/db-fix-npc_trainer.sql +++ b/data/sql/updates/db_world/2022_12_14_00.sql @@ -1 +1,2 @@ +-- DB update 2022_12_13_01 -> 2022_12_14_00 DELETE FROM `npc_trainer` WHERE `ID` = 19063 AND `SpellID` = -201026; From f2b5838d853498b3e2ec5ddc8538a9c4374f2d72 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 15 Dec 2022 22:20:18 -0300 Subject: [PATCH 08/83] fix(DB/Loot): Separate Normal and Heroic loot from early TBC dungeons (#14234) * Create rev_1671115069241434700.sql * Update rev_1671115069241434700.sql --- .../rev_1671115069241434700.sql | 617 ++++++++++++++++++ 1 file changed, 617 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671115069241434700.sql diff --git a/data/sql/updates/pending_db_world/rev_1671115069241434700.sql b/data/sql/updates/pending_db_world/rev_1671115069241434700.sql new file mode 100644 index 000000000..bf29b05c5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671115069241434700.sql @@ -0,0 +1,617 @@ +-- Delete old HFP Trash loot table +DELETE FROM `creature_loot_template` WHERE `entry`=17370 AND `Comment` LIKE '%Hellfire Channeler%'; +DELETE FROM `creature_loot_template` WHERE `entry`=17259 AND `Comment` LIKE '%Bonechewer Hungerer%'; + +SET @HELLFIRENORMAL := 17370; +SET @HELLFIREHEROIC := 18608; + +DELETE FROM `creature_loot_template` WHERE `Entry`=@HELLFIREHEROIC AND `Comment` LIKE '%Hellfire Dungeons (Heroic)%'; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(@HELLFIREHEROIC, 1, 24000, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 2, 24002, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 3, 24003, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 4, 24011, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 5, 24022, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 6, 24023, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 7, 24724, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - (ReferenceTable)'), +(@HELLFIREHEROIC, 5759, 0, 0.25, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - Thorium Lockbox'), +(@HELLFIREHEROIC, 5760, 0, 0.3, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - Eternium Lockbox'), +(@HELLFIREHEROIC, 8766, 0, 5, 0, 1, 0, 1, 3, 'Hellfire Dungeons (Heroic) - Morning Glory Dew'), +(@HELLFIREHEROIC, 8952, 0, 10, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Heroic) - Roasted Quail'), +(@HELLFIREHEROIC, 14047, 0, 40, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Heroic) - Runecloth'), +(@HELLFIREHEROIC, 21877, 0, 20, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Heroic) - Netherweave Cloth'), +(@HELLFIREHEROIC, 23894, 0, 100, 1, 1, 0, 1, 1, 'Hellfire Dungeons (Heroic) - Fel Orc Blood Vial'); + +DELETE FROM `creature_loot_template` WHERE `Entry`=@HELLFIRENORMAL AND `Comment` LIKE '%Hellfire Dungeons (Normal)%'; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(@HELLFIRENORMAL, 1, 24000, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 2, 24002, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 3, 24003, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 4, 24022, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 5, 24023, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 6, 24724, 5, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - (ReferenceTable)'), +(@HELLFIRENORMAL, 5759, 0, 0.25, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - Thorium Lockbox'), +(@HELLFIRENORMAL, 5760, 0, 0.3, 0, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - Eternium Lockbox'), +(@HELLFIRENORMAL, 8766, 0, 5, 0, 1, 0, 1, 3, 'Hellfire Dungeons (Normal) - Morning Glory Dew'), +(@HELLFIRENORMAL, 8952, 0, 10, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Normal) - Roasted Quail'), +(@HELLFIRENORMAL, 14047, 0, 40, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Normal) - Runecloth'), +(@HELLFIRENORMAL, 21877, 0, 20, 0, 1, 0, 1, 4, 'Hellfire Dungeons (Normal) - Netherweave Cloth'), +(@HELLFIRENORMAL, 23894, 0, 100, 1, 1, 0, 1, 1, 'Hellfire Dungeons (Normal) - Fel Orc Blood Vial'); + +UPDATE `creature_template` SET `lootid`=@HELLFIRENORMAL WHERE `entry` IN ( +17370, -- Laughing Skull Enforcer +17371, -- Shadowmoon Warlock +17395, -- Shadowmoon Summoner +17397, -- Shadowmoon Adept +17398, -- Nascent Fel Orc +17399, -- Seductress +17414, -- Shadowmoon Technician +17429, -- Fel Orc Neophyte +17477, -- Hellfire Imp +17491, -- Laughing Skull Rogue +17624, -- Laughing Skull Warden +17626, -- Laughing Skull Legionnaire +17653, -- Shadowmoon Channeler +18894, -- Felguard Brute +19016, -- Hellfire Familiar + +17259, -- Bonechewer Hungerer +17264, -- Bonechewer Ravener +17269, -- Bleeding Hollow Darkcaster +17270, -- Bleeding Hollow Archer +17271, -- Bonechewer Destroyer +17280, -- Shattered Hand Warhound +17281, -- Bonechewer Ripper +17309, -- Hellfire Watcher +17455, -- Bonechewer Beastmaster +17478, -- Bleeding Hollow Scryer +17517 -- Hellfire Sentry +); + +UPDATE `creature_template` SET `lootid`=@HELLFIREHEROIC WHERE `entry` IN ( +17256, -- Hellfire Channeler +18603, -- Fel Orc Neophyte (1) +18606, -- Hellfire Imp (1) +18608, -- Laughing Skull Enforcer (1) +18609, -- Laughing Skull Legionnaire (1) +18610, -- Laughing Skull Rogue (1) +18611, -- Laughing Skull Warden (1) +18612, -- Nascent Fel Orc (1) +18614, -- Seductress (1) +18615, -- Shadowmoon Adept (1) +18617, -- Shadowmoon Summoner (1) +18618, -- Shadowmoon Technician (1) +18619, -- Shadowmoon Warlock (1) +18620, -- Shadowmoon Channeler (1) +21645, -- Felguard Brute (1) +21646, -- Hellfire Familiar (1) + +18048, -- Bleeding Hollow Archer (1) +18049, -- Bleeding Hollow Darkcaster (1) +18050, -- Bleeding Hollow Scryer (1) +18051, -- Bonechewer Beastmaster (1) +18052, -- Bonechewer Destroyer (1) +18053, -- Bonechewer Hungerer (1) +18054, -- Bonechewer Ravener (1) +18055, -- Bonechewer Ripper (1) +18057, -- Hellfire Sentry (1) +18058, -- Hellfire Watcher (1) +18059 -- Shattered Hand Warhound (1) +); + +DELETE FROM `creature_loot_template` WHERE `Entry` IN (20191,20181,20192,20179,20180,20193,20177) AND `Comment` LIKE '%(Heroic)%'; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(20191, 5760, 0, 0.4293, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Eternium Lockbox'), +(20191, 13444, 0, 10, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Major Mana Potion'), +(20191, 17057, 0, 30.0247, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Shiny Fish Scales'), +(20191, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Wrathfin Myrmidon (Heroic) - (ReferenceTable)'), +(20191, 24476, 0, 26.8447, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Jaggal Clam'), +(20191, 27858, 0, 4.3735, 0, 1, 0, 1, 3, 'Wrathfin Myrmidon (Heroic) - Sunspring Carp'), +(20191, 27860, 0, 0.7059, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Purified Draenic Water'), +(20191, 28399, 0, 1.3099, 0, 1, 0, 1, 1, 'Wrathfin Myrmidon (Heroic) - Filtered Draenic Water'), +(20192, 5760, 0, 0.5544, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Eternium Lockbox'), +(20192, 13926, 0, 0.0426, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Golden Pearl'), +(20192, 17057, 0, 29.9574, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Shiny Fish Scales'), +(20192, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Wrathfin Sentry (Heroic) - (ReferenceTable)'), +(20192, 24476, 0, 26.951, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Jaggal Clam'), +(20192, 27858, 0, 4.4136, 0, 1, 0, 1, 3, 'Wrathfin Sentry (Heroic) - Sunspring Carp'), +(20192, 27860, 0, 0.597, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Purified Draenic Water'), +(20192, 28399, 0, 1.3859, 0, 1, 0, 1, 1, 'Wrathfin Sentry (Heroic) - Filtered Draenic Water'), +(20181, 5760, 0, 0.399, 0, 1, 0, 1, 1, 'Murkblood Tribesman (Heroic) - Eternium Lockbox'), +(20181, 14047, 0, 11.0668, 0, 1, 0, 1, 3, 'Murkblood Tribesman (Heroic) - Runecloth'), +(20181, 21877, 0, 24.581, 0, 1, 0, 1, 3, 'Murkblood Tribesman (Heroic) - Netherweave Cloth'), +(20181, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20181, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20181, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20181, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20181, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20181, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Murkblood Tribesman (Heroic) - (ReferenceTable)'), +(20180, 5760, 0, 0.3308, 0, 1, 0, 1, 1, 'Murkblood Spearman (Heroic) - Eternium Lockbox'), +(20180, 14047, 0, 11.658, 0, 1, 0, 1, 3, 'Murkblood Spearman (Heroic) - Runecloth'), +(20180, 19264, 0, 0.0301, 0, 1, 0, 1, 1, 'Murkblood Spearman (Heroic) - Seven of Warlords'), +(20180, 19265, 0, 0.0301, 0, 1, 0, 1, 1, 'Murkblood Spearman (Heroic) - Eight of Warlords'), +(20180, 21877, 0, 26.1327, 0, 1, 0, 1, 3, 'Murkblood Spearman (Heroic) - Netherweave Cloth'), +(20180, 23077, 0, 8.3, 0, 1, 0, 1, 1, 'Murkblood Spearman (Heroic) - Blood Garnet'), +(20180, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20180, 24015, 24015, 0.1, 0, 1, 1, 1, 1, 'Murkblood Spearman (Heroic) - (ReferenceTable)'), +(20177, 5760, 0, 0.4093, 0, 1, 0, 1, 1, 'Murkblood Healer (Heroic) - Eternium Lockbox'), +(20177, 14047, 0, 12.257, 0, 1, 0, 1, 3, 'Murkblood Healer (Heroic) - Runecloth'), +(20177, 21877, 0, 25.9466, 0, 1, 0, 1, 3, 'Murkblood Healer (Heroic) - Netherweave Cloth'), +(20177, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20177, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Murkblood Healer (Heroic) - (ReferenceTable)'), +(20193, 5760, 0, 0.4097, 0, 1, 0, 1, 1, 'Wrathfin Warrior (Heroic) - Eternium Lockbox'), +(20193, 17057, 0, 30.2716, 0, 1, 0, 1, 1, 'Wrathfin Warrior (Heroic) - Shiny Fish Scales'), +(20193, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24006, 24006, 0.5, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Wrathfin Warrior (Heroic) - (ReferenceTable)'), +(20193, 24476, 0, 26.7365, 0, 1, 0, 1, 1, 'Wrathfin Warrior (Heroic) - Jaggal Clam'), +(20193, 27858, 0, 3.9447, 0, 1, 0, 1, 3, 'Wrathfin Warrior (Heroic) - Sunspring Carp'), +(20193, 27860, 0, 0.6479, 0, 1, 0, 1, 1, 'Wrathfin Warrior (Heroic) - Purified Draenic Water'), +(20193, 28399, 0, 1.4007, 0, 1, 0, 1, 1, 'Wrathfin Warrior (Heroic) - Filtered Draenic Water'), +(20179, 5760, 0, 0.2729, 0, 1, 0, 1, 1, 'Murkblood Oracle (Heroic) - Eternium Lockbox'), +(20179, 14047, 0, 11.6251, 0, 1, 0, 1, 3, 'Murkblood Oracle (Heroic) - Runecloth'), +(20179, 19272, 0, 0.0546, 0, 1, 0, 1, 1, 'Murkblood Oracle (Heroic) - Five of Elementals'), +(20179, 19281, 0, 0.0546, 0, 1, 0, 1, 1, 'Murkblood Oracle (Heroic) - Five of Portals'), +(20179, 21877, 0, 25.8289, 0, 1, 0, 1, 3, 'Murkblood Oracle (Heroic) - Netherweave Cloth'), +(20179, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'), +(20179, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Murkblood Oracle (Heroic) - (ReferenceTable)'); + +DELETE FROM `creature_loot_template` WHERE `Reference` IN (24011, 24013) AND `entry` IN ( +17726, -- Wrathfin Myrmidon +17727, -- Wrathfin Sentry +17728, -- Murkblood Tribesman +17729, -- Murkblood Spearman +17730, -- Murkblood Healer +17735, -- Wrathfin Warrior +17771 -- Murkblood Oracle +); + +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN ( +20191, -- Wrathfin Myrmidon (1) +20181, -- Murkblood Tribesman (1) +20192, -- Wrathfin Sentry (1) +20179, -- Murkblood Oracle (1) +20180, -- Murkblood Spearman (1) +20193, -- Wrathfin Warrior (1) +20177 -- Murkblood Healer (1) +); + +DELETE FROM `creature_loot_template` WHERE `Entry` IN (19884,19885,19886,19887,19888,19889,19890,19891,19892,19902,19903,19904,21842,21843) AND `Comment` LIKE '%(Heroic)%'; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(19884, 5760, 0, 0.3975, 0, 1, 0, 1, 1, 'Bogstrok (Heroic) - Eternium Lockbox'), +(19884, 17057, 0, 27.7822, 0, 1, 0, 1, 1, 'Bogstrok (Heroic) - Shiny Fish Scales'), +(19884, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Bogstrok (Heroic) - (ReferenceTable)'), +(19884, 24476, 0, 25.308, 0, 1, 0, 1, 1, 'Bogstrok (Heroic) - Jaggal Clam'), +(19884, 25429, 0, 39.7407, 0, 1, 0, 2, 4, 'Bogstrok (Heroic) - Grime-encrusted Scale'), +(19884, 25431, 0, 9.4793, 0, 1, 0, 2, 4, 'Bogstrok (Heroic) - Ripped Fin'), +(19884, 27858, 0, 3.9298, 0, 1, 0, 1, 3, 'Bogstrok (Heroic) - Sunspring Carp'), +(19884, 27860, 0, 0.8545, 0, 1, 0, 1, 1, 'Bogstrok (Heroic) - Purified Draenic Water'), +(19884, 28399, 0, 0.9936, 0, 1, 0, 1, 1, 'Bogstrok (Heroic) - Filtered Draenic Water'), +(19892, 5760, 0, 0.2995, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Eternium Lockbox'), +(19892, 13444, 0, 5.6, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Major Mana Potion'), +(19892, 13446, 0, 5.6, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Major Healing Potion'), +(19892, 17057, 0, 29.0775, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Shiny Fish Scales'), +(19892, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Greater Bogstrok (Heroic) - (ReferenceTable)'), +(19892, 24476, 0, 27.1326, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Jaggal Clam'), +(19892, 27858, 0, 4.0562, 0, 1, 0, 1, 3, 'Greater Bogstrok (Heroic) - Sunspring Carp'), +(19892, 27860, 0, 1.0723, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Purified Draenic Water'), +(19892, 28399, 0, 0.9614, 0, 1, 0, 1, 1, 'Greater Bogstrok (Heroic) - Filtered Draenic Water'), +(19888, 5760, 0, 0.2787, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Eternium Lockbox'), +(19888, 13444, 0, 10, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Major Mana Potion'), +(19888, 17057, 0, 30.5575, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Shiny Fish Scales'), +(19888, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24092, 24092, 0.5, 0, 1, 1, 1, 1, 'Coilfang Observer (Heroic) - (ReferenceTable)'), +(19888, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Coilfang Armaments'), +(19888, 24476, 0, 26.8728, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Jaggal Clam'), +(19888, 27858, 0, 4.5122, 0, 1, 0, 1, 3, 'Coilfang Observer (Heroic) - Sunspring Carp'), +(19888, 27860, 0, 0.9233, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Purified Draenic Water'), +(19888, 28399, 0, 1.1672, 0, 1, 0, 1, 1, 'Coilfang Observer (Heroic) - Filtered Draenic Water'), +(19891, 5760, 0, 0.3228, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Eternium Lockbox'), +(19891, 13444, 0, 4.2, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Major Mana Potion'), +(19891, 13446, 0, 4.2, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Major Healing Potion'), +(19891, 17057, 0, 30.3009, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Shiny Fish Scales'), +(19891, 21929, 0, 4.2, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Flame Spessarite'), +(19891, 23077, 0, 4.2, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Blood Garnet'), +(19891, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24093, 24093, 0.5, 0, 1, 1, 1, 1, 'Coilfang Technician (Heroic) - (ReferenceTable)'), +(19891, 24476, 0, 26.8472, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Jaggal Clam'), +(19891, 27858, 0, 4.4222, 0, 1, 0, 1, 3, 'Coilfang Technician (Heroic) - Sunspring Carp'), +(19891, 27860, 0, 0.8863, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Purified Draenic Water'), +(19891, 28399, 0, 1.1238, 0, 1, 0, 1, 1, 'Coilfang Technician (Heroic) - Filtered Draenic Water'), +(19885, 5760, 0, 0.2373, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Eternium Lockbox'), +(19885, 17057, 0, 30.3552, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Shiny Fish Scales'), +(19885, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Coilfang Champion (Heroic) - (ReferenceTable)'), +(19885, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Coilfang Armaments'), +(19885, 24476, 0, 27.159, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Jaggal Clam'), +(19885, 27858, 0, 4.3359, 0, 1, 0, 1, 3, 'Coilfang Champion (Heroic) - Sunspring Carp'), +(19885, 27860, 0, 1.0319, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Purified Draenic Water'), +(19885, 28399, 0, 1.0534, 0, 1, 0, 1, 1, 'Coilfang Champion (Heroic) - Filtered Draenic Water'), +(19886, 5760, 0, 0.3168, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Eternium Lockbox'), +(19886, 17057, 0, 29.8401, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Shiny Fish Scales'), +(19886, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Coilfang Defender (Heroic) - (ReferenceTable)'), +(19886, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Coilfang Armaments'), +(19886, 24476, 0, 26.9991, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Jaggal Clam'), +(19886, 27858, 0, 4.4658, 0, 1, 0, 1, 3, 'Coilfang Defender (Heroic) - Sunspring Carp'), +(19886, 27860, 0, 1.0424, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Purified Draenic Water'), +(19886, 28399, 0, 1.1803, 0, 1, 0, 1, 1, 'Coilfang Defender (Heroic) - Filtered Draenic Water'), +(19889, 5760, 0, 0.2226, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Eternium Lockbox'), +(19889, 17057, 0, 30.5772, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Shiny Fish Scales'), +(19889, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Coilfang Slavehandler (Heroic) - (ReferenceTable)'), +(19889, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Coilfang Armaments'), +(19889, 24476, 0, 26.8167, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Jaggal Clam'), +(19889, 27858, 0, 4.3568, 0, 1, 0, 1, 3, 'Coilfang Slavehandler (Heroic) - Sunspring Carp'), +(19889, 27860, 0, 0.8984, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Purified Draenic Water'), +(19889, 28399, 0, 1.2005, 0, 1, 0, 1, 1, 'Coilfang Slavehandler (Heroic) - Filtered Draenic Water'), +(19890, 5760, 0, 0.2813, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Eternium Lockbox'), +(19890, 17057, 0, 30.0042, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Shiny Fish Scales'), +(19890, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24012, 24012, 0.5, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Coilfang Soothsayer (Heroic) - (ReferenceTable)'), +(19890, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Coilfang Armaments'), +(19890, 24476, 0, 27.5848, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Jaggal Clam'), +(19890, 27858, 0, 4.7264, 0, 1, 0, 1, 3, 'Coilfang Soothsayer (Heroic) - Sunspring Carp'), +(19890, 27860, 0, 0.7737, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Purified Draenic Water'), +(19890, 28399, 0, 0.9847, 0, 1, 0, 1, 1, 'Coilfang Soothsayer (Heroic) - Filtered Draenic Water'), +(19887, 5760, 0, 0.3032, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Eternium Lockbox'), +(19887, 17057, 0, 30.7206, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Shiny Fish Scales'), +(19887, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Coilfang Enchantress (Heroic) - (ReferenceTable)'), +(19887, 24368, 0, 6, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Coilfang Armaments'), +(19887, 24476, 0, 26.5725, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Jaggal Clam'), +(19887, 27858, 0, 4.3675, 0, 1, 0, 1, 3, 'Coilfang Enchantress (Heroic) - Sunspring Carp'), +(19887, 27860, 0, 0.8709, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Purified Draenic Water'), +(19887, 28399, 0, 1.0967, 0, 1, 0, 1, 1, 'Coilfang Enchantress (Heroic) - Filtered Draenic Water'), +(19903, 5760, 0, 0.5039, 0, 1, 0, 1, 1, 'Coilfang Collaborator (Heroic) - Eternium Lockbox'), +(19903, 8766, 0, 2.4495, 0, 1, 0, 1, 1, 'Coilfang Collaborator (Heroic) - Morning Glory Dew'), +(19903, 8952, 0, 5.2981, 0, 1, 0, 1, 1, 'Coilfang Collaborator (Heroic) - Roasted Quail'), +(19903, 14047, 0, 15.0811, 0, 1, 0, 1, 3, 'Coilfang Collaborator (Heroic) - Runecloth'), +(19903, 21877, 0, 24.1606, 0, 1, 0, 1, 3, 'Coilfang Collaborator (Heroic) - Netherweave Cloth'), +(19903, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19903, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19903, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19903, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19903, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19903, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Coilfang Collaborator (Heroic) - (ReferenceTable)'), +(19902, 5760, 0, 0.2044, 0, 1, 0, 1, 1, 'Wastewalker Slave (Heroic) - Eternium Lockbox'), +(19902, 8766, 0, 1.0222, 0, 1, 0, 1, 1, 'Wastewalker Slave (Heroic) - Morning Glory Dew'), +(19902, 8952, 0, 1.9422, 0, 1, 0, 1, 1, 'Wastewalker Slave (Heroic) - Roasted Quail'), +(19902, 14047, 0, 7.2195, 0, 1, 0, 1, 3, 'Wastewalker Slave (Heroic) - Runecloth'), +(19902, 21877, 0, 25.5942, 0, 1, 0, 1, 3, 'Wastewalker Slave (Heroic) - Netherweave Cloth'), +(19902, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 24023, 24023, 1, 0, 1, 1, 1, 1, 'Wastewalker Slave (Heroic) - (ReferenceTable)'), +(19902, 27854, 0, 0.3067, 0, 1, 0, 1, 1, 'Wastewalker Slave (Heroic) - Smoked Talbuk Venison'), +(19902, 27860, 0, 0.1533, 0, 1, 0, 1, 1, 'Wastewalker Slave (Heroic) - Purified Draenic Water'), +(19904, 5760, 0, 0.2788, 0, 1, 0, 1, 1, 'Wastewalker Worker (Heroic) - Eternium Lockbox'), +(19904, 8766, 0, 1.1075, 0, 1, 0, 1, 1, 'Wastewalker Worker (Heroic) - Morning Glory Dew'), +(19904, 8952, 0, 1.9207, 0, 1, 0, 1, 1, 'Wastewalker Worker (Heroic) - Roasted Quail'), +(19904, 14047, 0, 5.824, 0, 1, 0, 1, 3, 'Wastewalker Worker (Heroic) - Runecloth'), +(19904, 21877, 0, 24.938, 0, 1, 0, 1, 3, 'Wastewalker Worker (Heroic) - Netherweave Cloth'), +(19904, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Wastewalker Worker (Heroic) - (ReferenceTable)'), +(19904, 27854, 0, 0.2943, 0, 1, 0, 1, 1, 'Wastewalker Worker (Heroic) - Smoked Talbuk Venison'), +(19904, 27860, 0, 0.1781, 0, 1, 0, 1, 1, 'Wastewalker Worker (Heroic) - Purified Draenic Water'), +(21842, 13926, 0, 0.2625, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Golden Pearl'), +(21842, 17057, 0, 22.5722, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Shiny Fish Scales'), +(21842, 17058, 0, 19.685, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Fish Oil'), +(21842, 22787, 0, 0.2625, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Ragveil'), +(21842, 22790, 0, 0.5249, 0, 1, 0, 1, 2, 'Coilfang Scale-Healer (Heroic) - Ancient Lichen'), +(21842, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Scale-Healer (Heroic) - (ReferenceTable)'), +(21842, 24368, 0, 12, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Coilfang Armaments'), +(21842, 24476, 0, 28.6089, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Jaggal Clam'), +(21842, 24478, 0, 33.333, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Jaggal Pearl'), +(21842, 27858, 0, 2.6247, 0, 1, 0, 1, 3, 'Coilfang Scale-Healer (Heroic) - Sunspring Carp'), +(21842, 27860, 0, 2.3622, 0, 1, 0, 1, 1, 'Coilfang Scale-Healer (Heroic) - Purified Draenic Water'), +(21843, 13926, 0, 0.1629, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Golden Pearl'), +(21843, 17057, 0, 26.2215, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Shiny Fish Scales'), +(21843, 17058, 0, 18.4039, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Fish Oil'), +(21843, 22790, 0, 0.4886, 0, 1, 0, 2, 3, 'Coilfang Tempest (Heroic) - Ancient Lichen'), +(21843, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Coilfang Tempest (Heroic) - (ReferenceTable)'), +(21843, 24368, 0, 12, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Coilfang Armaments'), +(21843, 24476, 0, 27.1987, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Jaggal Clam'), +(21843, 27858, 0, 3.0945, 0, 1, 0, 1, 3, 'Coilfang Tempest (Heroic) - Sunspring Carp'), +(21843, 27860, 0, 1.4658, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Purified Draenic Water'), +(21843, 31952, 0, 0.1629, 0, 1, 0, 1, 1, 'Coilfang Tempest (Heroic) - Khorium Lockbox'); + +DELETE FROM `creature_loot_template` WHERE `Reference` IN (24011, 24012, 24013) AND `entry` IN ( +17816, -- Bogstrok +17817, -- Greater Bogstrok +17938, -- Coilfang Observer +17940, -- Coilfang Technician +17957, -- Coilfang Champion +17958, -- Coilfang Defender +17959, -- Coilfang Slavehandler +17960, -- Coilfang Soothsayer +17961, -- Coilfang Enchantress +17962, -- Coilfang Collaborator +17963, -- Wastewalker Slave +17964, -- Wastewalker Worker +18206, -- Wastewalker Captive +21126, -- Coilfang Scale-Healer +21127 -- Coilfang Tempest +); + +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN ( +19884, -- Bogstrok +19885, -- Coilfang Champion (1) +19886, -- Coilfang Defender (1) +19887, -- Coilfang Enchantress (1) +19888, -- Coilfang Observer (1) +19889, -- Coilfang Slavehandler (1) +19890, -- Coilfang Soothsayer (1) +19891, -- Coilfang Technician (1) +19892, -- Greater Bogstrok (1) +19902, -- Wastewalker Slave (1) +19903, -- Coilfang Collaborator (1) +19904, -- Wastewalker Worker (1) +21842, -- Coilfang Scale-Healer (1) +21843 -- Coilfang Tempest (1) +); + +DELETE FROM `creature_loot_template` WHERE `Entry` IN (20255,20256,20258,20259,20260,20261,20264,20265) AND `Comment` LIKE '%(Heroic)%'; +INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(20258, 5760, 0, 0.49, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Eternium Lockbox'), +(20258, 13444, 0, 0.52, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Major Mana Potion'), +(20258, 13446, 0, 1, 0, 1, 0, 1, 3, 'Ethereal Scavenger (Heroic) - Major Healing Potion'), +(20258, 14047, 0, 12.74, 0, 1, 0, 1, 3, 'Ethereal Scavenger (Heroic) - Runecloth'), +(20258, 21877, 0, 24.02, 0, 1, 0, 1, 3, 'Ethereal Scavenger (Heroic) - Netherweave Cloth'), +(20258, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Scavenger (Heroic) - (ReferenceTable)'), +(20258, 25217, 0, 0.07, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Sundering Axe'), +(20258, 27854, 0, 4.55, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Smoked Talbuk Venison'), +(20258, 27860, 0, 0.44, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Purified Draenic Water'), +(20258, 28399, 0, 1.91, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Filtered Draenic Water'), +(20258, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Ethereum Prison Key'), +(20258, 31952, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Scavenger (Heroic) - Khorium Lockbox'), +(20255, 5760, 0, 0.47, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Eternium Lockbox'), +(20255, 13444, 0, 0.47, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Major Mana Potion'), +(20255, 13446, 0, 1.04, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Major Healing Potion'), +(20255, 14047, 0, 13.85, 0, 1, 0, 1, 3, 'Ethereal Crypt Raider (Heroic) - Runecloth'), +(20255, 21877, 0, 23.57, 0, 1, 0, 1, 3, 'Ethereal Crypt Raider (Heroic) - Netherweave Cloth'), +(20255, 23107, 0, 0.14, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Shadow Draenite'), +(20255, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 24093, 24093, 0.5, 0, 1, 1, 1, 1, 'Ethereal Crypt Raider (Heroic) - (ReferenceTable)'), +(20255, 25217, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Sundering Axe'), +(20255, 27854, 0, 4.4, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Smoked Talbuk Venison'), +(20255, 27860, 0, 0.25, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Purified Draenic Water'), +(20255, 28399, 0, 2.12, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Filtered Draenic Water'), +(20255, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Ethereum Prison Key'), +(20255, 29550, 0, 0.03, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Tome of Conjure Water IX'), +(20255, 31837, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Codex: Prayer of Shadow Protection II'), +(20255, 31952, 0, 0.05, 0, 1, 0, 1, 1, 'Ethereal Crypt Raider (Heroic) - Khorium Lockbox'), +(20260, 5760, 0, 0.16, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Eternium Lockbox'), +(20260, 13444, 0, 0.57, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Major Mana Potion'), +(20260, 13446, 0, 1.09, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Major Healing Potion'), +(20260, 14047, 0, 13.49, 0, 1, 0, 1, 3, 'Ethereal Spellbinder (Heroic) - Runecloth'), +(20260, 21877, 0, 24.39, 0, 1, 0, 1, 3, 'Ethereal Spellbinder (Heroic) - Netherweave Cloth'), +(20260, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24007, 24007, 1, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Spellbinder (Heroic) - (ReferenceTable)'), +(20260, 27854, 0, 4.67, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Smoked Talbuk Venison'), +(20260, 27860, 0, 0.32, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Purified Draenic Water'), +(20260, 28399, 0, 1.99, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Filtered Draenic Water'), +(20260, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Ethereum Prison Key'), +(20260, 31837, 0, 0.08, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Codex: Prayer of Shadow Protection II'), +(20260, 31952, 0, 0.06, 0, 1, 0, 1, 1, 'Ethereal Spellbinder (Heroic) - Khorium Lockbox'), +(20259, 5760, 0, 0.5, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Eternium Lockbox'), +(20259, 13444, 0, 0.58, 0, 1, 0, 1, 2, 'Ethereal Sorcerer (Heroic) - Major Mana Potion'), +(20259, 13446, 0, 1.06, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Major Healing Potion'), +(20259, 14047, 0, 13.77, 0, 1, 0, 1, 3, 'Ethereal Sorcerer (Heroic) - Runecloth'), +(20259, 21877, 0, 24.16, 0, 1, 0, 1, 3, 'Ethereal Sorcerer (Heroic) - Netherweave Cloth'), +(20259, 21929, 0, 0.11, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Flame Spessarite'), +(20259, 22146, 0, 0.03, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Book: Gift of the Wild III'), +(20259, 23077, 0, 0.13, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Blood Garnet'), +(20259, 23079, 0, 0.11, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Deep Peridot'), +(20259, 23107, 0, 0.13, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Shadow Draenite'), +(20259, 23117, 0, 0.11, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Azure Moonstone'), +(20259, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24007, 24007, 1, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Sorcerer (Heroic) - (ReferenceTable)'), +(20259, 27854, 0, 4.68, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Smoked Talbuk Venison'), +(20259, 27860, 0, 0.29, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Purified Draenic Water'), +(20259, 28399, 0, 1.97, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Filtered Draenic Water'), +(20259, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Ethereum Prison Key'), +(20259, 29550, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Tome of Conjure Water IX'), +(20259, 31837, 0, 0.06, 0, 1, 0, 1, 1, 'Ethereal Sorcerer (Heroic) - Codex: Prayer of Shadow Protection II'), +(20264, 21877, 0, 66.7, 0, 1, 0, 1, 3, 'Nexus Stalker (Heroic) - Netherweave Cloth'), +(20264, 22532, 0, 0.01, 0, 1, 0, 1, 1, 'Nexus Stalker (Heroic) - Formula: Enchant Bracer (Heroic) - Restore Mana Prime'), +(20264, 23615, 0, 3.94, 0, 1, 0, 1, 1, 'Nexus Stalker (Heroic) - Plans: Swiftsteel Gloves'), +(20264, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Nexus Stalker (Heroic) - (ReferenceTable)'), +(20264, 24093, 24093, 0.5, 0, 1, 1, 1, 1, 'Nexus Stalker (Heroic) - (ReferenceTable)'), +(20261, 13444, 0, 0.56, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Major Mana Potion'), +(20261, 13446, 0, 0.87, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Major Healing Potion'), +(20261, 14047, 0, 13.73, 0, 1, 0, 1, 3, 'Ethereal Theurgist (Heroic) - Runecloth'), +(20261, 19264, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Seven of Warlords'), +(20261, 21877, 0, 24.46, 0, 1, 0, 1, 3, 'Ethereal Theurgist (Heroic) - Netherweave Cloth'), +(20261, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24007, 24007, 1, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Theurgist (Heroic) - (ReferenceTable)'), +(20261, 27854, 0, 4.66, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Smoked Talbuk Venison'), +(20261, 27860, 0, 0.2, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Purified Draenic Water'), +(20261, 28399, 0, 1.8, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Filtered Draenic Water'), +(20261, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Ethereum Prison Key'), +(20261, 29549, 0, 0.06, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Codex: Prayer of Fortitude III'), +(20261, 29550, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Tome of Conjure Water IX'), +(20261, 31837, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Codex: Prayer of Shadow Protection II'), +(20261, 31952, 0, 0.12, 0, 1, 0, 1, 1, 'Ethereal Theurgist (Heroic) - Khorium Lockbox'), +(20256, 5760, 0, 0.52, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Eternium Lockbox'), +(20256, 13444, 0, 0.51, 0, 1, 0, 1, 2, 'Ethereal Darkcaster (Heroic) - Major Mana Potion'), +(20256, 13446, 0, 1.02, 0, 1, 0, 1, 3, 'Ethereal Darkcaster (Heroic) - Major Healing Potion'), +(20256, 14047, 0, 13.3, 0, 1, 0, 1, 3, 'Ethereal Darkcaster (Heroic) - Runecloth'), +(20256, 21877, 0, 23.54, 0, 1, 0, 1, 3, 'Ethereal Darkcaster (Heroic) - Netherweave Cloth'), +(20256, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24001, 24001, 5, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24007, 24007, 1, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24013, 24013, 1, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 24035, 24035, 2, 0, 1, 1, 1, 1, 'Ethereal Darkcaster (Heroic) - (ReferenceTable)'), +(20256, 27854, 0, 4.5, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Smoked Talbuk Venison'), +(20256, 27860, 0, 0.34, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Purified Draenic Water'), +(20256, 28399, 0, 1.96, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Filtered Draenic Water'), +(20256, 29460, 0, 3, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Ethereum Prison Key'), +(20256, 29549, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Codex: Prayer of Fortitude III'), +(20256, 31501, 0, 0.04, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Tome of Conjure Food VIII'), +(20256, 31837, 0, 0.09, 0, 1, 0, 1, 1, 'Ethereal Darkcaster (Heroic) - Codex: Prayer of Shadow Protection II'), +(20265, 5760, 0, 0.2555, 0, 1, 0, 1, 1, 'Nexus Terror (Heroic) - Eternium Lockbox'), +(20265, 22577, 0, 17.8397, 0, 1, 0, 1, 4, 'Nexus Terror (Heroic) - Mote of Shadow'), +(20265, 22790, 0, 0.031, 0, 1, 0, 1, 3, 'Nexus Terror (Heroic) - Ancient Lichen'), +(20265, 24000, 24000, 5, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24002, 24002, 5, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24003, 24003, 1, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24005, 24005, 1, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24008, 24008, 0.5, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24009, 24009, 1, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24011, 24011, 1, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 24012, 24012, 0.5, 0, 1, 1, 1, 1, 'Nexus Terror (Heroic) - (ReferenceTable)'), +(20265, 27854, 0, 0.3097, 0, 1, 0, 1, 1, 'Nexus Terror (Heroic) - Smoked Talbuk Venison'), +(20265, 27860, 0, 0.1084, 0, 1, 0, 1, 1, 'Nexus Terror (Heroic) - Purified Draenic Water'), +(20265, 29460, 0, 3, 0, 1, 0, 1, 1, 'Nexus Terror (Heroic) - Ethereum Prison Key'); + +DELETE FROM `creature_loot_template` WHERE `Reference` IN (24011, 24012, 24013) AND `entry` IN ( +18309, -- Ethereal Scavenger +18311, -- Ethereal Crypt Raider +18312, -- Ethereal Spellbinder +18313, -- Ethereal Sorcerer +18314, -- Nexus Stalker +18315, -- Ethereal Theurgist +18317, -- Ethereal Priest +18331, -- Ethereal Darkcaster +19307 -- Nexus Terror +); + +UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN ( +20255, -- Ethereal Crypt Raider (1) +20256, -- Ethereal Darkcaster (1) +20258, -- Ethereal Scavenger (1) +20259, -- Ethereal Sorcerer (1) +20260, -- Ethereal Spellbinder (1) +20261, -- Ethereal Theurgist (1) +20264, -- Nexus Stalker (1) +20265 -- Nexus Terror (1) +); From af1819430a7c40ae2625f492e47884a4b5f49c4c Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Dec 2022 01:22:38 +0000 Subject: [PATCH 09/83] chore(DB): import pending files Referenced commit(s): f2b5838d853498b3e2ec5ddc8538a9c4374f2d72 --- .../rev_1671115069241434700.sql => db_world/2022_12_16_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671115069241434700.sql => db_world/2022_12_16_00.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1671115069241434700.sql b/data/sql/updates/db_world/2022_12_16_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1671115069241434700.sql rename to data/sql/updates/db_world/2022_12_16_00.sql index bf29b05c5..b440a7d7a 100644 --- a/data/sql/updates/pending_db_world/rev_1671115069241434700.sql +++ b/data/sql/updates/db_world/2022_12_16_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_14_00 -> 2022_12_16_00 -- Delete old HFP Trash loot table DELETE FROM `creature_loot_template` WHERE `entry`=17370 AND `Comment` LIKE '%Hellfire Channeler%'; DELETE FROM `creature_loot_template` WHERE `entry`=17259 AND `Comment` LIKE '%Bonechewer Hungerer%'; From 52704611b08f3a6f8c697b08ea81b44bbe6fea53 Mon Sep 17 00:00:00 2001 From: Samsequel Date: Fri, 16 Dec 2022 02:30:07 +0100 Subject: [PATCH 10/83] fix(DB/SAI): Worms should not despawn instantly (#14233) --- data/sql/updates/pending_db_world/wormbenotgone.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/sql/updates/pending_db_world/wormbenotgone.sql diff --git a/data/sql/updates/pending_db_world/wormbenotgone.sql b/data/sql/updates/pending_db_world/wormbenotgone.sql new file mode 100644 index 000000000..89b432b32 --- /dev/null +++ b/data/sql/updates/pending_db_world/wormbenotgone.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22038) AND (`source_type` = 0) AND (`id` IN (12)); +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 +(22038, 0, 12, 0, 7, 0, 100, 512, 0, 0, 0, 0, 0, 41, 60000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, ' Hai\'shulud - On Evade - Despawn In 60000 ms'); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22482) AND (`source_type` = 0) AND (`id` IN (12)); +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 +(22482, 0, 12, 0, 7, 0, 100, 512, 0, 0, 0, 0, 0, 41, 60000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - On Evade - Despawn In 60000 ms'); From 8970ba631d4d4d7e6b8c28992a3803ef0f8f9eb7 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Dec 2022 01:32:07 +0000 Subject: [PATCH 11/83] chore(DB): import pending files Referenced commit(s): 52704611b08f3a6f8c697b08ea81b44bbe6fea53 --- .../wormbenotgone.sql => db_world/2022_12_16_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/wormbenotgone.sql => db_world/2022_12_16_01.sql} (97%) diff --git a/data/sql/updates/pending_db_world/wormbenotgone.sql b/data/sql/updates/db_world/2022_12_16_01.sql similarity index 97% rename from data/sql/updates/pending_db_world/wormbenotgone.sql rename to data/sql/updates/db_world/2022_12_16_01.sql index 89b432b32..2ff4df296 100644 --- a/data/sql/updates/pending_db_world/wormbenotgone.sql +++ b/data/sql/updates/db_world/2022_12_16_01.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_16_00 -> 2022_12_16_01 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22038) AND (`source_type` = 0) AND (`id` IN (12)); 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 From 6d610860e3129350d73819369054c867ad3a4e01 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Thu, 15 Dec 2022 19:32:34 -0600 Subject: [PATCH 12/83] fix(DB/Loot): Burning Legion Gate Key rate fix (Doorway to the Abyss) (#14232) * fix(DB/loot): Burning Legion Gate Key rate fix (Doorway to the Abyss) * Update rev_1671085315817265400.sql --- data/sql/updates/pending_db_world/rev_1671085315817265400.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671085315817265400.sql diff --git a/data/sql/updates/pending_db_world/rev_1671085315817265400.sql b/data/sql/updates/pending_db_world/rev_1671085315817265400.sql new file mode 100644 index 000000000..b23faaa42 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671085315817265400.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Entry`=19298 AND `Item`=29795 AND `Reference`=0 AND `GroupId`=0; From 48ab864b98de6551d7317b6e7b613f231fd5155b Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Dec 2022 01:34:43 +0000 Subject: [PATCH 13/83] chore(DB): import pending files Referenced commit(s): 6d610860e3129350d73819369054c867ad3a4e01 --- .../rev_1671085315817265400.sql => db_world/2022_12_16_02.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671085315817265400.sql => db_world/2022_12_16_02.sql} (73%) diff --git a/data/sql/updates/pending_db_world/rev_1671085315817265400.sql b/data/sql/updates/db_world/2022_12_16_02.sql similarity index 73% rename from data/sql/updates/pending_db_world/rev_1671085315817265400.sql rename to data/sql/updates/db_world/2022_12_16_02.sql index b23faaa42..b719b3dd6 100644 --- a/data/sql/updates/pending_db_world/rev_1671085315817265400.sql +++ b/data/sql/updates/db_world/2022_12_16_02.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_16_01 -> 2022_12_16_02 -- UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Entry`=19298 AND `Item`=29795 AND `Reference`=0 AND `GroupId`=0; From b509c46a45aebfa692f911070a613a6af1b411b3 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Thu, 15 Dec 2022 21:37:50 -0500 Subject: [PATCH 14/83] fix(DB/Quest): Add some ruRU localization to multiple quests. (#14202) * Create ruru-quest.sql * Add objective text for 1022. --- data/sql/updates/pending_db_world/ruru-quest.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/sql/updates/pending_db_world/ruru-quest.sql diff --git a/data/sql/updates/pending_db_world/ruru-quest.sql b/data/sql/updates/pending_db_world/ruru-quest.sql new file mode 100644 index 000000000..109f27ee1 --- /dev/null +++ b/data/sql/updates/pending_db_world/ruru-quest.sql @@ -0,0 +1,9 @@ +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к часовому Мелирии Ледяной Тени в Лесную Песнь, что в Ясеневом лесу.', `ObjectiveText1` = 'Изучите фолиант Мел\'Тандрис' WHERE `ID` = 1022 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к веселому духу эльфийки крови на Руины Луносвета, что в Лесах Вечной Песни.' WHERE `ID` = 1011 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Кривокрону в Лесную Песнь, что в Ясеневом лесу.' WHERE `ID` = 9517 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Пельтуру Белой Луне в Астранаар, что в Ясеневом лесу.' WHERE `ID` = 1035 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Шиндрелл Огненному Всполоху в Астранаар, что в Ясеневом лесу.' WHERE `ID` = 1134 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Раэне Волкопас в Астранаар, что в Ясеневом лесу.' WHERE `ID` = 1025 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Пельтуру Белой Луне в Астранаар, что в Ясеневом лесу.' WHERE `ID` = 1034 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Тересили.' WHERE `ID` = 945 AND `locale` = 'ruRU'; +UPDATE `quest_template_locale` SET `ObjectiveText1` = 'Освободите пленников из племени Тихвой' WHERE `ID` = 9544 AND `locale` = 'ruRU'; From 74645fdc76bdc75f21ff1744255e55e853f7ea86 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Dec 2022 02:40:11 +0000 Subject: [PATCH 15/83] chore(DB): import pending files Referenced commit(s): b509c46a45aebfa692f911070a613a6af1b411b3 --- .../ruru-quest.sql => db_world/2022_12_16_03.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/ruru-quest.sql => db_world/2022_12_16_03.sql} (97%) diff --git a/data/sql/updates/pending_db_world/ruru-quest.sql b/data/sql/updates/db_world/2022_12_16_03.sql similarity index 97% rename from data/sql/updates/pending_db_world/ruru-quest.sql rename to data/sql/updates/db_world/2022_12_16_03.sql index 109f27ee1..340401bfd 100644 --- a/data/sql/updates/pending_db_world/ruru-quest.sql +++ b/data/sql/updates/db_world/2022_12_16_03.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_16_02 -> 2022_12_16_03 UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к часовому Мелирии Ледяной Тени в Лесную Песнь, что в Ясеневом лесу.', `ObjectiveText1` = 'Изучите фолиант Мел\'Тандрис' WHERE `ID` = 1022 AND `locale` = 'ruRU'; UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к веселому духу эльфийки крови на Руины Луносвета, что в Лесах Вечной Песни.' WHERE `ID` = 1011 AND `locale` = 'ruRU'; UPDATE `quest_template_locale` SET `CompletedText` = 'Вернитесь к Кривокрону в Лесную Песнь, что в Ясеневом лесу.' WHERE `ID` = 9517 AND `locale` = 'ruRU'; From 7db0e583a09feeea6944b73c77c791860f59c4e6 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Fri, 16 Dec 2022 19:21:57 -0300 Subject: [PATCH 16/83] fix(DB/Creature): Add AQ40 missing onkill reputation gains (#14246) --- .../pending_db_world/rev_1671225346039183900.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671225346039183900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671225346039183900.sql b/data/sql/updates/pending_db_world/rev_1671225346039183900.sql new file mode 100644 index 000000000..fa31dcafe --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671225346039183900.sql @@ -0,0 +1,10 @@ +-- +DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (15233,15246,15247,15250,15252,15311,15312); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(15233, 910, 0, 0, 0, 100, 0, 0, 0, 0), +(15246, 910, 0, 3, 0, 100, 0, 0, 0, 0), +(15247, 910, 0, 3, 0, 100, 0, 0, 0, 0), +(15250, 910, 0, 3, 0, 100, 0, 0, 0, 0), +(15252, 910, 0, 3, 0, 100, 0, 0, 0, 0), +(15311, 910, 0, 3, 0, 100, 0, 0, 0, 0), +(15312, 910, 0, 3, 0, 100, 0, 0, 0, 0); From 2fbe8e47f55dd460e0f3a9ec9b8167ad0da22ceb Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Fri, 16 Dec 2022 22:24:01 +0000 Subject: [PATCH 17/83] chore(DB): import pending files Referenced commit(s): 7db0e583a09feeea6944b73c77c791860f59c4e6 --- .../rev_1671225346039183900.sql => db_world/2022_12_16_04.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671225346039183900.sql => db_world/2022_12_16_04.sql} (93%) diff --git a/data/sql/updates/pending_db_world/rev_1671225346039183900.sql b/data/sql/updates/db_world/2022_12_16_04.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1671225346039183900.sql rename to data/sql/updates/db_world/2022_12_16_04.sql index fa31dcafe..f0a14870d 100644 --- a/data/sql/updates/pending_db_world/rev_1671225346039183900.sql +++ b/data/sql/updates/db_world/2022_12_16_04.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_16_03 -> 2022_12_16_04 -- DELETE FROM `creature_onkill_reputation` WHERE `creature_id` IN (15233,15246,15247,15250,15252,15311,15312); INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES From 968bb3fa7e9980668bb52797e04273adbd2d8877 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 17 Dec 2022 17:23:22 -0300 Subject: [PATCH 18/83] chore(Core/SAI): Align SAI headers with TrinityCore (#14261) --- src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 1 + src/server/game/AI/SmartScripts/SmartScriptMgr.h | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index bc9237320..7486e3b00 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -316,6 +316,7 @@ void SmartAIMgr::LoadSmartAIFromDB() case SMART_EVENT_DEATH: case SMART_EVENT_KILL: case SMART_EVENT_SUMMONED_UNIT: + case SMART_EVENT_SUMMONED_UNIT_DIES: case SMART_EVENT_SPELLHIT: case SMART_EVENT_SPELLHIT_TARGET: case SMART_EVENT_DAMAGED: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 27cbca259..f37577f17 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -194,10 +194,15 @@ enum SMART_EVENT SMART_EVENT_DISTANCE_GAMEOBJECT = 76, // guid, entry, distance, repeat SMART_EVENT_COUNTER_SET = 77, // id, value, cooldownMin, cooldownMax - SMART_EVENT_TC_END = 78, + SMART_EVENT_SCENE_START = 78, // don't use on 3.3.5a + SMART_EVENT_SCENE_TRIGGER = 79, // don't use on 3.3.5a + SMART_EVENT_SCENE_CANCEL = 80, // don't use on 3.3.5a + SMART_EVENT_SCENE_COMPLETE = 81, // don't use on 3.3.5a SMART_EVENT_SUMMONED_UNIT_DIES = 82, // CreatureId(0 all), CooldownMin, CooldownMax + SMART_EVENT_TC_END = 83, + /* AC Custom Events */ SMART_EVENT_AC_START = 100, From 9c05974a243d97ffa50b10bfc49028aa31887efa Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:41:51 -0300 Subject: [PATCH 19/83] fix(DB/Loot): Remove Fel Spirit (22454) loot (#14268) Create rev_1671323007498257700.sql --- data/sql/updates/pending_db_world/rev_1671323007498257700.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671323007498257700.sql diff --git a/data/sql/updates/pending_db_world/rev_1671323007498257700.sql b/data/sql/updates/pending_db_world/rev_1671323007498257700.sql new file mode 100644 index 000000000..67c45012e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671323007498257700.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `creature_loot_template` WHERE `Entry` = 22454; +UPDATE `creature_template` SET `lootid` = 0 WHERE (`entry` = 22454); From 4ca370d940bd214d3fbb5b1677fef0412a5dd81e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sun, 18 Dec 2022 13:43:51 +0000 Subject: [PATCH 20/83] chore(DB): import pending files Referenced commit(s): 9c05974a243d97ffa50b10bfc49028aa31887efa --- .../rev_1671323007498257700.sql => db_world/2022_12_18_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671323007498257700.sql => db_world/2022_12_18_00.sql} (75%) diff --git a/data/sql/updates/pending_db_world/rev_1671323007498257700.sql b/data/sql/updates/db_world/2022_12_18_00.sql similarity index 75% rename from data/sql/updates/pending_db_world/rev_1671323007498257700.sql rename to data/sql/updates/db_world/2022_12_18_00.sql index 67c45012e..f2d18dfe4 100644 --- a/data/sql/updates/pending_db_world/rev_1671323007498257700.sql +++ b/data/sql/updates/db_world/2022_12_18_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_16_04 -> 2022_12_18_00 -- DELETE FROM `creature_loot_template` WHERE `Entry` = 22454; UPDATE `creature_template` SET `lootid` = 0 WHERE (`entry` = 22454); From 7990de44c1e4567c7bbdd7d3d78d27ac5129d993 Mon Sep 17 00:00:00 2001 From: ZhengPeiRu21 <98835050+ZhengPeiRu21@users.noreply.github.com> Date: Tue, 20 Dec 2022 04:14:53 -0700 Subject: [PATCH 21/83] fix(Core): Correct Quest Details Display at Max Level (#13046) * fix(Core): Quest Details Display at Max Level * Add OnSetMaxLevel hook --- .../game/Entities/Creature/GossipDef.cpp | 58 +++++++++++++++---- src/server/game/Entities/Player/Player.cpp | 4 +- .../Scripting/ScriptDefines/PlayerScript.cpp | 8 +++ src/server/game/Scripting/ScriptMgr.h | 3 + 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 70e7be7d6..4ac35d9af 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -450,10 +450,25 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGU data << uint32(0); } - uint8 playerLevel = _session->GetPlayer() ? _session->GetPlayer()->getLevel() : 0; - data << uint32(quest->GetRewOrReqMoney(playerLevel)); - uint32 questXp = uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate()); - sScriptMgr->OnQuestComputeXP(_session->GetPlayer(), quest, questXp); + uint32 moneyRew = 0; + Player* player = _session->GetPlayer(); + uint8 playerLevel = player ? player->getLevel() : 0; + if (player && (player->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) || sScriptMgr->ShouldBeRewardedWithMoneyInsteadOfExp(player))) + { + moneyRew = quest->GetRewMoneyMaxLevel(); + } + moneyRew += quest->GetRewOrReqMoney(player ? player->getLevel() : 0); // reward money (below max lvl) + data << moneyRew; + uint32 questXp; + if (player && !sScriptMgr->ShouldBeRewardedWithMoneyInsteadOfExp(player)) + { + questXp = uint32(quest->XPValue(playerLevel) * player->GetQuestRate()); + } + else + { + questXp = 0; + } + sScriptMgr->OnQuestComputeXP(player, quest, questXp); data << questXp; } @@ -535,7 +550,16 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const if (quest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS)) data << uint32(0); // Hide money rewarded else - data << uint32(quest->GetRewOrReqMoney(_session->GetPlayer() ? _session->GetPlayer()->getLevel() : 0)); // reward money (below max lvl) + { + uint32 moneyRew = 0; + Player* player = _session->GetPlayer(); + if (player && (player->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) || sScriptMgr->ShouldBeRewardedWithMoneyInsteadOfExp(player))) + { + moneyRew = quest->GetRewMoneyMaxLevel(); + } + moneyRew += quest->GetRewOrReqMoney(player ? player->getLevel() : 0); // reward money (below max lvl) + data << moneyRew; + } data << uint32(quest->GetRewMoneyMaxLevel()); // used in XP calculation at client data << uint32(quest->GetRewSpell()); // reward spell, this spell will display (icon) (cast if RewSpellCast == 0) @@ -679,11 +703,25 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, ObjectGuid npcGUI data << uint32(0); } - uint8 playerLevel = _session->GetPlayer() ? _session->GetPlayer()->getLevel() : 0; - - data << uint32(quest->GetRewOrReqMoney(playerLevel)); - uint32 questXp = uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate()); - sScriptMgr->OnQuestComputeXP(_session->GetPlayer(), quest, questXp); + uint32 moneyRew = 0; + Player* player = _session->GetPlayer(); + uint8 playerLevel = player ? player->getLevel() : 0; + if (player && (player->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) || sScriptMgr->ShouldBeRewardedWithMoneyInsteadOfExp(player))) + { + moneyRew = quest->GetRewMoneyMaxLevel(); + } + moneyRew += quest->GetRewOrReqMoney(player ? player->getLevel() : 0); // reward money (below max lvl) + data << moneyRew; + uint32 questXp; + if (player && !sScriptMgr->ShouldBeRewardedWithMoneyInsteadOfExp(player)) + { + questXp = uint32(quest->XPValue(playerLevel) * player->GetQuestRate()); + } + else + { + questXp = 0; + } + sScriptMgr->OnQuestComputeXP(player, quest, questXp); data << questXp; // rewarded honor points. Multiply with 10 to satisfy client diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c2cc2685e..2e6b965ab 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2537,7 +2537,9 @@ void Player::InitStatsForLevel(bool reapplyMods) PlayerLevelInfo info; sObjectMgr->GetPlayerLevelInfo(getRace(true), getClass(), getLevel(), &info); - SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); + uint32 maxPlayerLevel = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL); + sScriptMgr->OnSetMaxLevel(this, maxPlayerLevel); + SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, maxPlayerLevel); SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(getLevel())); // reset before any aura state sources (health set/aura apply) diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index 8c09e7b60..2434ac25f 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -637,6 +637,14 @@ void ScriptMgr::OnFirstLogin(Player* player) }); } +void ScriptMgr::OnSetMaxLevel(Player* player, uint32& maxPlayerLevel) +{ + ExecuteScript([&](PlayerScript* script) + { + script->OnSetMaxLevel(player, maxPlayerLevel); + }); +} + bool ScriptMgr::CanJoinInBattlegroundQueue(Player* player, ObjectGuid BattlemasterGuid, BattlegroundTypeId BGTypeID, uint8 joinAsGroup, GroupJoinBattlegroundResult& err) { auto ret = IsValidBoolScript([&](PlayerScript* script) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 3adf5264d..8e3545bd3 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1224,6 +1224,8 @@ public: virtual void OnFirstLogin(Player* /*player*/) { } + virtual void OnSetMaxLevel(Player* /*player*/, uint32& /*maxPlayerLevel*/) { } + [[nodiscard]] virtual bool CanJoinInBattlegroundQueue(Player* /*player*/, ObjectGuid /*BattlemasterGuid*/, BattlegroundTypeId /*BGTypeID*/, uint8 /*joinAsGroup*/, GroupJoinBattlegroundResult& /*err*/) { return true; } virtual bool ShouldBeRewardedWithMoneyInsteadOfExp(Player* /*player*/) { return false; } @@ -2295,6 +2297,7 @@ public: /* PlayerScript */ void OnAfterUpdateAttackPowerAndDamage(Player* player, float& level, float& base_attPower, float& attPowerMod, float& attPowerMultiplier, bool ranged); void OnBeforeInitTalentForLevel(Player* player, uint8& level, uint32& talentPointsForLevel); void OnFirstLogin(Player* player); + void OnSetMaxLevel(Player* player, uint32& maxPlayerLevel); void OnPlayerCompleteQuest(Player* player, Quest const* quest); void OnBattlegroundDesertion(Player* player, BattlegroundDesertionType const desertionType); bool CanJoinInBattlegroundQueue(Player* player, ObjectGuid BattlemasterGuid, BattlegroundTypeId BGTypeID, uint8 joinAsGroup, GroupJoinBattlegroundResult& err); From bc6613b65b5041526545f60e60f13dd65824db8f Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 20 Dec 2022 05:18:45 -0600 Subject: [PATCH 22/83] fix(DB/loot): Improve Mazthoril recipe drop rates (#14010) * fix(DB/loot): Improve Mazthoril recipe drop rates * remove heidisql artifacts around integers Co-authored-by: ZhengPeiRu21 <98835050+ZhengPeiRu21@users.noreply.github.com> --- .../sql/updates/pending_db_world/rev_1669870365832502100.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1669870365832502100.sql diff --git a/data/sql/updates/pending_db_world/rev_1669870365832502100.sql b/data/sql/updates/pending_db_world/rev_1669870365832502100.sql new file mode 100644 index 000000000..0d41a2ea8 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1669870365832502100.sql @@ -0,0 +1,5 @@ +-- +-- Improve Mazthoril Recipe Drop Rates +UPDATE `creature_loot_template` SET `Chance`=6 WHERE `Entry`=7437 AND `Item`=14493 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`=2 WHERE `Entry`=7437 AND `Item`=16054 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`=10 WHERE `Entry`=7437 AND `Item`=13497 AND `Reference`=0 AND `GroupId`=0; From 2b246ddff4542a58f5174e9f47e3ff60263e973b Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 11:20:49 +0000 Subject: [PATCH 23/83] chore(DB): import pending files Referenced commit(s): bc6613b65b5041526545f60e60f13dd65824db8f --- .../rev_1669870365832502100.sql => db_world/2022_12_20_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1669870365832502100.sql => db_world/2022_12_20_00.sql} (90%) diff --git a/data/sql/updates/pending_db_world/rev_1669870365832502100.sql b/data/sql/updates/db_world/2022_12_20_00.sql similarity index 90% rename from data/sql/updates/pending_db_world/rev_1669870365832502100.sql rename to data/sql/updates/db_world/2022_12_20_00.sql index 0d41a2ea8..0a2c54561 100644 --- a/data/sql/updates/pending_db_world/rev_1669870365832502100.sql +++ b/data/sql/updates/db_world/2022_12_20_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_18_00 -> 2022_12_20_00 -- -- Improve Mazthoril Recipe Drop Rates UPDATE `creature_loot_template` SET `Chance`=6 WHERE `Entry`=7437 AND `Item`=14493 AND `Reference`=0 AND `GroupId`=0; From af89efff537c2e44c7733ceac9f6649d2ba73a34 Mon Sep 17 00:00:00 2001 From: Samsequel Date: Tue, 20 Dec 2022 14:32:11 +0100 Subject: [PATCH 24/83] fix(DB/Creature): Corrected Spawn Time Terrorclaw (#14302) --- data/sql/updates/pending_db_world/terrorclaw.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/terrorclaw.sql diff --git a/data/sql/updates/pending_db_world/terrorclaw.sql b/data/sql/updates/pending_db_world/terrorclaw.sql new file mode 100644 index 000000000..94effbf65 --- /dev/null +++ b/data/sql/updates/pending_db_world/terrorclaw.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature` SET `spawntimesecs` = 450 WHERE (`id1` = 20477); From 0b85ec409aaa99002e56930768be6cb3c67e863e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 13:34:17 +0000 Subject: [PATCH 25/83] chore(DB): import pending files Referenced commit(s): af89efff537c2e44c7733ceac9f6649d2ba73a34 --- .../terrorclaw.sql => db_world/2022_12_20_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/terrorclaw.sql => db_world/2022_12_20_01.sql} (61%) diff --git a/data/sql/updates/pending_db_world/terrorclaw.sql b/data/sql/updates/db_world/2022_12_20_01.sql similarity index 61% rename from data/sql/updates/pending_db_world/terrorclaw.sql rename to data/sql/updates/db_world/2022_12_20_01.sql index 94effbf65..5b1dcd393 100644 --- a/data/sql/updates/pending_db_world/terrorclaw.sql +++ b/data/sql/updates/db_world/2022_12_20_01.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_20_00 -> 2022_12_20_01 -- UPDATE `creature` SET `spawntimesecs` = 450 WHERE (`id1` = 20477); From 30fe507e3e1330064b47ef600c9ec8c45292a940 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:35:42 -0300 Subject: [PATCH 26/83] fix(DB/SAI): Workaround bad model for Void Spawner L (#14289) --- data/sql/updates/pending_db_world/rev_1671397695840437500.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671397695840437500.sql diff --git a/data/sql/updates/pending_db_world/rev_1671397695840437500.sql b/data/sql/updates/pending_db_world/rev_1671397695840437500.sql new file mode 100644 index 000000000..bfb33c8b3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671397695840437500.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19681) AND (`source_type` = 0) AND (`id` IN (1)); +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 +(19681, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 18684, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Spawner L - On Respawn - Modelid Workaround'); From c6eb0ae58819d726de0e0c1b1f044cc266504bc3 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 13:37:46 +0000 Subject: [PATCH 27/83] chore(DB): import pending files Referenced commit(s): 30fe507e3e1330064b47ef600c9ec8c45292a940 --- .../rev_1671397695840437500.sql => db_world/2022_12_20_02.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671397695840437500.sql => db_world/2022_12_20_02.sql} (94%) diff --git a/data/sql/updates/pending_db_world/rev_1671397695840437500.sql b/data/sql/updates/db_world/2022_12_20_02.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1671397695840437500.sql rename to data/sql/updates/db_world/2022_12_20_02.sql index bfb33c8b3..0a1dbd23d 100644 --- a/data/sql/updates/pending_db_world/rev_1671397695840437500.sql +++ b/data/sql/updates/db_world/2022_12_20_02.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_20_01 -> 2022_12_20_02 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19681) AND (`source_type` = 0) AND (`id` IN (1)); 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 From 909dfe4bc0d2ac240f8a1bd40c2c42ab435431c3 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:39:42 -0300 Subject: [PATCH 28/83] fix(DB/creature/gameobject): Add more objects and creatures for 'Cipher of Damnation' questline (#14082) --- .../rev_1670274473115581800.sql | 951 ++++++++++++++++++ 1 file changed, 951 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1670274473115581800.sql diff --git a/data/sql/updates/pending_db_world/rev_1670274473115581800.sql b/data/sql/updates/pending_db_world/rev_1670274473115581800.sql new file mode 100644 index 000000000..e1a2d4891 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1670274473115581800.sql @@ -0,0 +1,951 @@ +-- +SET @OGUID := 21851; +SET @CGUID := 24871; + +-- Shadowmoon Tuber Mound +DELETE FROM `gameobject` WHERE `id`=184701 AND `zoneId`=3520 AND `guid` BETWEEN @OGUID+0 AND @OGUID+19; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0 , 184701, 530, 3520, 1, -2697.85, 1333.98, 91.3097, 0.699005, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+1 , 184701, 530, 3520, 1, -2645.99, 1348.08, 95.4309, 4.68098, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+2 , 184701, 530, 3520, 1, -2632.15, 1333.13, 90.4041, 3.64425, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+3 , 184701, 530, 3520, 1, -2632.96, 1366.76, 85.6183, 3.20835, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+4 , 184701, 530, 3520, 1, -2613.83, 1382.98, 80.3849, 0.671514, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+5 , 184701, 530, 3520, 1, -2581.9, 1447.93, 54.9344, 5.65487, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+6 , 184701, 530, 3520, 1, -2533.38, 1433.51, 46.7579, 4.13905, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+7 , 184701, 530, 3520, 1, -2517.41, 1381.57, 70.4857, 1.8182, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+8 , 184701, 530, 3520, 1, -2499.99, 1332.05, 69.9245, 4.06052, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+9 , 184701, 530, 3520, 1, -2467.54, 1198.92, 20.9814, 3.83668, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+10, 184701, 530, 3520, 1, -2484.28, 1182, 37.9382, 3.75029, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+11, 184701, 530, 3520, 1, -2515.99, 1149.86, 65.5265, 4.92839, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+12, 184701, 530, 3520, 1, -2533.52, 1199.38, 70.5336, 1.21346, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+13, 184701, 530, 3520, 1, -2548.65, 1246.51, 74.944, 2.25804, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+14, 184701, 530, 3520, 1, -2583.24, 1252.39, 78.4186, 6.25178, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+15, 184701, 530, 3520, 1, -2599.19, 1234.99, 79.2724, 3.70317, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+16, 184701, 530, 3520, 1, -2599.97, 1266.23, 80.5624, 2.74498, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+17, 184701, 530, 3520, 1, -2532.64, 1299.43, 68.5932, 2.23054, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+18, 184701, 530, 3520, 1, -2547.81, 1348.61, 82.7023, 2.3405, 0, 0, 0, 0, 180, 255, 1), +(@OGUID+19, 184701, 530, 3520, 1, -2548.12, 1383.13, 83.6599, 0.903221, 0, 0, 0, 0, 180, 255, 1); + +-- Shadowmoon Valley Tuber Node +DELETE FROM `creature` WHERE `id1`=21347 AND `guid` IN (77821,77822,77823,77824,77825,77826,77827,77828,77829,77830); +DELETE FROM `creature` WHERE `id1`=21347 AND `zoneId`=3520 AND `guid` BETWEEN @CGUID+0 AND @CGUID+29; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `currentwaypoint`, `MovementType`) VALUES +(@CGUID+0 , 21347, 530, 3520, 1, 0, -2681.68, 1485.73, 24.2592, 0.401426, 180, 0, 0), +(@CGUID+1 , 21347, 530, 3520, 1, 0, -2697.64, 1334.04, 91.3392, 3.3872, 180, 0, 0), +(@CGUID+2 , 21347, 530, 3520, 1, 0, -2633.26, 1366.75, 85.7008, 0.139571, 180, 0, 0), +(@CGUID+3 , 21347, 530, 3520, 1, 0, -2614.25, 1382.97, 80.4097, 0.139571, 180, 0, 0), +(@CGUID+4 , 21347, 530, 3520, 1, 0, -2548.38, 1382.88, 83.8288, 0.61081, 180, 0, 0), +(@CGUID+5 , 21347, 530, 3520, 1, 0, -2517.07, 1381.81, 70.2143, 3.8655, 180, 0, 0), +(@CGUID+6 , 21347, 530, 3520, 1, 0, -2533.31, 1433.58, 46.7008, 3.8655, 180, 0, 0), +(@CGUID+7 , 21347, 530, 3520, 1, 0, -2599.63, 1266.48, 80.4769, 3.8655, 180, 0, 0), +(@CGUID+8 , 21347, 530, 3520, 1, 0, -2582.83, 1252.49, 78.4565, 3.24503, 180, 0, 0), +(@CGUID+9 , 21347, 530, 3520, 1, 0, -2548.85, 1246.83, 74.9428, 5.35618, 180, 0, 0), +(@CGUID+10, 21347, 530, 3520, 1, 0, -2500.13, 1332.44, 70.0163, 5.35618, 180, 0, 0), +(@CGUID+11, 21347, 530, 3520, 1, 0, -2465.7, 1299.19, 43.4429, 5.35618, 180, 0, 0), +(@CGUID+12, 21347, 530, 3520, 1, 0, -2598.86, 1234.89, 79.1238, 2.94031, 180, 0, 0), +(@CGUID+13, 21347, 530, 3520, 1, 0, -2532.65, 1299.56, 68.7003, 4.8948, 180, 0, 0), +(@CGUID+14, 21347, 530, 3520, 1, 0, -2515.64, 1150.27, 65.4093, 3.39077, 180, 0, 0), +(@CGUID+15, 21347, 530, 3520, 1, 0, -2581.6, 1448.16, 54.8429, 3.39077, 180, 0, 0), +(@CGUID+16, 21347, 530, 3520, 1, 0, -2645.58, 1348.26, 95.2305, 3.39077, 180, 0, 0), +(@CGUID+17, 21347, 530, 3520, 1, 0, -2547.91, 1348.76, 82.7689, 5.01654, 180, 0, 0), +(@CGUID+18, 21347, 530, 3520, 1, 0, -2533.43, 1199.5, 70.4887, 4.21544, 180, 0, 0), +(@CGUID+19, 21347, 530, 3520, 1, 0, -2632.01, 1333.63, 90.4338, 4.59243, 180, 0, 0), +(@CGUID+20, 21347, 530, 3520, 1, 0, -2483.82, 1182.09, 37.672, 3.10174, 180, 0, 0), +(@CGUID+21, 21347, 530, 3520, 1, 0, -2467.18, 1199.15, 20.7894, 3.4536, 180, 0, 0), +(@CGUID+22, 21347, 530, 3520, 1, 0, -2518.09, 1180.25, 65.1497, 3.39077, 180, 0, 0), +(@CGUID+23, 21347, 530, 3520, 1, 0, -2500.14, 1165.85, 53.6676, 4.87127, 180, 0, 0), +(@CGUID+24, 21347, 530, 3520, 1, 0, -2566.39, 1200.25, 77.7982, 6.12882, 180, 0, 0), +(@CGUID+25, 21347, 530, 3520, 1, 0, -2566.65, 1165.72, 76.1817, 4.56588, 180, 0, 0), +(@CGUID+26, 21347, 530, 3520, 1, 0, -2550.49, 1149.13, 77.7456, 5.42208, 180, 0, 0), +(@CGUID+27, 21347, 530, 3520, 1, 0, -2484.61, 1315.87, 58.3943, 0.049953, 180, 0, 0), +(@CGUID+28, 21347, 530, 3520, 1, 0, -2466.51, 1332.21, 49.4113, 2.21373, 180, 0, 0), +(@CGUID+29, 21347, 530, 3520, 1, 0, -2483.17, 1216.38, 42.5085, 3.4536, 180, 0, 0); + +SET @CGUID := 84029; + +-- Domesticated Felboar +DELETE FROM `creature` WHERE `id1`=21195 AND `guid` IN (77832,77833,77834,77835,77836,77837,77838,77839); +DELETE FROM `creature` WHERE `id1`=21195 AND `zoneId`=3520 AND `guid` BETWEEN @CGUID+0 AND @CGUID+34; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@CGUID+0 , 21195, 530, 3520, 0, 1, 1, 0, -2588.75, 1091.04, 59.9092, 1.17927, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+1 , 21195, 530, 3520, 0, 1, 1, 0, -2543.62, 1118.17, 71.2176, 1.08895, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+2 , 21195, 530, 3520, 0, 1, 1, 0, -2523.45, 1153.34, 68.9991, 4.22975, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+3 , 21195, 530, 3520, 0, 1, 1, 0, -2552.1, 1175.69, 78.8479, 3.00296, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+4 , 21195, 530, 3520, 0, 1, 1, 0, -2462.39, 1273.3, 35.5286, 2.99118, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+5 , 21195, 530, 3520, 0, 1, 1, 0, -2481.78, 1175.69, 37.8072, 1.88377, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+6 , 21195, 530, 3520, 0, 1, 1, 0, -2546.81, 1231.11, 72.8316, 1.52637, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+7 , 21195, 530, 3520, 0, 1, 1, 0, -2511.39, 1227.9, 61.0218, 3.70192, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+8 , 21195, 530, 3520, 0, 1, 1, 0, -2581.92, 1220.64, 77.0188, 1.73843, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+9 , 21195, 530, 3520, 0, 1, 1, 0, -2511.58, 1204.96, 58.753, 2.79872, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+10, 21195, 530, 3520, 0, 1, 1, 0, -2568.08, 1241.86, 80.5805, 2.16743, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+11, 21195, 530, 3520, 0, 1, 1, 0, -2493.88, 1280.81, 57.6669, 2.39127, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+12, 21195, 530, 3520, 0, 1, 1, 0, -2475.34, 1311.98, 47.4481, 2.34022, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+13, 21195, 530, 3520, 0, 1, 1, 0, -2525.07, 1313.36, 65.936, 2.56013, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+14, 21195, 530, 3520, 0, 1, 1, 0, -2570.61, 1374.26, 84.8053, 3.11384, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+15, 21195, 530, 3520, 0, 1, 1, 0, -2550.49, 1310.61, 79.8304, 3.53168, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+16, 21195, 530, 3520, 0, 1, 1, 0, -2507.78, 1381.64, 65.6897, 3.94401, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+17, 21195, 530, 3520, 0, 1, 1, 0, -2567.65, 1445.42, 55.5677, 3.86547, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+18, 21195, 530, 3520, 0, 1, 1, 0, -2583.85, 1418.77, 74.3185, 4.68669, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+19, 21195, 530, 3520, 0, 1, 1, 0, -2623.92, 1449.6, 52.1637, 3.34732, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+20, 21195, 530, 3520, 0, 1, 1, 0, -2619.86, 1364.69, 83.0265, 3.71044, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+21, 21195, 530, 3520, 0, 1, 1, 0, -2619.8, 1316.13, 84.1189, 3.94921, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+22, 21195, 530, 3520, 0, 1, 1, 0, -2706.39, 1364.84, 92.2946, 0.50056, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+23, 21195, 530, 3520, 0, 1, 1, 0, -2701.88, 1323.35, 90.4227, 6.16328, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+24, 21195, 530, 3520, 0, 1, 1, 0, -2749.56, 1352.11, 89.3066, 6.2693, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+25, 21195, 530, 3520, 0, 1, 1, 0, -2714.38, 1304.45, 84.5302, 6.04939, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+26, 21195, 530, 3520, 0, 1, 1, 0, -2825.32, 1259.45, 75.399, 1.02088, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+27, 21195, 530, 3520, 0, 1, 1, 0, -2816.47, 1269.8, 76.3112, 0.600692, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+28, 21195, 530, 3520, 0, 1, 1, 0, -2794.3, 1256.81, 74.7389, 5.39555, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+29, 21195, 530, 3520, 0, 1, 1, 0, -2795.26, 1246.96, 74.6738, 4.73031, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+30, 21195, 530, 3520, 0, 1, 1, 0, -2802.93, 1238.03, 75.3009, 3.27811, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+31, 21195, 530, 3520, 0, 1, 1, 0, -2600.63, 1250.26, 80.1918, 4.33513, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+32, 21195, 530, 3520, 0, 1, 1, 0, -2594.22, 1313.18, 80.6982, 1.63336, 300, 5, 0, 6000, 0, 1, 0, 0, 0, '', 0), +(@CGUID+33, 21195, 530, 3520, 0, 1, 1, 0, -2694.88, 1495, 19.2922, 2.33106, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0), +(@CGUID+34, 21195, 530, 3520, 0, 1, 1, 0, -2706.26, 1538.41, 16.6343, 1.96146, 300, 5, 0, 5900, 0, 1, 0, 0, 0, '', 0); + +-- Enraged Spirits +SET @CGUID := 139014; + +DELETE FROM `creature` WHERE `id1` IN (21050, 21059, 21061) AND `map`=530 AND `guid` IN (73925,73926,73927,73928,73929,73930,73931,73932,73933,73934,73935,73936,73937,73938,73939,73940,73941,73942,73943,73944,73945,73946,73947,73966,73967,73968,73969,73970,73971,73972,73973,73974,73975,73976,73977,73978,73979,73980,74009,74010,74011,74012,74013,74014,74015,74016,74017,74018,74019,74020,74021,74022,74023,74024,74025,74026,74027,74028,74029,74030,74031,74032,74033,74034); +DELETE FROM `creature` WHERE `id1` IN (21050, 21059, 21061) AND `map`=530 AND `zoneId`=3520 AND `guid` BETWEEN @CGUID+0 AND @CGUID+112; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@CGUID+0 , 21059, 530, 3520, 0, 1, 1, 0, -3224.43, 1760.16, 88.7074, 3.33868, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+1 , 21059, 530, 3520, 0, 1, 1, 0, -3204.06, 1768.41, 88.518, 6.26688, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+2 , 21059, 530, 3520, 0, 1, 1, 0, -3001.79, 1761.2, 74.9996, 4.94763, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+3 , 21059, 530, 3520, 0, 1, 1, 0, -2928.13, 1705.48, 66.4199, 2.00517, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+4 , 21059, 530, 3520, 0, 1, 1, 0, -2950.92, 1718.03, 66.3021, 3.91712, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+5 , 21059, 530, 3520, 0, 1, 1, 0, -2846.79, 1431.87, 7.39514, 4.86947, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+6 , 21059, 530, 3520, 0, 1, 1, 0, -2784.99, 1517.12, 6.6233, 3.45007, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+7 , 21059, 530, 3520, 0, 1, 1, 0, -2776.69, 1485.5, 9.3087, 2.77692, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+8 , 21059, 530, 3520, 0, 1, 1, 0, -2818.43, 1454.18, 6.00247, 5.03667, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+9 , 21059, 530, 3520, 0, 1, 1, 0, -2860.71, 1461.54, 6.06178, 5.7083, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+10 , 21059, 530, 3520, 0, 1, 1, 0, -2878.59, 1414.53, 6.17893, 1.59034, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+11 , 21059, 530, 3520, 0, 1, 1, 0, -2956.57, 1338.59, 6.40337, 1.55845, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+12 , 21059, 530, 3520, 0, 1, 1, 0, -2945.84, 1231.56, 6.22122, 1.7013, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+13 , 21059, 530, 3520, 0, 1, 1, 0, -2954.98, 1262.26, 6.06318, 4.13998, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+14 , 21059, 530, 3520, 0, 1, 1, 0, -2920.84, 1187.07, 6.30659, 1.30447, 300, 0, 0, 0, 0, 0, 0, '', 0), +(@CGUID+15 , 21061, 530, 3520, 0, 1, 1, 0, -3968.54, 1361.08, 41.2782, 0.706255, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+16 , 21061, 530, 3520, 0, 1, 1, 0, -3963.22, 1303.42, 39.7245, 1.64708, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+17 , 21061, 530, 3520, 0, 1, 1, 0, -3884.35, 1303.79, 39.8678, 3.39144, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+18 , 21061, 530, 3520, 0, 1, 1, 0, -3950.14, 1455.5, 39.7245, 0.340844, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+19 , 21061, 530, 3520, 0, 1, 1, 0, -3834.73, 1337.66, 40.1013, 0.576025, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+20 , 21061, 530, 3520, 0, 1, 1, 0, -3883.37, 1264.32, 39.5904, 1.22604, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+21 , 21061, 530, 3520, 0, 1, 1, 0, -3866.72, 1401.26, 39.6912, 4.85331, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+22 , 21061, 530, 3520, 0, 1, 1, 0, -3819.41, 1477.47, 43.6266, 2.45592, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+23 , 21061, 530, 3520, 0, 1, 1, 0, -3854.83, 1443.3, 40.571, 1.32575, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+24 , 21061, 530, 3520, 0, 1, 1, 0, -3873.48, 1528.28, 40.611, 3.78045, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+25 , 21061, 530, 3520, 0, 1, 1, 0, -3806.79, 1549.52, 37.9821, 0.420714, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+26 , 21061, 530, 3520, 0, 1, 1, 0, -3946.14, 1516.71, 40.2113, 0.986133, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+27 , 21061, 530, 3520, 0, 1, 1, 0, -3752.96, 1479.47, 46.977, 1.71976, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+28 , 21061, 530, 3520, 0, 1, 1, 0, -3778.27, 1549.23, 45.3244, 5.32437, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+29 , 21061, 530, 3520, 0, 1, 1, 0, -3710.82, 1516.76, 48.4062, 1.64677, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+30 , 21061, 530, 3520, 0, 1, 1, 0, -3718.24, 1584.41, 43.832, 2.1266, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+31 , 21061, 530, 3520, 0, 1, 1, 0, -3733.8, 1617.51, 40.692, 3.29348, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+32 , 21061, 530, 3520, 0, 1, 1, 0, -3634.64, 1514.7, 85.5661, 6.18829, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+33 , 21061, 530, 3520, 0, 1, 1, 0, -3655.4, 1558.27, 49.4238, 3.34238, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+34 , 21061, 530, 3520, 0, 1, 1, 0, -3692.61, 1653.05, 39.5606, 5.04862, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+35 , 21061, 530, 3520, 0, 1, 1, 0, -3763.17, 1651.65, 39.7542, 5.163, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+36 , 21061, 530, 3520, 0, 1, 1, 0, -3753.69, 1685.95, 40.8027, 6.0002, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+37 , 21061, 530, 3520, 0, 1, 1, 0, -3677.91, 1739.52, 39.7107, 0.775721, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+38 , 21061, 530, 3520, 0, 1, 1, 0, -3567.78, 1687.13, 39.196, 0.580259, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+39 , 21061, 530, 3520, 0, 1, 1, 0, -3607.61, 1725.36, 39.6476, 1.57954, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+40 , 21061, 530, 3520, 0, 1, 1, 0, -3584.38, 1581.99, 47.3112, 1.2693, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+41 , 21061, 530, 3520, 0, 1, 1, 0, -3548.88, 1617.36, 45.9313, 2.45798, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+42 , 21061, 530, 3520, 0, 1, 1, 0, -3514.87, 1579.91, 46.9587, 2.1356, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+43 , 21061, 530, 3520, 0, 1, 1, 0, -3512.37, 1657.09, 46.5084, 0.812379, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+44 , 21061, 530, 3520, 0, 1, 1, 0, -3422.72, 1584.4, 47.0002, 3.21533, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+45 , 21061, 530, 3520, 0, 1, 1, 0, -3448.42, 1550.4, 46.9103, 2.47953, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+46 , 21061, 530, 3520, 0, 1, 1, 0, -3386.55, 1724.77, 100.892, 0.984227, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+47 , 21061, 530, 3520, 0, 1, 1, 0, -3361.98, 1668.26, 94.5774, 2.7624, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+48 , 21061, 530, 3520, 0, 1, 1, 0, -3425.41, 1771.37, 100.913, 3.38891, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+49 , 21061, 530, 3520, 0, 1, 1, 0, -3408.99, 1804.68, 97.3149, 4.39471, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+50 , 21061, 530, 3520, 0, 1, 1, 0, -3362.61, 1591.45, 47.8508, 1.63153, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+51 , 21061, 530, 3520, 0, 1, 1, 0, -3399.76, 1549.37, 48.0584, 0.029315, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+52 , 21061, 530, 3520, 0, 1, 1, 0, -3381.92, 1514.21, 52.1144, 5.40148, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+53 , 21061, 530, 3520, 0, 1, 1, 0, -3346.89, 1547.98, 52.4251, 0.512492, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+54 , 21061, 530, 3520, 0, 1, 1, 0, -3244.68, 1583.9, 49.6432, 3.05807, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+55 , 21061, 530, 3520, 0, 1, 1, 0, -3266.77, 1516.69, 50.8083, 4.7047, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+56 , 21061, 530, 3520, 0, 1, 1, 0, -3261.72, 1358.51, 50.1417, 1.72788, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+57 , 21061, 530, 3520, 0, 1, 1, 0, -3291.02, 1545.25, 51.1038, 2.58187, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+58 , 21061, 530, 3520, 0, 1, 1, 0, -3282.52, 1451.43, 50.7437, 2.22636, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+59 , 21061, 530, 3520, 0, 1, 1, 0, -3191.68, 1355.13, 5.91906, 6.24724, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+60 , 21061, 530, 3520, 0, 1, 1, 0, -3016.8, 1379.48, 11.4796, 3.46588, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+61 , 21050, 530, 3520, 0, 1, 1, 0, -3866.74, 1336.03, 42.7486, 2.14247, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+62 , 21050, 530, 3520, 0, 1, 1, 0, -3908.3, 1395.08, 43.2167, 0.114535, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+63 , 21050, 530, 3520, 0, 1, 1, 0, -3842.79, 1281.76, 51.6658, 4.92514, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+64 , 21050, 530, 3520, 0, 1, 1, 0, -3960.71, 1276.08, 56.7778, 0.528321, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+65 , 21050, 530, 3520, 0, 1, 1, 0, -3933.35, 1261.86, 54.7565, 4.07942, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+66 , 21050, 530, 3520, 0, 1, 1, 0, -3814.53, 1248.94, 78.7139, 6.01853, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+67 , 21050, 530, 3520, 0, 1, 1, 0, -3878.6, 1180.44, 72.4859, 2.53073, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+68 , 21050, 530, 3520, 0, 1, 1, 0, -3741.47, 1281.56, 113.827, 3.2842, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+69 , 21050, 530, 3520, 0, 1, 1, 0, -3996.54, 1337.67, 81.5658, 3.72117, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+70 , 21050, 530, 3520, 0, 1, 1, 0, -4005.85, 1462.7, 92.2766, 6.18036, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+71 , 21050, 530, 3520, 0, 1, 1, 0, -3902.12, 1516.6, 43.0391, 3.53873, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+72 , 21050, 530, 3520, 0, 1, 1, 0, -3968.62, 1563.53, 66.1491, 0.20554, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+73 , 21050, 530, 3520, 0, 1, 1, 0, -3961.45, 1641.89, 90.4925, 1.10937, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+74 , 21050, 530, 3520, 0, 1, 1, 0, -3883.6, 1587.64, 81.933, 4.34951, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+75 , 21050, 530, 3520, 0, 1, 1, 0, -3879.77, 1645.16, 84.8452, 5.43915, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+76 , 21050, 530, 3520, 0, 1, 1, 0, -3819.02, 1653.58, 74.8555, 4.49789, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+77 , 21050, 530, 3520, 0, 1, 1, 0, -3814.05, 1717.88, 93.483, 2.57839, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+78 , 21050, 530, 3520, 0, 1, 1, 0, -3867.83, 1732.11, 101.715, 4.01072, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+79 , 21050, 530, 3520, 0, 1, 1, 0, -3749.21, 1753.94, 83.4297, 5.96163, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+80 , 21050, 530, 3520, 0, 1, 1, 0, -3750.26, 1813.89, 89.6853, 2.48003, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+81 , 21050, 530, 3520, 0, 1, 1, 0, -3686.87, 1699.5, 40.8981, 2.73185, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+82 , 21050, 530, 3520, 0, 1, 1, 0, -3714.73, 1818.34, 76.9875, 4.29816, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+83 , 21050, 530, 3520, 0, 1, 1, 0, -3659.33, 1756.46, 40.7826, 4.5179, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+84 , 21050, 530, 3520, 0, 1, 1, 0, -3710.71, 1879.9, 91.278, 4.32894, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+85 , 21050, 530, 3520, 0, 1, 1, 0, -3747.35, 1896.42, 104.948, 0.701709, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+86 , 21050, 530, 3520, 0, 1, 1, 0, -3658.19, 1846.85, 61.838, 0.719818, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+87 , 21050, 530, 3520, 0, 1, 1, 0, -3526.23, 1923.23, 76.3661, 2.50152, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+88 , 21050, 530, 3520, 0, 1, 1, 0, -3513.7, 1870.48, 86.7485, 3.29156, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+89 , 21050, 530, 3520, 0, 1, 1, 0, -3505.91, 1821.85, 92.6996, 2.87824, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+90 , 21050, 530, 3520, 0, 1, 1, 0, -3466.11, 1809.79, 103.944, 6.22427, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+91 , 21050, 530, 3520, 0, 1, 1, 0, -3348.61, 1750.61, 101.406, 0.831706, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+92 , 21050, 530, 3520, 0, 1, 1, 0, -3418.54, 1716.53, 106.613, 2.20875, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+93 , 21050, 530, 3520, 0, 1, 1, 0, -3328.62, 1641.06, 89.9, 2.59389, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+94 , 21050, 530, 3520, 0, 1, 1, 0, -3286.54, 1686.47, 75.6401, 0.366946, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+95 , 21050, 530, 3520, 0, 1, 1, 0, -3417.78, 1652.07, 111.668, 3.50989, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+96 , 21050, 530, 3520, 0, 1, 1, 0, -3217.03, 1614.58, 70.6184, 2.13346, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+97 , 21050, 530, 3520, 0, 1, 1, 0, -3181.77, 1512.9, 61.2214, 2.29262, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+98 , 21050, 530, 3520, 0, 1, 1, 0, -3234.64, 1496.7, 53.6191, 2.07511, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+99 , 21050, 530, 3520, 0, 1, 1, 0, -3079.58, 1456.18, 14.044, 6.10865, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+100, 21050, 530, 3520, 0, 1, 1, 0, -3186.01, 1480.49, 55.147, 4.98156, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+101, 21050, 530, 3520, 0, 1, 1, 0, -3084.11, 1384.97, 9.9188, 0.102195, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+102, 21050, 530, 3520, 0, 1, 1, 0, -3149.65, 1385.47, 12.661, 5.95624, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+103, 21050, 530, 3520, 0, 1, 1, 0, -3182.7, 1314.61, 23.5287, 0.468016, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+104, 21050, 530, 3520, 0, 1, 1, 0, -3254.08, 1315.39, 66.9697, 4.71239, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+105, 21050, 530, 3520, 0, 1, 1, 0, -3333.87, 1488.85, 60.6105, 1.5283, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+106, 21050, 530, 3520, 0, 1, 1, 0, -3473.86, 1639.24, 53.9217, 1.46985, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+107, 21050, 530, 3520, 0, 1, 1, 0, -3593.99, 1643.34, 42.1577, 1.66699, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+108, 21050, 530, 3520, 0, 1, 1, 0, -3523.99, 1697.71, 57.5735, 1.24426, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+109, 21050, 530, 3520, 0, 1, 1, 0, -3585.89, 1736.06, 40.8809, 4.44223, 300, 0, 0, 2, 0, 0, 0, '', 0), +(@CGUID+110, 21050, 530, 3520, 0, 1, 1, 0, -3685.64, 1614.46, 42.1778, 0.566572, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+111, 21050, 530, 3520, 0, 1, 1, 0, -3768.28, 1611.41, 42.0603, 1.76327, 300, 5, 0, 1, 0, 0, 0, '', 0), +(@CGUID+112, 21050, 530, 3520, 0, 1, 1, 0, -3833.01, 1561.89, 42.2378, 5.18968, 300, 0, 0, 2, 0, 0, 0, '', 0); + +DELETE FROM `creature_addon` WHERE `guid` IN (139018,139024,139030,139034,139035,139037,139039,139046,139048,139052,139053,139057,139060,139061,139063,139064,139068,139069,139070,139073,139074,139075,139085,139095,139097,139112,139114,139117,139119,139123,139126); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(139018, 1390180, 0, 0, 4097, 0, 0, NULL), +(139024, 1390240, 0, 0, 4097, 0, 0, NULL), +(139030, 1390300, 0, 0, 4097, 0, 0, NULL), +(139034, 1390340, 0, 0, 4097, 0, 0, NULL), +(139035, 1390350, 0, 0, 4097, 0, 0, NULL), +(139037, 1390370, 0, 0, 4097, 0, 0, NULL), +(139039, 1390390, 0, 0, 4097, 0, 0, NULL), +(139046, 1390460, 0, 0, 4097, 0, 0, NULL), +(139048, 1390480, 0, 0, 4097, 0, 0, NULL), +(139052, 1390520, 0, 0, 4097, 0, 0, NULL), +(139053, 1390530, 0, 0, 4097, 0, 0, NULL), +(139057, 1390570, 0, 0, 4097, 0, 0, NULL), +(139060, 1390600, 0, 0, 4097, 0, 0, NULL), +(139061, 1390610, 0, 0, 4097, 0, 0, NULL), +(139063, 1390630, 0, 0, 4097, 0, 0, NULL), +(139064, 1390640, 0, 0, 4097, 0, 0, NULL), +(139068, 1390680, 0, 0, 4097, 0, 0, NULL), +(139069, 1390690, 0, 0, 4097, 0, 0, NULL), +(139070, 1390700, 0, 0, 4097, 0, 0, NULL), +(139073, 1390730, 0, 0, 4097, 0, 0, NULL), +(139074, 1390740, 0, 0, 4097, 0, 0, NULL), +(139075, 1390750, 0, 0, 4097, 0, 0, NULL), +(139085, 1390850, 0, 0, 4097, 0, 0, NULL), +(139095, 1390950, 0, 0, 4097, 0, 0, NULL), +(139097, 1390970, 0, 0, 4097, 0, 0, NULL), +(139112, 1391120, 0, 0, 4097, 0, 0, NULL), +(139114, 1391140, 0, 0, 4097, 0, 0, NULL), +(139117, 1391170, 0, 0, 4097, 0, 0, NULL), +(139119, 1391190, 0, 0, 4097, 0, 0, NULL), +(139123, 1391230, 0, 0, 4097, 0, 0, NULL), +(139126, 1391260, 0, 0, 4097, 0, 0, NULL); + +DELETE FROM `waypoint_data` WHERE `id` IN (1390180,1390240,1390300,1390340,1390350,1390370,1390390,1390460,1390480,1390520,1390530,1390570,1390600,1390610,1390630,1390640,1390680,1390690,1390700,1390730,1390740,1390750,1390850,1390950,1390970,1391120,1391140,1391170,1391190,1391230,1391260); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1390180, 1, -2968.68, 1703.04, 66.32, NULL, 0, 0, 0, 100, 0), +(1390180, 2, -2950.61, 1724.91, 66.16, NULL, 0, 0, 0, 100, 0), +(1390180, 3, -2946.8, 1740.59, 66.16, NULL, 0, 0, 0, 100, 0), +(1390180, 4, -2948.52, 1754.6, 66.04, NULL, 0, 0, 0, 100, 0), +(1390180, 5, -2945.53, 1731.65, 66.28, NULL, 0, 0, 0, 100, 0), +(1390240, 1, -2861.15, 1430.14, 6.21233, NULL, 0, 0, 0, 100, 0), +(1390240, 2, -2860.97, 1439.02, 6.25437, NULL, 0, 0, 0, 100, 0), +(1390240, 3, -2866.09, 1446.81, 6.23634, NULL, 0, 0, 0, 100, 0), +(1390240, 4, -2869.7, 1452.45, 6.06305, NULL, 0, 0, 0, 100, 0), +(1390240, 5, -2861.87, 1466.39, 6.05729, NULL, 0, 0, 0, 100, 0), +(1390240, 6, -2854.63, 1469.49, 6.12127, NULL, 0, 0, 0, 100, 0), +(1390240, 7, -2833.74, 1470.15, 6.32068, NULL, 0, 0, 0, 100, 0), +(1390240, 8, -2810.74, 1481.11, 6.37293, NULL, 0, 0, 0, 100, 0), +(1390240, 9, -2799, 1496.06, 6.10036, NULL, 0, 0, 0, 100, 0), +(1390240, 10, -2790.84, 1505.85, 6.28651, NULL, 0, 0, 0, 100, 0), +(1390240, 11, -2783.84, 1516.14, 6.39839, NULL, 0, 0, 0, 100, 0), +(1390240, 12, -2782.58, 1521.71, 6.25715, NULL, 0, 0, 0, 100, 0), +(1390240, 13, -2774.63, 1524.7, 6.33019, NULL, 0, 0, 0, 100, 0), +(1390240, 14, -2768.78, 1521.14, 6.39108, NULL, 0, 0, 0, 100, 0), +(1390240, 15, -2754.83, 1487.75, 6.01158, NULL, 0, 0, 0, 100, 0), +(1390240, 16, -2754.21, 1477.66, 6.01854, NULL, 0, 0, 0, 100, 0), +(1390240, 17, -2759.58, 1473.34, 6.01973, NULL, 0, 0, 0, 100, 0), +(1390240, 18, -2776.86, 1468.14, 6.18769, NULL, 0, 0, 0, 100, 0), +(1390240, 19, -2799.31, 1457.96, 6.21372, NULL, 0, 0, 0, 100, 0), +(1390240, 20, -2827.65, 1441.63, 5.8083, NULL, 0, 0, 0, 100, 0), +(1390240, 21, -2861.36, 1420.47, 6.06158, NULL, 0, 0, 0, 100, 0), +(1390240, 22, -2878.2, 1410.97, 6.13644, NULL, 0, 0, 0, 100, 0), +(1390240, 23, -2888.2, 1405.96, 6.22485, NULL, 0, 0, 0, 100, 0), +(1390240, 24, -2898.5, 1397.41, 6.17689, NULL, 0, 0, 0, 100, 0), +(1390240, 25, -2891.02, 1407.44, 6.15579, NULL, 0, 0, 0, 100, 0), +(1390240, 26, -2874.21, 1417.34, 6.17168, NULL, 0, 0, 0, 100, 0), +(1390300, 1, -3966.66, 1348.31, 39.6816, NULL, 0, 0, 0, 100, 0), +(1390300, 2, -3982.04, 1362.63, 39.7104, NULL, 0, 0, 0, 100, 0), +(1390300, 3, -3993.89, 1368.14, 39.706, NULL, 0, 0, 0, 100, 0), +(1390300, 4, -4024.1, 1350.26, 37.8184, NULL, 0, 0, 0, 100, 0), +(1390300, 5, -4047.62, 1336.13, 39.9807, NULL, 0, 0, 0, 100, 0), +(1390300, 6, -4068.79, 1317.87, 41.5903, NULL, 0, 0, 0, 100, 0), +(1390300, 7, -4047.62, 1336.13, 39.9807, NULL, 0, 0, 0, 100, 0), +(1390300, 8, -4024.1, 1350.26, 37.8184, NULL, 0, 0, 0, 100, 0), +(1390300, 9, -3993.89, 1368.14, 39.706, NULL, 0, 0, 0, 100, 0), +(1390300, 10, -3982.21, 1362.79, 39.7104, NULL, 0, 0, 0, 100, 0), +(1390300, 11, -3966.66, 1348.31, 39.6816, NULL, 0, 0, 0, 100, 0), +(1390300, 12, -3963.92, 1305.34, 39.6894, NULL, 0, 0, 0, 100, 0), +(1390340, 1, -3877.23, 1281.43, 39.5297, NULL, 0, 0, 0, 100, 0), +(1390340, 2, -3864.56, 1301.94, 39.7575, NULL, 0, 0, 0, 100, 0), +(1390340, 3, -3851.97, 1308.7, 39.7575, NULL, 0, 0, 0, 100, 0), +(1390340, 4, -3844.69, 1333.74, 39.8521, NULL, 0, 0, 0, 100, 0), +(1390340, 5, -3848.12, 1362.1, 40.78, NULL, 0, 0, 0, 100, 0), +(1390340, 6, -3841.73, 1375.51, 40.3015, NULL, 0, 0, 0, 100, 0), +(1390340, 7, -3843.75, 1397.42, 39.3543, NULL, 0, 0, 0, 100, 0), +(1390340, 8, -3843.18, 1421.32, 39.2958, NULL, 0, 0, 0, 100, 0), +(1390340, 9, -3843.78, 1397.47, 39.1854, NULL, 0, 0, 0, 100, 0), +(1390340, 10, -3841.73, 1375.51, 40.3015, NULL, 0, 0, 0, 100, 0), +(1390340, 11, -3848.12, 1362.1, 40.78, NULL, 0, 0, 0, 100, 0), +(1390340, 12, -3844.69, 1333.74, 39.8521, NULL, 0, 0, 0, 100, 0), +(1390340, 13, -3851.97, 1308.7, 39.7575, NULL, 0, 0, 0, 100, 0), +(1390340, 14, -3864.56, 1301.94, 39.7575, NULL, 0, 0, 0, 100, 0), +(1390340, 15, -3877.23, 1281.43, 39.5297, NULL, 0, 0, 0, 100, 0), +(1390340, 16, -3884.2, 1265.16, 39.6059, NULL, 0, 0, 0, 100, 0), +(1390350, 1, -3862.64, 1372.65, 41.0094, NULL, 0, 0, 0, 100, 0), +(1390350, 2, -3851.49, 1361.88, 40.4856, NULL, 0, 0, 0, 100, 0), +(1390350, 3, -3844.91, 1341.2, 39.9771, NULL, 0, 0, 0, 100, 0), +(1390350, 4, -3849.52, 1313.44, 39.7029, NULL, 0, 0, 0, 100, 0), +(1390350, 5, -3862.56, 1305.09, 39.7575, NULL, 0, 0, 0, 100, 0), +(1390350, 6, -3849.52, 1313.44, 39.7029, NULL, 0, 0, 0, 100, 0), +(1390350, 7, -3844.91, 1341.2, 39.9771, NULL, 0, 0, 0, 100, 0), +(1390350, 8, -3851.49, 1361.88, 40.4856, NULL, 0, 0, 0, 100, 0), +(1390350, 9, -3862.64, 1372.65, 41.0094, NULL, 0, 0, 0, 100, 0), +(1390350, 10, -3865.95, 1398.29, 40.0201, NULL, 0, 0, 0, 100, 0), +(1390370, 1, -3851.61, 1456.16, 39.9403, NULL, 0, 0, 0, 100, 0), +(1390370, 2, -3846.64, 1464.61, 38.8521, NULL, 0, 0, 0, 100, 0), +(1390370, 3, -3850.1, 1476.02, 39.0806, NULL, 0, 0, 0, 100, 0), +(1390370, 4, -3859.76, 1492.44, 40.2261, NULL, 0, 0, 0, 100, 0), +(1390370, 5, -3871.94, 1501.83, 40.1422, NULL, 0, 0, 0, 100, 0), +(1390370, 6, -3885.93, 1498.91, 40.642, NULL, 0, 0, 0, 100, 0), +(1390370, 7, -3895.24, 1496.86, 39.9576, NULL, 0, 0, 0, 100, 0), +(1390370, 8, -3885.93, 1498.91, 40.642, NULL, 0, 0, 0, 100, 0), +(1390370, 9, -3871.94, 1501.83, 40.1422, NULL, 0, 0, 0, 100, 0), +(1390370, 10, -3859.76, 1492.44, 40.2261, NULL, 0, 0, 0, 100, 0), +(1390370, 11, -3850.1, 1476.02, 39.0806, NULL, 0, 0, 0, 100, 0), +(1390370, 12, -3846.64, 1464.61, 38.8521, NULL, 0, 0, 0, 100, 0), +(1390370, 13, -3851.61, 1456.16, 39.9403, NULL, 0, 0, 0, 100, 0), +(1390370, 14, -3856.1, 1444.82, 40.582, NULL, 0, 0, 0, 100, 0), +(1390390, 1, -3798.79, 1553.1, 36.27, NULL, 0, 0, 0, 100, 0), +(1390390, 2, -3792.5, 1560.75, 34.904, NULL, 0, 0, 0, 100, 0), +(1390390, 3, -3791.77, 1579.44, 37.747, NULL, 0, 0, 0, 100, 0), +(1390390, 4, -3802.11, 1584.76, 38.0414, NULL, 0, 0, 0, 100, 0), +(1390390, 5, -3820.37, 1576.58, 39.4212, NULL, 0, 0, 0, 100, 0), +(1390390, 6, -3848.58, 1577.91, 39.9136, NULL, 0, 0, 0, 100, 0), +(1390390, 7, -3855.33, 1561.27, 40.3403, NULL, 0, 0, 0, 100, 0), +(1390390, 8, -3863.6, 1549.11, 39.8723, NULL, 0, 0, 0, 100, 0), +(1390390, 9, -3869.73, 1525.7, 40.4073, NULL, 0, 0, 0, 100, 0), +(1390390, 10, -3878.04, 1514.08, 39.962, NULL, 0, 0, 0, 100, 0), +(1390390, 11, -3869.73, 1525.7, 40.4073, NULL, 0, 0, 0, 100, 0), +(1390390, 12, -3863.6, 1549.11, 39.8723, NULL, 0, 0, 0, 100, 0), +(1390390, 13, -3855.33, 1561.27, 40.3403, NULL, 0, 0, 0, 100, 0), +(1390390, 14, -3848.58, 1577.91, 39.9136, NULL, 0, 0, 0, 100, 0), +(1390390, 15, -3820.37, 1576.58, 39.4212, NULL, 0, 0, 0, 100, 0), +(1390390, 16, -3802.11, 1584.76, 38.0414, NULL, 0, 0, 0, 100, 0), +(1390390, 17, -3791.77, 1579.44, 37.747, NULL, 0, 0, 0, 100, 0), +(1390390, 18, -3792.5, 1560.75, 34.904, NULL, 0, 0, 0, 100, 0), +(1390390, 19, -3798.79, 1553.1, 36.27, NULL, 0, 0, 0, 100, 0), +(1390390, 20, -3809.92, 1546.03, 38.6225, NULL, 0, 0, 0, 100, 0), +(1390460, 1, -3613.11, 1512.66, 84.763, NULL, 0, 0, 0, 100, 0), +(1390460, 2, -3636.14, 1513.88, 85.3375, NULL, 0, 0, 0, 100, 0), +(1390480, 1, -3685.12, 1631.57, 41.329, NULL, 0, 0, 0, 100, 0), +(1390480, 2, -3674.27, 1609.3, 42.8602, NULL, 0, 0, 0, 100, 0), +(1390480, 3, -3655.03, 1594.12, 44.6402, NULL, 0, 0, 0, 100, 0), +(1390480, 4, -3674.27, 1609.3, 42.8602, NULL, 0, 0, 0, 100, 0), +(1390480, 5, -3685.12, 1631.57, 41.329, NULL, 0, 0, 0, 100, 0), +(1390480, 6, -3690.86, 1660.17, 39.3791, NULL, 0, 0, 0, 100, 0), +(1390520, 1, -3556.13, 1694.76, 40.1722, NULL, 0, 0, 0, 100, 0), +(1390520, 2, -3562.11, 1708.8, 39.7354, NULL, 0, 0, 0, 100, 0), +(1390520, 3, -3562.77, 1727.68, 39.8604, NULL, 0, 0, 0, 100, 0), +(1390520, 4, -3562.61, 1747.68, 38.6785, NULL, 0, 0, 0, 100, 0), +(1390520, 5, -3569.43, 1761.3, 39.5674, NULL, 0, 0, 0, 100, 0), +(1390520, 6, -3579.79, 1773.61, 39.1059, NULL, 0, 0, 0, 100, 0), +(1390520, 7, -3582.57, 1780.5, 39.328, NULL, 0, 0, 0, 100, 0), +(1390520, 8, -3577.26, 1787.47, 39.9809, NULL, 0, 0, 0, 100, 0), +(1390520, 9, -3564.29, 1794.51, 39.6501, NULL, 0, 0, 0, 100, 0), +(1390520, 10, -3577.26, 1787.47, 39.9809, NULL, 0, 0, 0, 100, 0), +(1390520, 11, -3582.57, 1780.5, 39.328, NULL, 0, 0, 0, 100, 0), +(1390520, 12, -3579.79, 1773.61, 39.1059, NULL, 0, 0, 0, 100, 0), +(1390520, 13, -3569.43, 1761.3, 39.5674, NULL, 0, 0, 0, 100, 0), +(1390520, 14, -3562.6, 1747.94, 38.5129, NULL, 0, 0, 0, 100, 0), +(1390520, 15, -3562.77, 1727.68, 39.8604, NULL, 0, 0, 0, 100, 0), +(1390520, 16, -3562.11, 1708.8, 39.7354, NULL, 0, 0, 0, 100, 0), +(1390520, 17, -3556.13, 1694.76, 40.1722, NULL, 0, 0, 0, 100, 0), +(1390520, 18, -3565.22, 1683.33, 39.216, NULL, 0, 0, 0, 100, 0), +(1390530, 1, -3607.79, 1745.44, 39.734, NULL, 0, 0, 0, 100, 0), +(1390530, 2, -3610.06, 1758.76, 39.109, NULL, 0, 0, 0, 100, 0), +(1390530, 3, -3606.95, 1779.32, 39.8295, NULL, 0, 0, 0, 100, 0), +(1390530, 4, -3603.75, 1794.38, 39.7474, NULL, 0, 0, 0, 100, 0), +(1390530, 5, -3616.52, 1802.8, 39.8623, NULL, 0, 0, 0, 100, 0), +(1390530, 6, -3629.78, 1803.06, 39.5803, NULL, 0, 0, 0, 100, 0), +(1390530, 7, -3644.49, 1797.17, 39.7259, NULL, 0, 0, 0, 100, 0), +(1390530, 8, -3657.18, 1788.32, 39.7259, NULL, 0, 0, 0, 100, 0), +(1390530, 9, -3663.81, 1778.26, 39.7259, NULL, 0, 0, 0, 100, 0), +(1390530, 10, -3657.18, 1788.32, 39.7259, NULL, 0, 0, 0, 100, 0), +(1390530, 11, -3644.49, 1797.17, 39.7259, NULL, 0, 0, 0, 100, 0), +(1390530, 12, -3629.78, 1803.06, 39.5803, NULL, 0, 0, 0, 100, 0), +(1390530, 13, -3616.52, 1802.8, 39.8623, NULL, 0, 0, 0, 100, 0), +(1390530, 14, -3603.75, 1794.38, 39.7474, NULL, 0, 0, 0, 100, 0), +(1390530, 15, -3606.95, 1779.32, 39.8295, NULL, 0, 0, 0, 100, 0), +(1390530, 16, -3610.06, 1758.76, 39.109, NULL, 0, 0, 0, 100, 0), +(1390530, 17, -3607.79, 1745.44, 39.734, NULL, 0, 0, 0, 100, 0), +(1390530, 18, -3608.35, 1725.42, 39.5667, NULL, 0, 0, 0, 100, 0), +(1390570, 1, -3495.52, 1674.85, 54.0536, NULL, 0, 0, 0, 100, 0), +(1390570, 2, -3490.15, 1696.19, 64.456, NULL, 0, 0, 0, 100, 0), +(1390570, 3, -3475.69, 1716.37, 72.8336, NULL, 0, 0, 0, 100, 0), +(1390570, 4, -3459.08, 1730.5, 83.6621, NULL, 0, 0, 0, 100, 0), +(1390570, 5, -3435.28, 1746.45, 98.6515, NULL, 0, 0, 0, 100, 0), +(1390570, 6, -3459.08, 1730.5, 83.6621, NULL, 0, 0, 0, 100, 0), +(1390570, 7, -3475.69, 1716.37, 72.8336, NULL, 0, 0, 0, 100, 0), +(1390570, 8, -3490.16, 1696.19, 64.4037, NULL, 0, 0, 0, 100, 0), +(1390570, 9, -3495.52, 1674.85, 54.0536, NULL, 0, 0, 0, 100, 0), +(1390570, 10, -3509.49, 1658.06, 46.6485, NULL, 0, 0, 0, 100, 0), +(1390600, 1, -3377.25, 1738.78, 100.884, NULL, 0, 0, 0, 100, 0), +(1390600, 2, -3379.83, 1753.06, 100.933, NULL, 0, 0, 0, 100, 0), +(1390600, 3, -3387.42, 1755.66, 101.102, NULL, 0, 0, 0, 100, 0), +(1390600, 4, -3379.83, 1753.06, 100.933, NULL, 0, 0, 0, 100, 0), +(1390600, 5, -3377.25, 1738.78, 100.884, NULL, 0, 0, 0, 100, 0), +(1390600, 6, -3390.74, 1719.96, 100.975, NULL, 0, 0, 0, 100, 0), +(1390610, 1, -3376.52, 1674.05, 98.7279, NULL, 0, 0, 0, 100, 0), +(1390610, 2, -3394.13, 1688.85, 99.7484, NULL, 0, 0, 0, 100, 0), +(1390610, 3, -3392.11, 1711.66, 101.183, NULL, 0, 0, 0, 100, 0), +(1390610, 4, -3394.13, 1688.85, 99.7484, NULL, 0, 0, 0, 100, 0), +(1390610, 5, -3376.52, 1674.05, 98.7279, NULL, 0, 0, 0, 100, 0), +(1390610, 6, -3361.52, 1669.54, 94.4975, NULL, 0, 0, 0, 100, 0), +(1390630, 1, -3413.37, 1791.37, 99.698, NULL, 0, 0, 0, 100, 0), +(1390630, 2, -3431.27, 1793.32, 100.562, NULL, 0, 0, 0, 100, 0), +(1390630, 3, -3438.71, 1784.38, 100.817, NULL, 0, 0, 0, 100, 0), +(1390630, 4, -3440.14, 1772.87, 100.884, NULL, 0, 0, 0, 100, 0), +(1390630, 5, -3430.42, 1756.09, 100.891, NULL, 0, 0, 0, 100, 0), +(1390630, 6, -3440.14, 1772.87, 100.884, NULL, 0, 0, 0, 100, 0), +(1390630, 7, -3438.71, 1784.38, 100.817, NULL, 0, 0, 0, 100, 0), +(1390630, 8, -3431.27, 1793.32, 100.562, NULL, 0, 0, 0, 100, 0), +(1390630, 9, -3413.41, 1791.2, 99.7639, NULL, 0, 0, 0, 100, 0), +(1390630, 10, -3409.6, 1803.21, 97.5051, NULL, 0, 0, 0, 100, 0), +(1390640, 1, -3364.7, 1625.72, 67.4549, NULL, 0, 0, 0, 100, 0), +(1390640, 2, -3358.17, 1645.25, 78.2654, NULL, 0, 0, 0, 100, 0), +(1390640, 3, -3355.51, 1662.5, 90.4353, NULL, 0, 0, 0, 100, 0), +(1390640, 4, -3358.17, 1645.25, 78.2654, NULL, 0, 0, 0, 100, 0), +(1390640, 5, -3364.7, 1625.72, 67.4549, NULL, 0, 0, 0, 100, 0), +(1390640, 6, -3363.97, 1594.72, 47.731, NULL, 0, 0, 0, 100, 0), +(1390640, 7, -3364.7, 1625.72, 67.1426, NULL, 0, 0, 0, 100, 0), +(1390640, 8, -3358.17, 1645.25, 78.2654, NULL, 0, 0, 0, 100, 0), +(1390640, 9, -3355.51, 1662.5, 90.4353, NULL, 0, 0, 0, 100, 0), +(1390640, 10, -3358.17, 1645.25, 78.2654, NULL, 0, 0, 0, 100, 0), +(1390640, 11, -3364.7, 1625.72, 67.4549, NULL, 0, 0, 0, 100, 0), +(1390640, 12, -3363.97, 1594.72, 47.731, NULL, 0, 0, 0, 100, 0), +(1390680, 1, -3270.67, 1586.07, 50.1985, NULL, 0, 0, 0, 100, 0), +(1390680, 2, -3292.6, 1586.78, 50.2473, NULL, 0, 0, 0, 100, 0), +(1390680, 3, -3317.28, 1592.56, 49.2158, NULL, 0, 0, 0, 100, 0), +(1390680, 4, -3318.11, 1582.75, 49.4324, NULL, 0, 0, 0, 100, 0), +(1390680, 5, -3301.98, 1578.05, 49.7874, NULL, 0, 0, 0, 100, 0), +(1390680, 6, -3301.51, 1564.93, 50.649, NULL, 0, 0, 0, 100, 0), +(1390680, 7, -3316.52, 1554.23, 50.2913, NULL, 0, 0, 0, 100, 0), +(1390680, 8, -3304.76, 1542.96, 49.0428, NULL, 0, 0, 0, 100, 0), +(1390680, 9, -3272.58, 1544.62, 50.7118, NULL, 0, 0, 0, 100, 0), +(1390680, 10, -3276.33, 1555.71, 51.0558, NULL, 0, 0, 0, 100, 0), +(1390680, 11, -3267.04, 1567.81, 51.1541, NULL, 0, 0, 0, 100, 0), +(1390680, 12, -3250.1, 1571.74, 51.0645, NULL, 0, 0, 0, 100, 0), +(1390680, 13, -3242.37, 1579.53, 50.5833, NULL, 0, 0, 0, 100, 0), +(1390680, 14, -3251.17, 1585.85, 49.2781, NULL, 0, 0, 0, 100, 0), +(1390690, 1, -3266.94, 1495.48, 50.7071, NULL, 0, 0, 0, 100, 0), +(1390690, 2, -3260.75, 1475.66, 51.2553, NULL, 0, 0, 0, 100, 0), +(1390690, 3, -3242.17, 1471.61, 49.5963, NULL, 0, 0, 0, 100, 0), +(1390690, 4, -3218.66, 1475.55, 47.7869, NULL, 0, 0, 0, 100, 0), +(1390690, 5, -3213.8, 1500.32, 48.9735, NULL, 0, 0, 0, 100, 0), +(1390690, 6, -3224.21, 1521.49, 49.8491, NULL, 0, 0, 0, 100, 0), +(1390690, 7, -3213.8, 1500.32, 48.9735, NULL, 0, 0, 0, 100, 0), +(1390690, 8, -3218.66, 1475.55, 47.7869, NULL, 0, 0, 0, 100, 0), +(1390690, 9, -3242.17, 1471.61, 49.5963, NULL, 0, 0, 0, 100, 0), +(1390690, 10, -3260.75, 1475.66, 51.2553, NULL, 0, 0, 0, 100, 0), +(1390690, 11, -3266.94, 1495.48, 50.7071, NULL, 0, 0, 0, 100, 0), +(1390690, 12, -3265.55, 1516.26, 50.7918, NULL, 0, 0, 0, 100, 0), +(1390700, 1, -3270.97, 1376.59, 50.2938, NULL, 0, 0, 0, 100, 0), +(1390700, 2, -3280.32, 1397.85, 51.2392, NULL, 0, 0, 0, 100, 0), +(1390700, 3, -3289.61, 1434.42, 50.682, NULL, 0, 0, 0, 100, 0), +(1390700, 4, -3280.58, 1453.91, 50.4892, NULL, 0, 0, 0, 100, 0), +(1390700, 5, -3265.45, 1437.96, 50.9447, NULL, 0, 0, 0, 100, 0), +(1390700, 6, -3258.1, 1414.25, 49.122, NULL, 0, 0, 0, 100, 0), +(1390700, 7, -3264.55, 1392.29, 51.2931, NULL, 0, 0, 0, 100, 0), +(1390700, 8, -3252.83, 1368.44, 49.7209, NULL, 0, 0, 0, 100, 0), +(1390700, 9, -3250.91, 1354.16, 51.2425, NULL, 0, 0, 0, 100, 0), +(1390700, 10, -3258.65, 1355.44, 50.7283, NULL, 0, 0, 0, 100, 0), +(1390730, 1, -3182.04, 1354.78, 5.89108, NULL, 0, 0, 0, 100, 0), +(1390730, 2, -3174.27, 1361.08, 6.43624, NULL, 0, 0, 0, 100, 0), +(1390730, 3, -3164.76, 1357.55, 7.73068, NULL, 0, 0, 0, 100, 0), +(1390730, 4, -3157.93, 1345.46, 9.40488, NULL, 0, 0, 0, 100, 0), +(1390730, 5, -3144.31, 1336.98, 7.89987, NULL, 0, 0, 0, 100, 0), +(1390730, 6, -3129.86, 1332.92, 12.6335, NULL, 0, 0, 0, 100, 0), +(1390730, 7, -3119.91, 1331.12, 13.2107, NULL, 0, 0, 0, 100, 0), +(1390730, 8, -3105.56, 1328.57, 5.33968, NULL, 0, 0, 0, 100, 0), +(1390730, 9, -3090.97, 1322.02, 3.5078, NULL, 0, 0, 0, 100, 0), +(1390730, 10, -3078.91, 1318.78, 2.91613, NULL, 0, 0, 0, 100, 0), +(1390730, 11, -3090.97, 1322.02, 3.5078, NULL, 0, 0, 0, 100, 0), +(1390730, 12, -3105.56, 1328.57, 5.33968, NULL, 0, 0, 0, 100, 0), +(1390730, 13, -3119.91, 1331.12, 13.2107, NULL, 0, 0, 0, 100, 0), +(1390730, 14, -3129.73, 1332.89, 12.608, NULL, 0, 0, 0, 100, 0), +(1390730, 15, -3144.31, 1336.98, 7.89987, NULL, 0, 0, 0, 100, 0), +(1390730, 16, -3157.93, 1345.46, 9.40488, NULL, 0, 0, 0, 100, 0), +(1390730, 17, -3164.76, 1357.55, 7.73068, NULL, 0, 0, 0, 100, 0), +(1390730, 18, -3174.27, 1361.08, 6.43624, NULL, 0, 0, 0, 100, 0), +(1390730, 19, -3182.04, 1354.78, 5.89108, NULL, 0, 0, 0, 100, 0), +(1390730, 20, -3192.77, 1354.92, 5.89108, NULL, 0, 0, 0, 100, 0), +(1390740, 1, -3029.92, 1375.07, 8.1042, NULL, 0, 0, 0, 100, 0), +(1390740, 2, -3038.84, 1369.19, 6.32693, NULL, 0, 0, 0, 100, 0), +(1390740, 3, -3050.95, 1376.18, 6.01297, NULL, 0, 0, 0, 100, 0), +(1390740, 4, -3055.8, 1393.59, 5.33938, NULL, 0, 0, 0, 100, 0), +(1390740, 5, -3049.97, 1404.72, 5.38283, NULL, 0, 0, 0, 100, 0), +(1390740, 6, -3044.83, 1416.56, 6.2394, NULL, 0, 0, 0, 100, 0), +(1390740, 7, -3039.31, 1433.17, 5.30983, NULL, 0, 0, 0, 100, 0), +(1390740, 8, -3036.25, 1451.36, 6.76501, NULL, 0, 0, 0, 100, 0), +(1390740, 9, -3028.73, 1468.62, 7.07912, NULL, 0, 0, 0, 100, 0), +(1390740, 10, -3036.25, 1451.36, 6.76501, NULL, 0, 0, 0, 100, 0), +(1390740, 11, -3039.31, 1433.17, 5.30983, NULL, 0, 0, 0, 100, 0), +(1390740, 12, -3044.83, 1416.56, 6.2394, NULL, 0, 0, 0, 100, 0), +(1390740, 13, -3049.97, 1404.72, 5.38283, NULL, 0, 0, 0, 100, 0), +(1390740, 14, -3055.8, 1393.59, 5.33938, NULL, 0, 0, 0, 100, 0), +(1390740, 15, -3050.95, 1376.18, 6.01297, NULL, 0, 0, 0, 100, 0), +(1390740, 16, -3038.84, 1369.19, 6.32693, NULL, 0, 0, 0, 100, 0), +(1390740, 17, -3029.92, 1375.07, 8.1042, NULL, 0, 0, 0, 100, 0), +(1390740, 18, -3013.52, 1380.95, 11.4816, NULL, 0, 0, 0, 100, 0), +(1390750, 1, -3885.24, 1364.81, 47.3233, NULL, 0, 0, 0, 100, 0), +(1390750, 2, -3893.47, 1378.96, 44.2248, NULL, 0, 0, 0, 100, 0), +(1390750, 3, -3890.7, 1403.88, 42.4505, NULL, 0, 0, 0, 100, 0), +(1390750, 4, -3878.54, 1416.13, 45.0398, NULL, 0, 0, 0, 100, 0), +(1390750, 5, -3868.02, 1422.59, 43.2885, NULL, 0, 0, 0, 100, 0), +(1390750, 6, -3866.99, 1431.18, 44.3548, NULL, 0, 0, 0, 100, 0), +(1390750, 7, -3872.1, 1444.15, 44.3357, NULL, 0, 0, 0, 100, 0), +(1390750, 8, -3887.69, 1451.94, 43.1082, NULL, 0, 0, 0, 100, 0), +(1390750, 9, -3904.41, 1442.32, 43.8715, NULL, 0, 0, 0, 100, 0), +(1390750, 10, -3915.54, 1437.82, 42.7332, NULL, 0, 0, 0, 100, 0), +(1390750, 11, -3935.22, 1430.5, 42.0568, NULL, 0, 0, 0, 100, 0), +(1390750, 12, -3948.24, 1414.81, 42.206, NULL, 0, 0, 0, 100, 0), +(1390750, 13, -3949.21, 1394.73, 42.4232, NULL, 0, 0, 0, 100, 0), +(1390750, 14, -3942.23, 1380.24, 48.8443, NULL, 0, 0, 0, 100, 0), +(1390750, 15, -3926.85, 1369.21, 56.7701, NULL, 0, 0, 0, 100, 0), +(1390750, 16, -3914.11, 1356.59, 48.6194, NULL, 0, 0, 0, 100, 0), +(1390750, 17, -3901.2, 1340.18, 44.4285, NULL, 0, 0, 0, 100, 0), +(1390750, 18, -3884.47, 1330, 42.3129, NULL, 0, 0, 0, 100, 0), +(1390750, 19, -3867.13, 1337.16, 42.7884, NULL, 0, 0, 0, 100, 0), +(1390850, 1, -3914.2, 1511.54, 41.5041, NULL, 0, 0, 0, 100, 0), +(1390850, 2, -3921.16, 1501.58, 41.8307, NULL, 0, 0, 0, 100, 0), +(1390850, 3, -3943.45, 1494.01, 42.3622, NULL, 0, 0, 0, 100, 0), +(1390850, 4, -3921.45, 1495.9, 42.8932, NULL, 0, 0, 0, 100, 0), +(1390850, 5, -3910.51, 1493.05, 42.3291, NULL, 0, 0, 0, 100, 0), +(1390850, 6, -3905.86, 1475.24, 42.601, NULL, 0, 0, 0, 100, 0), +(1390850, 7, -3909.17, 1494.12, 42.2633, NULL, 0, 0, 0, 100, 0), +(1390850, 8, -3907.29, 1501.58, 41.5385, NULL, 0, 0, 0, 100, 0), +(1390850, 9, -3901.06, 1508.52, 41.9577, NULL, 0, 0, 0, 100, 0), +(1390850, 10, -3900.36, 1514.21, 42.8777, NULL, 0, 0, 0, 100, 0), +(1390850, 11, -3903.61, 1517.51, 43.2499, NULL, 0, 0, 0, 100, 0), +(1390950, 1, -3709.95, 1709.53, 41.0109, NULL, 0, 0, 0, 100, 0), +(1390950, 2, -3720.24, 1723.06, 43.8859, NULL, 0, 0, 0, 100, 0), +(1390950, 3, -3738.68, 1715.65, 43.5087, NULL, 0, 0, 0, 100, 0), +(1390950, 4, -3736.53, 1705.16, 41.1442, NULL, 0, 0, 0, 100, 0), +(1390950, 5, -3727.7, 1692.52, 41.2098, NULL, 0, 0, 0, 100, 0), +(1390950, 6, -3723.82, 1683.27, 41.0055, NULL, 0, 0, 0, 100, 0), +(1390950, 7, -3717.19, 1677.91, 40.7098, NULL, 0, 0, 0, 100, 0), +(1390950, 8, -3711.13, 1677.81, 41.0848, NULL, 0, 0, 0, 100, 0), +(1390950, 9, -3703.65, 1693.28, 40.7161, NULL, 0, 0, 0, 100, 0), +(1390950, 10, -3691.06, 1695.03, 40.9296, NULL, 0, 0, 0, 100, 0), +(1390950, 11, -3691.01, 1699.61, 40.9296, NULL, 0, 0, 0, 100, 0), +(1390970, 1, -3665.2, 1726.54, 41.0006, NULL, 0, 0, 0, 100, 0), +(1390970, 2, -3685.95, 1704.76, 40.74, NULL, 0, 0, 0, 100, 0), +(1390970, 3, -3708.05, 1711.2, 40.729, NULL, 0, 0, 0, 100, 0), +(1390970, 4, -3711.4, 1734.3, 49.121, NULL, 0, 0, 0, 100, 0), +(1390970, 5, -3690.32, 1757.65, 53.074, NULL, 0, 0, 0, 100, 0), +(1390970, 6, -3683.08, 1771.54, 52.2563, NULL, 0, 0, 0, 100, 0), +(1390970, 7, -3667.9, 1764.64, 41.1039, NULL, 0, 0, 0, 100, 0), +(1390970, 8, -3661.04, 1753.78, 40.549, NULL, 0, 0, 0, 100, 0), +(1391120, 1, -3238.6, 1503.88, 53.1258, NULL, 0, 0, 0, 100, 0), +(1391120, 2, -3242.17, 1516.52, 52.4837, NULL, 0, 0, 0, 100, 0), +(1391120, 3, -3248.12, 1528.95, 52.953, NULL, 0, 0, 0, 100, 0), +(1391120, 4, -3248.86, 1516.29, 52.5282, NULL, 0, 0, 0, 100, 0), +(1391120, 5, -3247.51, 1508.75, 53.0403, NULL, 0, 0, 0, 100, 0), +(1391120, 6, -3253, 1499.2, 53.1303, NULL, 0, 0, 0, 100, 0), +(1391120, 7, -3244.43, 1497.29, 52.8549, NULL, 0, 0, 0, 100, 0), +(1391120, 8, -3236.77, 1495.46, 53.5232, NULL, 0, 0, 0, 100, 0), +(1391140, 1, -3181.24, 1463.11, 48.8157, NULL, 0, 0, 0, 100, 0), +(1391140, 2, -3168.53, 1444.73, 37.0271, NULL, 0, 0, 0, 100, 0), +(1391140, 3, -3166.33, 1435.31, 33.0602, NULL, 0, 0, 0, 100, 0), +(1391140, 4, -3188.03, 1418.78, 26.5808, NULL, 0, 0, 0, 100, 0), +(1391140, 5, -3188.22, 1403.98, 17.0158, NULL, 0, 0, 0, 100, 0), +(1391140, 6, -3161.9, 1384, 12.7336, NULL, 0, 0, 0, 100, 0), +(1391140, 7, -3137.33, 1364.32, 15.0855, NULL, 0, 0, 0, 100, 0), +(1391140, 8, -3111.11, 1363.51, 11.7114, NULL, 0, 0, 0, 100, 0), +(1391140, 9, -3095.94, 1342.17, 11.3085, NULL, 0, 0, 0, 100, 0), +(1391140, 10, -3083.23, 1340.21, 11.4907, NULL, 0, 0, 0, 100, 0), +(1391140, 11, -3068.76, 1350.53, 12.6139, NULL, 0, 0, 0, 100, 0), +(1391140, 12, -3071.87, 1369.82, 10.9451, NULL, 0, 0, 0, 100, 0), +(1391140, 13, -3073.51, 1402.59, 11.9517, NULL, 0, 0, 0, 100, 0), +(1391140, 14, -3080.53, 1424.54, 12.5789, NULL, 0, 0, 0, 100, 0), +(1391140, 15, -3068.79, 1440.77, 11.6937, NULL, 0, 0, 0, 100, 0), +(1391140, 16, -3053.28, 1455.28, 15.7139, NULL, 0, 0, 0, 100, 0), +(1391140, 17, -3049.06, 1481.63, 19.0685, NULL, 0, 0, 0, 100, 0), +(1391140, 18, -3040.42, 1505.78, 21.5177, NULL, 0, 0, 0, 100, 0), +(1391140, 19, -3060.79, 1516.28, 27.2185, NULL, 0, 0, 0, 100, 0), +(1391140, 20, -3082.02, 1521.45, 31.1484, NULL, 0, 0, 0, 100, 0), +(1391140, 21, -3115.76, 1517.77, 36.7789, NULL, 0, 0, 0, 100, 0), +(1391140, 22, -3148.28, 1512.84, 52.5402, NULL, 0, 0, 0, 100, 0), +(1391140, 23, -3179.02, 1499.95, 57.5646, NULL, 0, 0, 0, 100, 0), +(1391140, 24, -3188.39, 1488.96, 56.3705, NULL, 0, 0, 0, 100, 0), +(1391140, 25, -3188.36, 1476.45, 54.7531, NULL, 0, 0, 0, 100, 0), +(1391170, 1, -3169.58, 1321.25, 20.4106, NULL, 0, 0, 0, 100, 0), +(1391170, 2, -3151.09, 1321.26, 18.8634, NULL, 0, 0, 0, 100, 0), +(1391170, 3, -3129.89, 1308.25, 15.2639, NULL, 0, 0, 0, 100, 0), +(1391170, 4, -3116.5, 1296.66, 10.7527, NULL, 0, 0, 0, 100, 0), +(1391170, 5, -3103.53, 1292.13, 8.24427, NULL, 0, 0, 0, 100, 0), +(1391170, 6, -3087.99, 1285.69, 7.55798, NULL, 0, 0, 0, 100, 0), +(1391170, 7, -3103.53, 1292.13, 8.24427, NULL, 0, 0, 0, 100, 0), +(1391170, 8, -3116.5, 1296.66, 10.7527, NULL, 0, 0, 0, 100, 0), +(1391170, 9, -3129.89, 1308.25, 15.2639, NULL, 0, 0, 0, 100, 0), +(1391170, 10, -3151.09, 1321.26, 18.8634, NULL, 0, 0, 0, 100, 0), +(1391170, 11, -3169.58, 1321.25, 20.4106, NULL, 0, 0, 0, 100, 0), +(1391170, 12, -3182.67, 1317.12, 23.2459, NULL, 0, 0, 0, 100, 0), +(1391190, 1, -3333.13, 1506, 56.8871, NULL, 0, 0, 0, 100, 0), +(1391190, 2, -3333.3, 1531.01, 53.2708, NULL, 0, 0, 0, 100, 0), +(1391190, 3, -3336.89, 1549.11, 53.4164, NULL, 0, 0, 0, 100, 0), +(1391190, 4, -3359.72, 1559.84, 48.6808, NULL, 0, 0, 0, 100, 0), +(1391190, 5, -3386.08, 1564.11, 47.8386, NULL, 0, 0, 0, 100, 0), +(1391190, 6, -3399.07, 1572.57, 48.6886, NULL, 0, 0, 0, 100, 0), +(1391190, 7, -3403.66, 1588.11, 47.3784, NULL, 0, 0, 0, 100, 0), +(1391190, 8, -3410.92, 1597.66, 48.8981, NULL, 0, 0, 0, 100, 0), +(1391190, 9, -3435.56, 1600.71, 46.057, NULL, 0, 0, 0, 100, 0), +(1391190, 10, -3455.62, 1598.54, 45.7672, NULL, 0, 0, 0, 100, 0), +(1391190, 11, -3474.85, 1601.08, 47.0895, NULL, 0, 0, 0, 100, 0), +(1391190, 12, -3487.19, 1609.62, 44.9196, NULL, 0, 0, 0, 100, 0), +(1391190, 13, -3498.71, 1610.49, 45.3303, NULL, 0, 0, 0, 100, 0), +(1391190, 14, -3507.27, 1622.94, 44.4822, NULL, 0, 0, 0, 100, 0), +(1391190, 15, -3525.38, 1631.05, 44.884, NULL, 0, 0, 0, 100, 0), +(1391190, 16, -3540.05, 1633.4, 44.6827, NULL, 0, 0, 0, 100, 0), +(1391190, 17, -3551.05, 1629.55, 45.1106, NULL, 0, 0, 0, 100, 0), +(1391190, 18, -3570.07, 1627.94, 46.3348, NULL, 0, 0, 0, 100, 0), +(1391190, 19, -3551.05, 1629.55, 45.1106, NULL, 0, 0, 0, 100, 0), +(1391190, 20, -3540.05, 1633.4, 44.6827, NULL, 0, 0, 0, 100, 0), +(1391190, 21, -3525.38, 1631.05, 44.884, NULL, 0, 0, 0, 100, 0), +(1391190, 22, -3507.27, 1622.94, 44.4822, NULL, 0, 0, 0, 100, 0), +(1391190, 23, -3498.71, 1610.49, 45.3303, NULL, 0, 0, 0, 100, 0), +(1391190, 24, -3487.26, 1609.68, 44.9711, NULL, 0, 0, 0, 100, 0), +(1391190, 25, -3474.85, 1601.08, 47.0895, NULL, 0, 0, 0, 100, 0), +(1391190, 26, -3455.62, 1598.54, 45.7672, NULL, 0, 0, 0, 100, 0), +(1391190, 27, -3435.56, 1600.71, 46.057, NULL, 0, 0, 0, 100, 0), +(1391190, 28, -3411.02, 1597.81, 49.0258, NULL, 0, 0, 0, 100, 0), +(1391190, 29, -3403.66, 1588.11, 47.3784, NULL, 0, 0, 0, 100, 0), +(1391190, 30, -3399.12, 1572.77, 48.7996, NULL, 0, 0, 0, 100, 0), +(1391190, 31, -3386.08, 1564.11, 47.8386, NULL, 0, 0, 0, 100, 0), +(1391190, 32, -3359.72, 1559.84, 48.6808, NULL, 0, 0, 0, 100, 0), +(1391190, 33, -3336.89, 1549.11, 53.4164, NULL, 0, 0, 0, 100, 0), +(1391190, 34, -3333.3, 1531.01, 53.2708, NULL, 0, 0, 0, 100, 0), +(1391190, 35, -3333.13, 1506, 56.8871, NULL, 0, 0, 0, 100, 0), +(1391190, 36, -3331.01, 1486.7, 61.6493, NULL, 0, 0, 0, 100, 0), +(1391230, 1, -3589.72, 1722.24, 41.1412, NULL, 0, 0, 0, 100, 0), +(1391230, 2, -3597.31, 1712.78, 41.1412, NULL, 0, 0, 0, 100, 0), +(1391230, 3, -3618.43, 1713.33, 41.3163, NULL, 0, 0, 0, 100, 0), +(1391230, 4, -3625.59, 1736.8, 40.764, NULL, 0, 0, 0, 100, 0), +(1391230, 5, -3635.01, 1739.9, 41.2144, NULL, 0, 0, 0, 100, 0), +(1391230, 6, -3625.59, 1736.8, 40.764, NULL, 0, 0, 0, 100, 0), +(1391230, 7, -3618.43, 1713.33, 41.3163, NULL, 0, 0, 0, 100, 0), +(1391230, 8, -3597.31, 1712.78, 41.1412, NULL, 0, 0, 0, 100, 0), +(1391230, 9, -3589.72, 1722.24, 41.1412, NULL, 0, 0, 0, 100, 0), +(1391230, 10, -3585.92, 1736.55, 40.8191, NULL, 0, 0, 0, 100, 0), +(1391260, 1, -3825.01, 1546.43, 42.2307, NULL, 0, 0, 0, 100, 0), +(1391260, 2, -3817.83, 1531.36, 43.4996, NULL, 0, 0, 0, 100, 0), +(1391260, 3, -3804.01, 1529.11, 44.7979, NULL, 0, 0, 0, 100, 0), +(1391260, 4, -3794.24, 1527.44, 45.1992, NULL, 0, 0, 0, 100, 0), +(1391260, 5, -3793.91, 1511.28, 45.7866, NULL, 0, 0, 0, 100, 0), +(1391260, 6, -3802.64, 1500.82, 44.6419, NULL, 0, 0, 0, 100, 0), +(1391260, 7, -3815.03, 1494.32, 43.4175, NULL, 0, 0, 0, 100, 0), +(1391260, 8, -3843.09, 1496.75, 42.0711, NULL, 0, 0, 0, 100, 0), +(1391260, 9, -3853.24, 1507.41, 42.0739, NULL, 0, 0, 0, 100, 0), +(1391260, 10, -3847, 1533.57, 42.092, NULL, 0, 0, 0, 100, 0), +(1391260, 11, -3830.35, 1546.58, 41.7128, NULL, 0, 0, 0, 100, 0), +(1391260, 12, -3828.61, 1551.35, 41.5158, NULL, 0, 0, 0, 100, 0), +(1391260, 13, -3833.58, 1561.33, 42.2473, NULL, 0, 0, 0, 100, 0); + +-- Delete 2 Enraged Earth Shards (should be summoned by Enraged Earth Spirit) +DELETE FROM `creature` WHERE `id1` = 22115 AND `guid` IN (77646, 77647); + +SET @CGUID := 24950; + +-- Enraged Air Spirit +DELETE FROM `creature` WHERE `id1`=21060 AND `map`=530 AND `zoneId`=3520 AND `guid` BETWEEN @CGUID+0 AND @CGUID+14; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `MovementType`) VALUES +(@CGUID+0 , 21060, 530, 3520, 1, -2725.46, 817.03, -4.67013, 3.47707, 300, 5, 0, 1), +(@CGUID+1 , 21060, 530, 3520, 1, -2717.49, 774.845, -16.7461, 4.80831, 300, 5, 0, 1), +(@CGUID+2 , 21060, 530, 3520, 1, -4381.74, 353.922, 46.5179, 3.39443, 300, 10, 0, 1), +(@CGUID+3 , 21060, 530, 3520, 1, -4402.43, 333, 68.8868, 0.571484, 300, 5, 0, 1), +(@CGUID+4 , 21060, 530, 3520, 1, -4392.56, 285.814, 56.2566, 2.94234, 300, 5, 0, 1), +(@CGUID+5 , 21060, 530, 3520, 1, -4425.07, 458.863, 117.462, 2.46324, 300, 5, 0, 1), +(@CGUID+6 , 21060, 530, 3520, 1, -4464.07, 498.597, 118.197, 2.33244, 300, 0, 0, 2), +(@CGUID+7 , 21060, 530, 3520, 1, -2701.16, 854.306, -18.3783, 4.85701, 300, 5, 0, 1), +(@CGUID+8 , 21060, 530, 3520, 1, -3917.09, 925.952, 19.5149, 2.73212, 300, 5, 0, 1), +(@CGUID+9 , 21060, 530, 3520, 1, -4016.5, 679.166, 12.4566, 3.01433, 300, 5, 0, 1), +(@CGUID+10, 21060, 530, 3520, 1, -4239.03, 607.675, 37.1198, 0.336583, 300, 5, 0, 1), +(@CGUID+11, 21060, 530, 3520, 1, -4283.49, 588.882, 54.7675, 2.84453, 300, 0, 0, 2), +(@CGUID+12, 21060, 530, 3520, 1, -2759.31, 875.419, -0.952728, 5.2065, 300, 5, 0, 1), +(@CGUID+13, 21060, 530, 3520, 1, -2750.4, 936.205, 1.61415, 4.98343, 300, 5, 0, 1), +(@CGUID+14, 21060, 530, 3520, 1, -4450.49, 476.725, 115.131, 2.33204, 300, 0, 0, 2); + +DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+6,@CGUID+11,@CGUID+14); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(@CGUID+6 , (@CGUID+6)*10, 0, 0, 4097, 0, 0, NULL), +(@CGUID+11, (@CGUID+11)*10, 0, 0, 4097, 0, 0, NULL), +(@CGUID+14, (@CGUID+14)*10, 0, 0, 4097, 0, 0, NULL); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@CGUID+6)*10, (@CGUID+11)*10, (@CGUID+14)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`) VALUES +((@CGUID+6)*10, 1, -4463.36, 499.389, 118.25, 5.42337), +((@CGUID+6)*10, 2, -4448.98, 481.272, 116.504, 5.42337), +((@CGUID+6)*10, 3, -4432.95, 468.929, 117.529, 5.42337), +((@CGUID+6)*10, 4, -4429, 448.862, 114.548, 4.76678), +((@CGUID+6)*10, 5, -4425.46, 428.537, 110.398, 4.76678), +((@CGUID+6)*10, 6, -4429.48, 449.238, 114.53, 1.83724), +((@CGUID+6)*10, 7, -4433.84, 469.86, 117.5, 2.42472), +((@CGUID+6)*10, 8, -4449.55, 481.839, 116.516, 2.32105), +((@CGUID+6)*10, 9, -4463.2, 500.059, 118.428, 2.0603), +((@CGUID+6)*10, 10, -4483.34, 520.781, 121.236, 2.42786), +((@CGUID+6)*10, 11, -4497.46, 536.618, 121.573, 1.52465), +((@CGUID+6)*10, 12, -4490.1, 546.15, 124.36, 1.15709), +((@CGUID+6)*10, 13, -4483.47, 563.282, 128.209, 1.15709), +((@CGUID+6)*10, 14, -4489.71, 545.77, 124.343, 4.03557), +((@CGUID+6)*10, 15, -4497.36, 536.438, 121.556, 5.51762), +((@CGUID+6)*10, 16, -4482.16, 520.113, 121.227, 5.51762), +((@CGUID+11)*10, 1, -4283.49, 588.882, 54.7675, 2.84453), +((@CGUID+11)*10, 2, -4279.04, 593.912, 52.2302, 1.7914), +((@CGUID+11)*10, 3, -4273.38, 592.516, 49.3552, 1.60275), +((@CGUID+11)*10, 4, -4273.14, 583.701, 49.4802, 4.66058), +((@CGUID+11)*10, 5, -4274.76, 579.168, 49.6239, 4.6831), +((@CGUID+11)*10, 6, -4281.69, 577.857, 53.9806, 2.25804), +((@CGUID+11)*10, 7, -4283.15, 583.864, 55.0771, 2.3203), +((@CGUID+14)*10, 1, -4450.49, 476.725, 115.131, 2.33204), +((@CGUID+14)*10, 2, -4476.75, 509.063, 118.962, 2.09878), +((@CGUID+14)*10, 3, -4491.81, 538.917, 122.927, 1.57021), +((@CGUID+14)*10, 4, -4493.85, 566.663, 127.386, 1.57021), +((@CGUID+14)*10, 5, -4493.84, 573.103, 128.248, 1.57021), +((@CGUID+14)*10, 6, -4495.49, 598.111, 132.278, 1.57021), +((@CGUID+14)*10, 7, -4495.48, 612.706, 134.742, 0.891621), +((@CGUID+14)*10, 8, -4480.79, 631.877, 142.308, 1.12567), +((@CGUID+14)*10, 9, -4472.72, 648.271, 149.215, 0.588457), +((@CGUID+14)*10, 10, -4463.94, 660.4, 154.467, 0.588457), +((@CGUID+14)*10, 11, -4446.88, 680.2, 158.976, 0.612804), +((@CGUID+14)*10, 12, -4463.37, 660.176, 154.673, 4.13139), +((@CGUID+14)*10, 13, -4472.2, 647.816, 149.389, 4.09212), +((@CGUID+14)*10, 14, -4481.45, 630.607, 141.789, 4.09212), +((@CGUID+14)*10, 15, -4495.78, 611.655, 134.502, 4.61363), +((@CGUID+14)*10, 16, -4495.49, 597.521, 132.175, 4.82097), +((@CGUID+14)*10, 17, -4493.35, 573.073, 128.327, 4.66546), +((@CGUID+14)*10, 18, -4493.55, 554.854, 125.512, 4.76913), +((@CGUID+14)*10, 19, -4491.02, 537.629, 122.832, 4.96705), +((@CGUID+14)*10, 20, -4484.13, 523.184, 121.587, 5.2553), +((@CGUID+14)*10, 21, -4475.83, 508.502, 118.928, 5.2553), +((@CGUID+14)*10, 22, -4464.78, 492.646, 116.467, 5.45086), +((@CGUID+14)*10, 23, -4450.24, 476.677, 115.167, 5.45086), +((@CGUID+14)*10, 24, -4428.47, 454.535, 115.644, 5.44301), +((@CGUID+14)*10, 25, -4418.56, 437.819, 111.972, 5.30557), +((@CGUID+14)*10, 26, -4409.47, 414.993, 100.167, 5.01261), +((@CGUID+14)*10, 27, -4402.51, 385.006, 74.1589, 5.0833), +((@CGUID+14)*10, 28, -4398.11, 339.109, 65.3989, 4.55629), +((@CGUID+14)*10, 29, -4397.35, 328.856, 63.5824, 4.83196), +((@CGUID+14)*10, 30, -4396.64, 310.092, 59.0464, 4.85945), +((@CGUID+14)*10, 31, -4397.7, 329.05, 63.8375, 1.63226), +((@CGUID+14)*10, 32, -4397.93, 339.571, 65.2091, 1.95113), +((@CGUID+14)*10, 33, -4402.71, 385.132, 74.4117, 1.61733), +((@CGUID+14)*10, 34, -4409.8, 415.664, 100.736, 1.91971), +((@CGUID+14)*10, 35, -4419.22, 438.547, 112.293, 1.98647), +((@CGUID+14)*10, 36, -4429.31, 455.618, 115.687, 2.22445); + +SET @OGUID := 55259; + +-- Coilskar Chests +DELETE FROM `gameobject` WHERE `id`=184716 AND `map`=530 AND `zoneId`=3520 AND `guid` BETWEEN @OGUID+0 AND @OGUID+51; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0 , 184716, 530, 3520, 1, -3044.93, 1629.39, 60.8308, 1.13446, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+1 , 184716, 530, 3520, 1, -2903.04, 1655.57, 58.6814, 2.82743, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+2 , 184716, 530, 3520, 1, -2984.51, 1594.48, 58.4725, 0.314158, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+3 , 184716, 530, 3520, 1, -3096.33, 1609.92, 55.8824, -1.15192, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+4 , 184716, 530, 3520, 1, -2933.24, 1655.71, 58.1599, -0.994837, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+5 , 184716, 530, 3520, 1, -3027.25, 1575.68, 64.303, -2.74016, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+6 , 184716, 530, 3520, 1, -3019.29, 1577.59, 62.1732, 1.27409, 0, 0, 0, 0, 60, 255, 1), +(@OGUID+7 , 184716, 530, 3520, 1, -3105.58, 1658.49, 64.5913, 6.14356, 0, 0, -0.0697555, 0.997564, 60, 255, 1), +(@OGUID+8 , 184716, 530, 3520, 1, -3012.27, 1654.83, 69.5433, 2.04204, 0, 0, 0.85264, 0.522499, 60, 255, 1), +(@OGUID+9 , 184716, 530, 3520, 1, -3020.69, 1657.22, 69.0071, 0.226893, 0, 0, 0.113203, 0.993572, 60, 255, 1), +(@OGUID+10, 184716, 530, 3520, 1, -2927.68, 1684.24, 67.8598, 4.53786, 0, 0, -0.766044, 0.642789, 60, 255, 1), +(@OGUID+11, 184716, 530, 3520, 1, -2923.87, 1719.33, 67.7436, 1.01229, 0, 0, 0.484809, 0.87462, 60, 255, 1), +(@OGUID+12, 184716, 530, 3520, 1, -2895.69, 1685.15, 59.4039, 5.70723, 0, 0, -0.284015, 0.95882, 60, 255, 1), +(@OGUID+13, 184716, 530, 3520, 1, -2879.01, 1675.96, 59.1885, 1.91986, 0, 0, 0.819152, 0.573577, 60, 255, 1), +(@OGUID+14, 184716, 530, 3520, 1, -2784.61, 1402.4, 39.5078, 4.32842, 0, 0, -0.829037, 0.559194, 60, 255, 1), +(@OGUID+15, 184716, 530, 3520, 1, -2777.03, 1402.02, 39.3734, 4.85202, 0, 0, -0.656058, 0.75471, 60, 255, 1), +(@OGUID+16, 184716, 530, 3520, 1, -2940.44, 1362.79, 7.72196, 0.785397, 0, 0, 0.382683, 0.92388, 60, 255, 1), +(@OGUID+17, 184716, 530, 3520, 1, -2939.84, 1351.81, 6.61668, 5.68977, 0, 0, -0.292372, 0.956305, 60, 255, 1), +(@OGUID+18, 184716, 530, 3520, 1, -2788.01, 1147.29, 7.48132, 0.645772, 0, 0, 0.317305, 0.948324, 60, 255, 1), +(@OGUID+19, 184716, 530, 3520, 1, -2749.75, 1165.3, 6.78112, 3.83973, 0, 0, -0.939692, 0.342021, 60, 255, 1), +(@OGUID+20, 184716, 530, 3520, 1, -2711.34, 1160.31, 5.99704, 3.14159, 0, 0, -1, 0, 60, 255, 1), +(@OGUID+21, 184716, 530, 3520, 1, -2672.26, 1177.22, 5.25043, 2.75761, 0, 0, 0.981627, 0.190812, 60, 255, 1), +(@OGUID+22, 184716, 530, 3520, 1, -2569.97, 1386.19, 41.1709, 3.00195, 0, 0, 0.997563, 0.0697661, 60, 255, 1), +(@OGUID+23, 184716, 530, 3520, 1, -2652.86, 1338.09, 34.4453, 2.32129, 0, 0, 0.91706, 0.39875, 60, 255, 1), +(@OGUID+24, 184716, 530, 3520, 1, -2630.52, 1355.57, 35.8475, 4.17134, 0, 0, -0.870356, 0.492424, 60, 255, 1), +(@OGUID+25, 184716, 530, 3520, 1, -2649.87, 1295.34, 28.6827, 4.01426, 0, 0, -0.906307, 0.422619, 60, 255, 1), +(@OGUID+26, 184716, 530, 3520, 1, -2694.7, 1380.5, 38.5802, 4.60767, 0, 0, -0.743144, 0.669132, 60, 255, 1), +(@OGUID+27, 184716, 530, 3520, 1, -2732.99, 1277.77, 33.3021, 3.85718, 0, 0, -0.936671, 0.35021, 60, 255, 1), +(@OGUID+28, 184716, 530, 3520, 1, -2728.53, 1257.32, 33.6659, 2.3911, 0, 0, 0.930417, 0.366502, 60, 255, 1), +(@OGUID+29, 184716, 530, 3520, 1, -2842.13, 1221.44, 7.11321, 0.59341, 0, 0, 0.292371, 0.956305, 60, 255, 1), +(@OGUID+30, 184716, 530, 3520, 1, -2962.65, 1303.57, 8.06647, 0.628317, 0, 0, 0.309016, 0.951057, 60, 255, 1), +(@OGUID+31, 184716, 530, 3520, 1, -2900.39, 1302.51, 6.85874, 2.1293, 0, 0, 0.874619, 0.48481, 60, 255, 1), +(@OGUID+32, 184716, 530, 3520, 1, -2914.77, 1390.09, 7.06381, 6.12611, 0, 0, -0.0784588, 0.996917, 60, 255, 1), +(@OGUID+33, 184716, 530, 3520, 1, -2835.52, 1293.71, 6.35783, 3.10665, 0, 0, 0.999847, 0.0174693, 60, 255, 1), +(@OGUID+34, 184716, 530, 3520, 1, -2784.34, 1311.39, 33.6127, 0.279252, 0, 0, 0.139173, 0.990268, 60, 255, 1), +(@OGUID+35, 184716, 530, 3520, 1, -2771, 1197.01, 6.66843, 3.45576, 0, 0, -0.987688, 0.156436, 60, 255, 1), +(@OGUID+36, 184716, 530, 3520, 1, -2749.1, 1229.3, 33.4285, 1.39626, 0, 0, 0.642787, 0.766045, 60, 255, 1), +(@OGUID+37, 184716, 530, 3520, 1, -2792.3, 1222.5, 6.8073, 3.7001, 0, 0, -0.961261, 0.27564, 60, 255, 1), +(@OGUID+38, 184716, 530, 3520, 1, -2726.82, 1275.03, 33.318, 3.80482, 0, 0, -0.945518, 0.325568, 60, 255, 1), +(@OGUID+39, 184716, 530, 3520, 1, -2711.77, 1300.37, 34.1015, 1.43117, 0, 0, 0.656058, 0.75471, 60, 255, 1), +(@OGUID+40, 184716, 530, 3520, 1, -2677.44, 1271.89, 28.6845, 0.95993, 0, 0, 0.461748, 0.887011, 60, 255, 1), +(@OGUID+41, 184716, 530, 3520, 1, -2800.67, 1159.09, 6.86852, 0.994837, 0, 0, 0.477158, 0.878817, 60, 255, 1), +(@OGUID+42, 184716, 530, 3520, 1, -2679, 1384.25, 38.4438, 4.90824, 0, 0, 0.634586, -0.772852, 60, 255, 1), +(@OGUID+43, 184716, 530, 3520, 1, -2686.16, 1394.24, 38.5802, 4.15388, 0, 0, -0.874619, 0.48481, 60, 255, 1), +(@OGUID+44, 184716, 530, 3520, 1, -2707.96, 1389.91, 38.5802, 5.55015, 0, 0, -0.358368, 0.933581, 60, 255, 1), +(@OGUID+45, 184716, 530, 3520, 1, -2630.94, 1267.08, 23.9588, 3.99681, 0, 0, -0.909961, 0.414694, 60, 255, 1), +(@OGUID+46, 184716, 530, 3520, 1, -2576.08, 1405.02, 40.7724, 4.06662, 0, 0, -0.894934, 0.446199, 60, 255, 1), +(@OGUID+47, 184716, 530, 3520, 1, -2817.58, 1253.35, 6.74906, 4.35564, 0, 0, 0.821351, -0.570424, 60, 255, 1), +(@OGUID+48, 184716, 530, 3520, 1, -2638.01, 1221.84, 9.4381, 2.20363, 0, 0, 0.892029, 0.451978, 60, 255, 1), +(@OGUID+49, 184716, 530, 3520, 1, -2623.03, 1238.01, 17.3887, 4.36662, 0, 0, 0.818206, -0.574925, 60, 255, 1), +(@OGUID+50, 184716, 530, 3520, 1, -2715.44, 1336.68, 34.3086, 5.1049, 0, 0, 0.55565, -0.831416, 60, 255, 1), +(@OGUID+51, 184716, 530, 3520, 1, -2665.92, 1331.43, 34.4453, 1.82562, 0, 0, 0.791227, 0.611523, 60, 255, 1); + +DELETE FROM `pool_template` WHERE `entry`=1047 AND `description`='Coilskar Chest (184716)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(1047, 41, 'Coilskar Chest (184716)'); + +DELETE FROM `pool_gameobject` WHERE `pool_entry`=1047 AND `description`='Coilskar Chest (184716)'; +INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(25528 , 1047, 0, 'Coilskar Chest (184716)'), +(25529 , 1047, 0, 'Coilskar Chest (184716)'), +(25530 , 1047, 0, 'Coilskar Chest (184716)'), +(25531 , 1047, 0, 'Coilskar Chest (184716)'), +(25532 , 1047, 0, 'Coilskar Chest (184716)'), +(25533 , 1047, 0, 'Coilskar Chest (184716)'), +(25534 , 1047, 0, 'Coilskar Chest (184716)'), +(25535 , 1047, 0, 'Coilskar Chest (184716)'), +(25536 , 1047, 0, 'Coilskar Chest (184716)'), +(25537 , 1047, 0, 'Coilskar Chest (184716)'), +(25538 , 1047, 0, 'Coilskar Chest (184716)'), +(25539 , 1047, 0, 'Coilskar Chest (184716)'), +(25540 , 1047, 0, 'Coilskar Chest (184716)'), +(25541 , 1047, 0, 'Coilskar Chest (184716)'), +(25542 , 1047, 0, 'Coilskar Chest (184716)'), +(25543 , 1047, 0, 'Coilskar Chest (184716)'), +(25544 , 1047, 0, 'Coilskar Chest (184716)'), +(25545 , 1047, 0, 'Coilskar Chest (184716)'), +(25546 , 1047, 0, 'Coilskar Chest (184716)'), +(25547 , 1047, 0, 'Coilskar Chest (184716)'), +(25548 , 1047, 0, 'Coilskar Chest (184716)'), +(25549 , 1047, 0, 'Coilskar Chest (184716)'), +(25550 , 1047, 0, 'Coilskar Chest (184716)'), +(25551 , 1047, 0, 'Coilskar Chest (184716)'), +(25552 , 1047, 0, 'Coilskar Chest (184716)'), +(25553 , 1047, 0, 'Coilskar Chest (184716)'), +(25554 , 1047, 0, 'Coilskar Chest (184716)'), +(25555 , 1047, 0, 'Coilskar Chest (184716)'), +(25556 , 1047, 0, 'Coilskar Chest (184716)'), +(25557 , 1047, 0, 'Coilskar Chest (184716)'), +(25558 , 1047, 0, 'Coilskar Chest (184716)'), +(25559 , 1047, 0, 'Coilskar Chest (184716)'), +(25560 , 1047, 0, 'Coilskar Chest (184716)'), +(25561 , 1047, 0, 'Coilskar Chest (184716)'), +(25562 , 1047, 0, 'Coilskar Chest (184716)'), +(25563 , 1047, 0, 'Coilskar Chest (184716)'), +(25564 , 1047, 0, 'Coilskar Chest (184716)'), +(25565 , 1047, 0, 'Coilskar Chest (184716)'), +(29786 , 1047, 0, 'Coilskar Chest (184716)'), +(29787 , 1047, 0, 'Coilskar Chest (184716)'), +(29788 , 1047, 0, 'Coilskar Chest (184716)'), +(29789 , 1047, 0, 'Coilskar Chest (184716)'), +(29790 , 1047, 0, 'Coilskar Chest (184716)'), +(29791 , 1047, 0, 'Coilskar Chest (184716)'), +(29792 , 1047, 0, 'Coilskar Chest (184716)'), +(29793 , 1047, 0, 'Coilskar Chest (184716)'), +(29794 , 1047, 0, 'Coilskar Chest (184716)'), +(29795 , 1047, 0, 'Coilskar Chest (184716)'), +(29796 , 1047, 0, 'Coilskar Chest (184716)'), +(29797 , 1047, 0, 'Coilskar Chest (184716)'), +(29798 , 1047, 0, 'Coilskar Chest (184716)'), +(29799 , 1047, 0, 'Coilskar Chest (184716)'), +(100357 , 1047, 0, 'Coilskar Chest (184716)'), +(100358 , 1047, 0, 'Coilskar Chest (184716)'), +(100359 , 1047, 0, 'Coilskar Chest (184716)'), +(100360 , 1047, 0, 'Coilskar Chest (184716)'), +(100361 , 1047, 0, 'Coilskar Chest (184716)'), +(100362 , 1047, 0, 'Coilskar Chest (184716)'), +(100363 , 1047, 0, 'Coilskar Chest (184716)'), +(100364 , 1047, 0, 'Coilskar Chest (184716)'), +(100365 , 1047, 0, 'Coilskar Chest (184716)'), +(100366 , 1047, 0, 'Coilskar Chest (184716)'), +(100367 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+0 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+1 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+2 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+3 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+4 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+5 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+6 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+7 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+8 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+9 , 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+10, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+11, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+12, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+13, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+14, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+15, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+16, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+17, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+18, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+19, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+20, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+21, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+22, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+23, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+24, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+25, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+26, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+27, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+28, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+29, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+30, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+31, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+32, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+33, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+34, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+35, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+36, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+37, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+38, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+39, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+40, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+41, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+42, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+43, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+44, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+45, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+46, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+47, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+48, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+49, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+50, 1047, 0, 'Coilskar Chest (184716)'), +(@OGUID+51, 1047, 0, 'Coilskar Chest (184716)'); From f4c453105ca448fcf3c33450ed06b52b5d736951 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 13:41:45 +0000 Subject: [PATCH 29/83] chore(DB): import pending files Referenced commit(s): 909dfe4bc0d2ac240f8a1bd40c2c42ab435431c3 --- .../rev_1670274473115581800.sql => db_world/2022_12_20_03.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1670274473115581800.sql => db_world/2022_12_20_03.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1670274473115581800.sql b/data/sql/updates/db_world/2022_12_20_03.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1670274473115581800.sql rename to data/sql/updates/db_world/2022_12_20_03.sql index e1a2d4891..9b6190b73 100644 --- a/data/sql/updates/pending_db_world/rev_1670274473115581800.sql +++ b/data/sql/updates/db_world/2022_12_20_03.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_20_02 -> 2022_12_20_03 -- SET @OGUID := 21851; SET @CGUID := 24871; From f5d567206bed49b28cf4e5315bcff7fc72459126 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 20 Dec 2022 07:44:16 -0600 Subject: [PATCH 30/83] fix(DB/loot): Improve Mulgore zone unique items (#14195) --- .../updates/pending_db_world/rev_1670828439307255000.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1670828439307255000.sql diff --git a/data/sql/updates/pending_db_world/rev_1670828439307255000.sql b/data/sql/updates/pending_db_world/rev_1670828439307255000.sql new file mode 100644 index 000000000..dcbd19730 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1670828439307255000.sql @@ -0,0 +1,7 @@ +-- +-- Mulgore Zone Drops +-- Squealear's Belt Should be 100% (Already Correct on AC) +-- Crooked Staff could be up to seems to be closer to 1.5% than 2% both in game and on wowhead +UPDATE `creature_loot_template` SET `Chance`=1.5 WHERE `Entry`=2953 AND `Item`=1388 AND `Reference`=0 AND `GroupId`=0; +-- Dull Blade should probbably be about 1.25% +UPDATE `creature_loot_template` SET `Chance`=1.25 WHERE `Entry`=2952 AND `Item`=1384 AND `Reference`=0 AND `GroupId`=0; From 3594148343f3193986fcb55dc3831d280234bf9d Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:44:41 -0300 Subject: [PATCH 31/83] fix(DB/gameobject): Correct state for 5 herbalism nodes (#14221) --- data/sql/updates/pending_db_world/rev_1671056695826995700.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671056695826995700.sql diff --git a/data/sql/updates/pending_db_world/rev_1671056695826995700.sql b/data/sql/updates/pending_db_world/rev_1671056695826995700.sql new file mode 100644 index 000000000..0392c4923 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671056695826995700.sql @@ -0,0 +1,2 @@ +-- +UPDATE `gameobject` SET `state`=1 WHERE `id` IN (183385, 1617, 1618, 1620) AND `guid` IN (104353, 104354, 10354, 10333, 10241); From a0558fbef0f58626734eb0da75fd337edd7584e0 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 13:46:43 +0000 Subject: [PATCH 32/83] chore(DB): import pending files Referenced commit(s): 3594148343f3193986fcb55dc3831d280234bf9d --- .../rev_1670828439307255000.sql => db_world/2022_12_20_04.sql} | 1 + .../rev_1671056695826995700.sql => db_world/2022_12_20_05.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1670828439307255000.sql => db_world/2022_12_20_04.sql} (91%) rename data/sql/updates/{pending_db_world/rev_1671056695826995700.sql => db_world/2022_12_20_05.sql} (74%) diff --git a/data/sql/updates/pending_db_world/rev_1670828439307255000.sql b/data/sql/updates/db_world/2022_12_20_04.sql similarity index 91% rename from data/sql/updates/pending_db_world/rev_1670828439307255000.sql rename to data/sql/updates/db_world/2022_12_20_04.sql index dcbd19730..6cfb42514 100644 --- a/data/sql/updates/pending_db_world/rev_1670828439307255000.sql +++ b/data/sql/updates/db_world/2022_12_20_04.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_20_03 -> 2022_12_20_04 -- -- Mulgore Zone Drops -- Squealear's Belt Should be 100% (Already Correct on AC) diff --git a/data/sql/updates/pending_db_world/rev_1671056695826995700.sql b/data/sql/updates/db_world/2022_12_20_05.sql similarity index 74% rename from data/sql/updates/pending_db_world/rev_1671056695826995700.sql rename to data/sql/updates/db_world/2022_12_20_05.sql index 0392c4923..d2439628b 100644 --- a/data/sql/updates/pending_db_world/rev_1671056695826995700.sql +++ b/data/sql/updates/db_world/2022_12_20_05.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_20_04 -> 2022_12_20_05 -- UPDATE `gameobject` SET `state`=1 WHERE `id` IN (183385, 1617, 1618, 1620) AND `guid` IN (104353, 104354, 10354, 10333, 10241); From beb7286bb39866856afc2f49a4143f3bb2f4e56a Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Tue, 20 Dec 2022 07:47:16 -0600 Subject: [PATCH 33/83] fix(DB/loot): Arvuu's Orb quest start item drop rate fix (#14235) --- data/sql/updates/pending_db_world/rev_1671137097725897600.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671137097725897600.sql diff --git a/data/sql/updates/pending_db_world/rev_1671137097725897600.sql b/data/sql/updates/pending_db_world/rev_1671137097725897600.sql new file mode 100644 index 000000000..a9ddf246d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671137097725897600.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Entry`=17084 AND `Item`=23580 AND `Reference`=0 AND `GroupId`=0; From d467f5de833ebfe1f2e9f189eb5734b1b4235f53 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 13:49:14 +0000 Subject: [PATCH 34/83] chore(DB): import pending files Referenced commit(s): beb7286bb39866856afc2f49a4143f3bb2f4e56a --- .../rev_1671137097725897600.sql => db_world/2022_12_20_06.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671137097725897600.sql => db_world/2022_12_20_06.sql} (73%) diff --git a/data/sql/updates/pending_db_world/rev_1671137097725897600.sql b/data/sql/updates/db_world/2022_12_20_06.sql similarity index 73% rename from data/sql/updates/pending_db_world/rev_1671137097725897600.sql rename to data/sql/updates/db_world/2022_12_20_06.sql index a9ddf246d..4b5f212cb 100644 --- a/data/sql/updates/pending_db_world/rev_1671137097725897600.sql +++ b/data/sql/updates/db_world/2022_12_20_06.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_20_05 -> 2022_12_20_06 -- UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Entry`=17084 AND `Item`=23580 AND `Reference`=0 AND `GroupId`=0; From 408a7cfc43d98d407b6bcc87b029143b4c0c712b Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Tue, 20 Dec 2022 13:07:14 -0300 Subject: [PATCH 35/83] fix(DB/creature): Port rare spawns from Mangos (#14288) * Create rev_1671393422731527600.sql * Update rev_1671393422731527600.sql * Update rev_1671393422731527600.sql Co-authored-by: Samsequel --- .../rev_1671393422731527600.sql | 301 ++++++++++++++++++ 1 file changed, 301 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671393422731527600.sql diff --git a/data/sql/updates/pending_db_world/rev_1671393422731527600.sql b/data/sql/updates/pending_db_world/rev_1671393422731527600.sql new file mode 100644 index 000000000..5045c32b7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671393422731527600.sql @@ -0,0 +1,301 @@ +-- +SET @GUID := 100861; + +DELETE FROM `pool_creature` WHERE `guid` IN (151903, 151919, 151920) AND `pool_entry` IN (1076, 1081); + +-- Crippler (18689) +-- Remove DISABLE_MOVE flag +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~4 WHERE (`entry` = 18689); + +DELETE FROM `creature` WHERE `id1`=18689; +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `MovementType`) VALUES +(@GUID+0, 18689, 530, 1, 0, -2993.69, 5490.54, -12.2903, 0.313398, 75600, 0, 0, 2), +(@GUID+1, 18689, 530, 1, 0, -2955.27, 4754.82, -20.8703, 2.52744, 86400, 0, 0, 2), +(@GUID+2, 18689, 530, 1, 0, -3323.31, 4275.22, -19.0502, 2.89265, 100800, 0, 0, 2), +(@GUID+3, 18689, 530, 1, 0, -3505.23, 4994.63, -101.396, 0.011024, 115200, 0, 0, 2), +(@GUID+4, 18689, 530, 1, 0, -3740.6, 4473.93, -8.56473, 1.76946, 43200, 0, 0, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (@GUID+0, @GUID+1, @GUID+2, @GUID+3, @GUID+4)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(@GUID+0, (@GUID+0)*10, 0, 0, 0, 0, 0, NULL), +(@GUID+1, (@GUID+1)*10, 0, 0, 0, 0, 0, NULL), +(@GUID+2, (@GUID+2)*10, 0, 0, 0, 0, 0, NULL), +(@GUID+3, (@GUID+3)*10, 0, 0, 0, 0, 0, NULL), +(@GUID+4, (@GUID+4)*10, 0, 0, 0, 0, 0, NULL); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+0)*10,(@GUID+1)*10,(@GUID+2)*10,(@GUID+3)*10,(@GUID+4)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +((@GUID+0)*10, 1, -2993.69, 5490.54, -12.2903), +((@GUID+0)*10, 2, -2960.15, 5518.58, -5.7264), +((@GUID+0)*10, 3, -2932.3, 5516.94, -4.81505), +((@GUID+0)*10, 4, -2939.14, 5457.83, -9.06399), +((@GUID+0)*10, 5, -2991.6, 5386.54, -14.587), +((@GUID+0)*10, 6, -3035.04, 5312.15, -19.842), +((@GUID+0)*10, 7, -3029.83, 5244.07, -20.9786), +((@GUID+0)*10, 8, -2993.17, 5235.6, -18.7276), +((@GUID+0)*10, 9, -2949.53, 5274.16, -14.9218), +((@GUID+0)*10, 10, -2870.52, 5341.72, -9.88747), +((@GUID+0)*10, 11, -2835.22, 5384.21, -4.93172), +((@GUID+1)*10, 1, -2955.27, 4754.82, -20.8703), +((@GUID+1)*10, 2, -2979.31, 4764.42, -21.5558), +((@GUID+1)*10, 3, -2963.59, 4818.29, -21.716), +((@GUID+1)*10, 4, -2932.23, 4852.12, -21.6981), +((@GUID+1)*10, 5, -2890.22, 4922.97, -21.3442), +((@GUID+1)*10, 6, -2852.18, 4982.29, -20.1091), +((@GUID+1)*10, 7, -2841, 5016.43, -17.8675), +((@GUID+2)*10, 1, -3323.31, 4275.22, -19.0502), +((@GUID+2)*10, 2, -3423.24, 4295.54, -17.3294), +((@GUID+2)*10, 3, -3482.26, 4349.71, -17.5507), +((@GUID+2)*10, 4, -3540.89, 4448.93, -20.1783), +((@GUID+2)*10, 5, -3566.63, 4508, -18.9195), +((@GUID+2)*10, 6, -3536.7, 4567.91, -20.9977), +((@GUID+2)*10, 7, -3481.07, 4552.3, -19.7845), +((@GUID+2)*10, 8, -3464.79, 4516.98, -20.1464), +((@GUID+2)*10, 9, -3372.75, 4539.43, -21.95), +((@GUID+2)*10, 10, -3345.69, 4545.06, -22.0396), +((@GUID+2)*10, 11, -3288.71, 4447.84, -21.4994), +((@GUID+2)*10, 12, -3305.55, 4419.48, -21.8538), +((@GUID+2)*10, 13, -3425.33, 4337.3, -20.3393), +((@GUID+2)*10, 14, -3507.56, 4261.32, -8.66706), +((@GUID+2)*10, 15, -3572.33, 4277.64, -5.87435), +((@GUID+2)*10, 16, -3638.5, 4299.3, -0.716573), +((@GUID+2)*10, 17, -3749.48, 4370.51, 0.542307), +((@GUID+2)*10, 18, -3794.95, 4410.04, -2.39524), +((@GUID+2)*10, 19, -3853.63, 4463.9, -14.8232), +((@GUID+3)*10, 1, -3505.23, 4994.63, -101.396), +((@GUID+3)*10, 2, -3471.42, 5036.86, -101.137), +((@GUID+3)*10, 3, -3448.35, 5059.2, -100.81), +((@GUID+3)*10, 4, -3426.81, 5060.32, -101.125), +((@GUID+3)*10, 5, -3337.12, 4989.37, -101.396), +((@GUID+3)*10, 6, -3313.04, 4968.17, -101.323), +((@GUID+3)*10, 7, -3262.83, 4941.35, -101.193), +((@GUID+3)*10, 8, -3241.77, 4893.49, -101.396), +((@GUID+3)*10, 9, -3249.34, 4849.34, -101.396), +((@GUID+3)*10, 10, -3319.31, 4828.23, -101.396), +((@GUID+3)*10, 11, -3421.22, 4913.47, -101.395), +((@GUID+3)*10, 12, -3495.91, 4983.82, -101.395), +((@GUID+4)*10, 1, -3745.47, 4496.63, -9.39174), +((@GUID+4)*10, 2, -3740.55, 4515.75, -12.6168), +((@GUID+4)*10, 3, -3714.52, 4561.42, -15.5949), +((@GUID+4)*10, 4, -3691.07, 4629.86, -18.0632), +((@GUID+4)*10, 5, -3671.98, 4668.61, -17.5237), +((@GUID+4)*10, 6, -3659.5, 4691.22, -20.1589), +((@GUID+4)*10, 7, -3663.01, 4731.42, -21.011), +((@GUID+4)*10, 8, -3670.96, 4811.81, -21.3235), +((@GUID+4)*10, 9, -3692.4, 4832.97, -21.3243), +((@GUID+4)*10, 10, -3737.69, 4842.88, -19.617), +((@GUID+4)*10, 11, -3771.48, 4845.87, -19.3476), +((@GUID+4)*10, 12, -3784.54, 4789.69, -20.5939), +((@GUID+4)*10, 13, -3805.7, 4756.83, -25.7269), +((@GUID+4)*10, 14, -3796.46, 4716.94, -24.3906), +((@GUID+4)*10, 15, -3815.91, 4670.04, -27.4691), +((@GUID+4)*10, 16, -3821.61, 4608.38, -21.6523), +((@GUID+4)*10, 17, -3807.01, 4574.98, -17.8086), +((@GUID+4)*10, 18, -3800.57, 4549.48, -18.1872), +((@GUID+4)*10, 19, -3796.15, 4512.84, -19.2235), +((@GUID+4)*10, 20, -3801.02, 4470.16, -13.1805), +((@GUID+4)*10, 21, -3771.69, 4449.77, -7.30134), +((@GUID+4)*10, 22, -3707.55, 4428.35, -7.42426), +((@GUID+4)*10, 23, -3670.43, 4428.79, -11.5316), +((@GUID+4)*10, 24, -3630.64, 4456.85, -16.9659), +((@GUID+4)*10, 25, -3555.26, 4510.33, -18.66), +((@GUID+4)*10, 26, -3571.25, 4577.81, -21.0895), +((@GUID+4)*10, 27, -3597.28, 4595.12, -20.5279); + +UPDATE `pool_template` SET `description`='Crippler (18689)' WHERE `entry`=1076; + +DELETE FROM `pool_creature` WHERE `pool_entry`=1076 AND `description`='Crippler (18689)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID+0, 1076, 0, 'Crippler (18689)'), +(@GUID+1, 1076, 0, 'Crippler (18689)'), +(@GUID+2, 1076, 0, 'Crippler (18689)'), +(@GUID+3, 1076, 0, 'Crippler (18689)'), +(@GUID+4, 1076, 0, 'Crippler (18689)'); + +-- Bro'Gaz the Clanless (18684) +-- Remove DISABLE_MOVE flag +UPDATE `creature_template` SET `unit_flags`=`unit_flags`&~4 WHERE (`entry` = 18684); + +DELETE FROM `creature` WHERE `id1`=18684; +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(@GUID+5, 18684, 530, 1, 0, -1136.1, 8670.83, 45.0333, 3.60894, 75600, 2), +(@GUID+6, 18684, 530, 1, 0, -2791.89, 6553.52, 37.0286, 1.23389, 115200, 2), +(@GUID+7, 18684, 530, 1, 0, -1656.84, 8747.51, 30.8561, 6.20546, 43200, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (@GUID+5, @GUID+6, @GUID+7)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(@GUID+5, (@GUID+5)*10, 0, 0, 1, 0, 0, NULL), +(@GUID+6, (@GUID+6)*10, 0, 0, 1, 0, 0, NULL), +(@GUID+7, (@GUID+7)*10, 0, 0, 1, 0, 0, NULL); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+5)*10,(@GUID+6)*10,(@GUID+7)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +((@GUID+5)*10, 1, -1153.4, 8650.08, 37.2051), +((@GUID+5)*10, 2, -1173.21, 8632.92, 36.6652), +((@GUID+5)*10, 3, -1227.01, 8607.18, 27.0261), +((@GUID+5)*10, 4, -1271.02, 8604.13, 24.8882), +((@GUID+5)*10, 5, -1316.03, 8615.14, 25.3435), +((@GUID+5)*10, 6, -1337.51, 8644.42, 23.7964), +((@GUID+5)*10, 7, -1345.32, 8680.62, 28.4094), +((@GUID+5)*10, 8, -1356.39, 8700.27, 28.5239), +((@GUID+5)*10, 9, -1375.98, 8722.26, 24.125), +((@GUID+5)*10, 10, -1411.15, 8731.79, 21.4807), +((@GUID+5)*10, 11, -1445.6, 8750.9, 28.0136), +((@GUID+5)*10, 12, -1472.65, 8787.18, 29.5464), +((@GUID+5)*10, 13, -1502.47, 8794.64, 30.6681), +((@GUID+5)*10, 14, -1523.75, 8808.42, 35.8454), +((@GUID+5)*10, 15, -1567.27, 8807.88, 32.5204), +((@GUID+5)*10, 16, -1612.86, 8807.3, 34.0422), +((@GUID+5)*10, 17, -1660.61, 8806.7, 38.807), +((@GUID+5)*10, 18, -1710.91, 8806.07, 30.7289), +((@GUID+5)*10, 19, -1739.43, 8815.27, 36.1499), +((@GUID+5)*10, 20, -1796.56, 8834.68, 30.3202), +((@GUID+5)*10, 21, -1831.27, 8867.12, 31.3868), +((@GUID+5)*10, 22, -1868.34, 8876.12, 35.3925), +((@GUID+5)*10, 23, -1889.36, 8910.44, 37.8667), +((@GUID+5)*10, 24, -1902.38, 8918.87, 36.5093), +((@GUID+5)*10, 25, -1850, 8910.74, 36.7844), +((@GUID+5)*10, 26, -1796.37, 8871.78, 32.4311), +((@GUID+5)*10, 27, -1766.35, 8854.41, 28.1974), +((@GUID+5)*10, 28, -1731.35, 8834.15, 35.8627), +((@GUID+5)*10, 29, -1702.75, 8808.3, 32.3093), +((@GUID+5)*10, 30, -1673.06, 8807.7, 38.2999), +((@GUID+5)*10, 31, -1622.03, 8794.79, 35.6594), +((@GUID+5)*10, 32, -1598.25, 8796.01, 31.5502), +((@GUID+5)*10, 33, -1550.83, 8798.43, 34.5343), +((@GUID+5)*10, 34, -1515.33, 8806.05, 34.8541), +((@GUID+5)*10, 35, -1487.17, 8788.58, 30.2122), +((@GUID+5)*10, 36, -1454.07, 8754.32, 28.7642), +((@GUID+5)*10, 37, -1415.5, 8742.22, 23.6564), +((@GUID+5)*10, 38, -1390.37, 8746.55, 25.5528), +((@GUID+5)*10, 39, -1374.32, 8744.18, 28.0885), +((@GUID+5)*10, 40, -1352.62, 8729.92, 27.7678), +((@GUID+5)*10, 41, -1322.89, 8734.36, 30.9611), +((@GUID+5)*10, 42, -1267.26, 8752.43, 36.6239), +((@GUID+5)*10, 43, -1228.74, 8709.63, 37.2785), +((@GUID+5)*10, 44, -1201.66, 8685.47, 39.1488), +((@GUID+5)*10, 45, -1189.4, 8650.46, 32.8064), +((@GUID+5)*10, 46, -1158.6, 8633.82, 39.1495), +((@GUID+5)*10, 47, -1140.29, 8659.66, 41.2302), +((@GUID+5)*10, 48, -1127.37, 8680.82, 50.1478), +((@GUID+6)*10, 1, -2774.95, 6601.87, 30.7438), +((@GUID+6)*10, 2, -2748.98, 6676.02, 15.5031), +((@GUID+6)*10, 3, -2730.93, 6749.95, -0.845251), +((@GUID+6)*10, 4, -2711.67, 6795.93, -4.3082), +((@GUID+6)*10, 5, -2678.55, 6830.27, -5.53566), +((@GUID+6)*10, 6, -2651.32, 6895.3, -2.83228), +((@GUID+6)*10, 7, -2622.68, 6929.26, -0.571877), +((@GUID+6)*10, 8, -2590.64, 6968.93, -0.855486), +((@GUID+6)*10, 9, -2509.89, 7037.06, -6.73834), +((@GUID+6)*10, 10, -2589.04, 7012.13, -3.12094), +((@GUID+6)*10, 11, -2633.03, 6950.42, -0.357443), +((@GUID+6)*10, 12, -2667.38, 6885.67, -4.91678), +((@GUID+6)*10, 13, -2703.6, 6850.62, -3.53362), +((@GUID+6)*10, 14, -2726.43, 6826.19, -0.519317), +((@GUID+6)*10, 15, -2729.5, 6766.1, -1.54172), +((@GUID+6)*10, 16, -2776.37, 6710.96, 12.0384), +((@GUID+6)*10, 17, -2788.17, 6674.34, 20.5757), +((@GUID+6)*10, 18, -2791.9, 6588.22, 34.1142), +((@GUID+6)*10, 19, -2786.89, 6544.15, 36.7267), +((@GUID+6)*10, 20, -2794.25, 6525.21, 38.6326), +((@GUID+6)*10, 21, -2790.58, 6546.94, 36.6907), +((@GUID+7)*10, 1, -1595.58, 8743.12, 32.8909), +((@GUID+7)*10, 2, -1552.01, 8736.9, 31.5443), +((@GUID+7)*10, 3, -1471.7, 8686.72, 22.0652), +((@GUID+7)*10, 4, -1379.82, 8538.92, 11.15), +((@GUID+7)*10, 5, -1250.93, 8446.48, 18.2325), +((@GUID+7)*10, 6, -1049.93, 8389.46, 20.4694), +((@GUID+7)*10, 7, -968.256, 8345.41, 21.3638), +((@GUID+7)*10, 8, -951.008, 8285.09, 20.2325), +((@GUID+7)*10, 9, -898.222, 8341.75, 24.8691), +((@GUID+7)*10, 10, -968.256, 8345.41, 21.3638), +((@GUID+7)*10, 11, -1049.93, 8389.46, 20.4694), +((@GUID+7)*10, 12, -1250.93, 8446.48, 18.2325), +((@GUID+7)*10, 13, -1379.82, 8538.92, 11.15), +((@GUID+7)*10, 14, -1471.7, 8686.72, 22.0652), +((@GUID+7)*10, 15, -1552.01, 8736.9, 31.5443), +((@GUID+7)*10, 16, -1595.58, 8743.12, 32.8909), +((@GUID+7)*10, 17, -1656.84, 8747.51, 30.8561); + +DELETE FROM `pool_template` WHERE `entry`=1109 AND `description`='Bro\'Gaz the Clanless (18684)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1109, 1, 'Bro\'Gaz the Clanless (18684)'); + +DELETE FROM `pool_creature` WHERE `pool_entry`=1109 AND `description`='Bro\'Gaz the Clanless (18684)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID+5, 1109, 0, 'Bro\'Gaz the Clanless (18684)'), +(@GUID+6, 1109, 0, 'Bro\'Gaz the Clanless (18684)'), +(@GUID+7, 1109, 0, 'Bro\'Gaz the Clanless (18684)'); + +-- Hemathion (18692) +DELETE FROM `creature` WHERE `id1`=18692; +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `MovementType`) VALUES +(@GUID+8, 18692, 530, 1, 2807.9, 7239.05, 365.242, 4.89664, 43200, 2), +(@GUID+9, 18692, 530, 1, 1837.67, 7158.53, 364.398, 2.69354, 43200, 2); + +DELETE FROM `creature_addon` WHERE (`guid` IN (@GUID+8, @GUID+9)); +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES +(@GUID+8, (@GUID+8)*10, 0, 0, 0, 0, 0, NULL), +(@GUID+9, (@GUID+9)*10, 0, 0, 0, 0, 0, NULL); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+8)*10,(@GUID+9)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +((@GUID+8)*10, 1, 2808.94, 7233.49, 365.128), +((@GUID+8)*10, 2, 2779.21, 7215.7, 365.214), +((@GUID+8)*10, 3, 2743.24, 7205.85, 366.074), +((@GUID+8)*10, 4, 2716.31, 7203.94, 366.735), +((@GUID+8)*10, 5, 2682.06, 7222.73, 365.634), +((@GUID+8)*10, 6, 2650.47, 7236.35, 365.005), +((@GUID+8)*10, 7, 2616.39, 7251.05, 364.581), +((@GUID+8)*10, 8, 2582.67, 7240.97, 364.749), +((@GUID+8)*10, 9, 2555.35, 7214.8, 366.146), +((@GUID+8)*10, 10, 2539.97, 7186.03, 364.595), +((@GUID+8)*10, 11, 2522.82, 7155.45, 366.411), +((@GUID+8)*10, 12, 2494.83, 7120.39, 364.493), +((@GUID+8)*10, 13, 2464.07, 7095.25, 364.702), +((@GUID+8)*10, 14, 2422.04, 7101.15, 365.745), +((@GUID+8)*10, 15, 2378.71, 7121.38, 365.629), +((@GUID+8)*10, 16, 2422.04, 7101.15, 365.745), +((@GUID+8)*10, 17, 2464.07, 7095.25, 364.702), +((@GUID+8)*10, 18, 2494.83, 7120.39, 364.493), +((@GUID+8)*10, 19, 2522.82, 7155.45, 366.411), +((@GUID+8)*10, 20, 2539.97, 7186.03, 364.595), +((@GUID+8)*10, 21, 2555.35, 7214.8, 366.146), +((@GUID+8)*10, 22, 2582.67, 7240.97, 364.749), +((@GUID+8)*10, 23, 2616.39, 7251.05, 364.581), +((@GUID+8)*10, 24, 2650.47, 7236.35, 365.005), +((@GUID+8)*10, 25, 2682.06, 7222.73, 365.634), +((@GUID+8)*10, 26, 2716.31, 7203.94, 366.735), +((@GUID+8)*10, 27, 2743.24, 7205.85, 366.074), +((@GUID+8)*10, 28, 2779.21, 7215.7, 365.214), +((@GUID+8)*10, 29, 2808.94, 7233.49, 365.128), +((@GUID+8)*10, 30, 2837.03, 7252.18, 364.441), +((@GUID+9)*10, 1, 1809.32, 7172.16, 364.569), +((@GUID+9)*10, 2, 1815.44, 7204.85, 364.661), +((@GUID+9)*10, 3, 1842.55, 7242.15, 364.581), +((@GUID+9)*10, 4, 1879.16, 7258.35, 363.861), +((@GUID+9)*10, 5, 1915.92, 7275.4, 364.088), +((@GUID+9)*10, 6, 1943.62, 7285.08, 364.204), +((@GUID+9)*10, 7, 1976.63, 7309.15, 364.544), +((@GUID+9)*10, 8, 2014.21, 7319.44, 364.414), +((@GUID+9)*10, 9, 2045.85, 7317.11, 364.715), +((@GUID+9)*10, 10, 2081.96, 7308.12, 363.934), +((@GUID+9)*10, 11, 2098.48, 7283.07, 364.555), +((@GUID+9)*10, 12, 2110.94, 7263.13, 364.382), +((@GUID+9)*10, 13, 2088.67, 7240.71, 364.611), +((@GUID+9)*10, 14, 2083.66, 7218.63, 364.079), +((@GUID+9)*10, 15, 2051.24, 7208.45, 363.979), +((@GUID+9)*10, 16, 2021.54, 7208.53, 364.381), +((@GUID+9)*10, 17, 1995.11, 7195.22, 364.133), +((@GUID+9)*10, 18, 1970.71, 7173.65, 364.284), +((@GUID+9)*10, 19, 1943.43, 7162.6, 364.565), +((@GUID+9)*10, 20, 1918.51, 7157.14, 364.285), +((@GUID+9)*10, 21, 1883.81, 7154.67, 364.475), +((@GUID+9)*10, 22, 1850.35, 7146.59, 364.084), +((@GUID+9)*10, 23, 1835.89, 7151.59, 364.627); + +UPDATE `pool_template` SET `description`='Hemathion (18692)' WHERE `entry`=1081; + +DELETE FROM `pool_creature` WHERE `pool_entry`=1081 AND `description`='Hemathion (18692)'; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID+8, 1081, 0, 'Hemathion (18692)'), +(@GUID+9, 1081, 0, 'Hemathion (18692)'); From 7f6788ce86a3cf83f65f8ee8f0b0e353d5557352 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 20 Dec 2022 16:09:17 +0000 Subject: [PATCH 36/83] chore(DB): import pending files Referenced commit(s): 408a7cfc43d98d407b6bcc87b029143b4c0c712b --- .../rev_1671393422731527600.sql => db_world/2022_12_20_07.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671393422731527600.sql => db_world/2022_12_20_07.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1671393422731527600.sql b/data/sql/updates/db_world/2022_12_20_07.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1671393422731527600.sql rename to data/sql/updates/db_world/2022_12_20_07.sql index 5045c32b7..8b1cb2b17 100644 --- a/data/sql/updates/pending_db_world/rev_1671393422731527600.sql +++ b/data/sql/updates/db_world/2022_12_20_07.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_20_06 -> 2022_12_20_07 -- SET @GUID := 100861; From d477f9b8f318c9e2149e3bbd762de1896a105bb1 Mon Sep 17 00:00:00 2001 From: Samsequel <20357406+Samsequel@users.noreply.github.com> Date: Wed, 21 Dec 2022 23:17:35 +0100 Subject: [PATCH 37/83] =?UTF-8?q?fix(DB/QuestTemplateAddon):=20Membership?= =?UTF-8?q?=20Benefits=20should=20not=20have=20quest=E2=80=A6=20(#14305)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(DB/QuestTemplateAddon): Membership Benefits should not have quest requirement * Update consortmonthly.sql --- data/sql/updates/pending_db_world/consortmonthly.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/consortmonthly.sql diff --git a/data/sql/updates/pending_db_world/consortmonthly.sql b/data/sql/updates/pending_db_world/consortmonthly.sql new file mode 100644 index 000000000..c827b9c78 --- /dev/null +++ b/data/sql/updates/pending_db_world/consortmonthly.sql @@ -0,0 +1,2 @@ +UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE `ID` IN (9884,9885,9887); +UPDATE `quest_template_addon` SET `ExclusiveGroup` = 9884 WHERE `ID` IN (9884,9885,9887,9886); From a5fc77f5c3da41c813edf80aba59410be2011f17 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Wed, 21 Dec 2022 22:19:50 +0000 Subject: [PATCH 38/83] chore(DB): import pending files Referenced commit(s): d477f9b8f318c9e2149e3bbd762de1896a105bb1 --- .../consortmonthly.sql => db_world/2022_12_21_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/consortmonthly.sql => db_world/2022_12_21_00.sql} (80%) diff --git a/data/sql/updates/pending_db_world/consortmonthly.sql b/data/sql/updates/db_world/2022_12_21_00.sql similarity index 80% rename from data/sql/updates/pending_db_world/consortmonthly.sql rename to data/sql/updates/db_world/2022_12_21_00.sql index c827b9c78..bc023b9c2 100644 --- a/data/sql/updates/pending_db_world/consortmonthly.sql +++ b/data/sql/updates/db_world/2022_12_21_00.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_20_07 -> 2022_12_21_00 UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE `ID` IN (9884,9885,9887); UPDATE `quest_template_addon` SET `ExclusiveGroup` = 9884 WHERE `ID` IN (9884,9885,9887,9886); From c3d6e5eb03c20643d0e7950b4d4ed317688d1e01 Mon Sep 17 00:00:00 2001 From: Samsequel <20357406+Samsequel@users.noreply.github.com> Date: Thu, 22 Dec 2022 06:35:02 +0100 Subject: [PATCH 39/83] =?UTF-8?q?fix(DB/FactionChangeQuests):=20Return=20t?= =?UTF-8?q?o=20Thrallmar=20and=20Go=20To=20The=20Front=20=E2=80=A6=20(#143?= =?UTF-8?q?03)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/sql/updates/pending_db_world/returntothrallmar.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/returntothrallmar.sql diff --git a/data/sql/updates/pending_db_world/returntothrallmar.sql b/data/sql/updates/pending_db_world/returntothrallmar.sql new file mode 100644 index 000000000..ba7bf0664 --- /dev/null +++ b/data/sql/updates/pending_db_world/returntothrallmar.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `player_factionchange_quests` WHERE `alliance_id` = 10382; +INSERT INTO `player_factionchange_quests` (`alliance_id`, `horde_id`) VALUES +(10382, 10388); From cd539edb669490ff61f5ad6d7025965f8c740c8f Mon Sep 17 00:00:00 2001 From: Samsequel <20357406+Samsequel@users.noreply.github.com> Date: Thu, 22 Dec 2022 06:36:41 +0100 Subject: [PATCH 40/83] =?UTF-8?q?fix(DB/smartscript):=20Hellfire=20Watcher?= =?UTF-8?q?=20should=20cast=20Renew=20and=20Heal=20on=20t=E2=80=A6=20(#142?= =?UTF-8?q?81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/sql/updates/pending_db_world/watcherrenew.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 data/sql/updates/pending_db_world/watcherrenew.sql diff --git a/data/sql/updates/pending_db_world/watcherrenew.sql b/data/sql/updates/pending_db_world/watcherrenew.sql new file mode 100644 index 000000000..cef3fd056 --- /dev/null +++ b/data/sql/updates/pending_db_world/watcherrenew.sql @@ -0,0 +1,14 @@ +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 17309; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 17309); +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 +(17309, 0, 0, 0, 0, 0, 100, 0, 0, 3000, 7000, 10000, 0, 11, 14032, 0, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - In Combat - Cast \'Shadow Word: Pain\''), +(17309, 0, 1, 0, 38, 1, 100, 0, 1, 1, 10000, 15000, 0, 11, 8362, 0, 0, 0, 0, 0, 19, 17306, 40, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - On Data Set 1 1 - Cast \'Renew\' (Phase 1)'), +(17309, 0, 2, 0, 0, 1, 100, 2, 0, 3000, 3000, 3000, 0, 11, 12039, 0, 0, 0, 0, 0, 19, 17306, 40, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - In Combat - Cast \'Heal\' (Phase 1) (Normal Dungeon)'), +(17309, 0, 3, 0, 0, 1, 100, 4, 0, 3000, 3000, 3000, 0, 11, 30643, 0, 0, 0, 0, 0, 19, 17306, 40, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - In Combat - Cast \'Heal\' (Phase 1) (Heroic Dungeon)'), +(17309, 0, 4, 0, 38, 0, 100, 512, 17309, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - On Data Set 17309 0 - Set Event Phase 1'), +(17309, 0, 5, 0, 2, 0, 100, 0, 1, 25, 10000, 15000, 0, 11, 8362, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Watcher - Between 1-25% Health - Cast \'Renew\''), +(17309, 0, 6, 0, 2, 0, 100, 0, 1, 25, 10000, 15000, 0, 45, 1, 1, 0, 0, 0, 0, 11, 17309, 40, 1, 0, 0, 0, 0, 0, 'Hellfire Watcher - Between 1-25% Health - Set Data 1 1'), +(17309, 0, 7, 0, 2, 0, 100, 0, 26, 100, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 11, 17309, 40, 1, 0, 0, 0, 0, 0, 'Hellfire Watcher - Between 26-100% Health - Set Data 1 2'), +(17309, 0, 8, 0, 38, 0, 100, 2, 1, 1, 10000, 15000, 0, 11, 12039, 0, 0, 0, 0, 0, 11, 17309, 40, 1, 0, 0, 0, 0, 0, 'Hellfire Watcher - On Data Set 1 1 - Cast \'Heal\' (Normal Dungeon)'), +(17309, 0, 9, 0, 38, 0, 100, 4, 1, 1, 10000, 15000, 0, 11, 12039, 0, 0, 0, 0, 0, 11, 17309, 40, 1, 0, 0, 0, 0, 0, 'Hellfire Watcher - On Data Set 1 1 - Cast \'Heal\' (Heroic Dungeon)'); From 7069b5e4e79192f17dba1040c12723ed80b1bc03 Mon Sep 17 00:00:00 2001 From: Samsequel <20357406+Samsequel@users.noreply.github.com> Date: Thu, 22 Dec 2022 06:37:20 +0100 Subject: [PATCH 41/83] fix(DB/CreatureOnKillReputation): Lykul Stinger rep should stop at friendly (#14283) --- data/sql/updates/pending_db_world/lykulstinger.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/lykulstinger.sql diff --git a/data/sql/updates/pending_db_world/lykulstinger.sql b/data/sql/updates/pending_db_world/lykulstinger.sql new file mode 100644 index 000000000..d24ec30c1 --- /dev/null +++ b/data/sql/updates/pending_db_world/lykulstinger.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 4 WHERE (`creature_id` = 19632); From ec1ec235bedb9176e333c3f4259a3d2cbc3afe0a Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 22 Dec 2022 05:39:29 +0000 Subject: [PATCH 42/83] chore(DB): import pending files Referenced commit(s): 7069b5e4e79192f17dba1040c12723ed80b1bc03 --- .../lykulstinger.sql => db_world/2022_12_22_00.sql} | 1 + .../returntothrallmar.sql => db_world/2022_12_22_01.sql} | 1 + .../watcherrenew.sql => db_world/2022_12_22_02.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/lykulstinger.sql => db_world/2022_12_22_00.sql} (68%) rename data/sql/updates/{pending_db_world/returntothrallmar.sql => db_world/2022_12_22_01.sql} (79%) rename data/sql/updates/{pending_db_world/watcherrenew.sql => db_world/2022_12_22_02.sql} (98%) diff --git a/data/sql/updates/pending_db_world/lykulstinger.sql b/data/sql/updates/db_world/2022_12_22_00.sql similarity index 68% rename from data/sql/updates/pending_db_world/lykulstinger.sql rename to data/sql/updates/db_world/2022_12_22_00.sql index d24ec30c1..14990346e 100644 --- a/data/sql/updates/pending_db_world/lykulstinger.sql +++ b/data/sql/updates/db_world/2022_12_22_00.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_21_00 -> 2022_12_22_00 -- UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 4 WHERE (`creature_id` = 19632); diff --git a/data/sql/updates/pending_db_world/returntothrallmar.sql b/data/sql/updates/db_world/2022_12_22_01.sql similarity index 79% rename from data/sql/updates/pending_db_world/returntothrallmar.sql rename to data/sql/updates/db_world/2022_12_22_01.sql index ba7bf0664..6259326fa 100644 --- a/data/sql/updates/pending_db_world/returntothrallmar.sql +++ b/data/sql/updates/db_world/2022_12_22_01.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_00 -> 2022_12_22_01 -- DELETE FROM `player_factionchange_quests` WHERE `alliance_id` = 10382; INSERT INTO `player_factionchange_quests` (`alliance_id`, `horde_id`) VALUES diff --git a/data/sql/updates/pending_db_world/watcherrenew.sql b/data/sql/updates/db_world/2022_12_22_02.sql similarity index 98% rename from data/sql/updates/pending_db_world/watcherrenew.sql rename to data/sql/updates/db_world/2022_12_22_02.sql index cef3fd056..69391d6d7 100644 --- a/data/sql/updates/pending_db_world/watcherrenew.sql +++ b/data/sql/updates/db_world/2022_12_22_02.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_01 -> 2022_12_22_02 UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 17309; DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 17309); From 8a1cea9aace9aa7243c9e41be473ce9bb73db4f1 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Thu, 22 Dec 2022 00:25:52 -0600 Subject: [PATCH 43/83] fix(DB/Vendor): Reduce Super Mana Pot and Frost Power Potion Recipe timer (#14321) --- .../updates/pending_db_world/rev_1671645973738924500.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671645973738924500.sql diff --git a/data/sql/updates/pending_db_world/rev_1671645973738924500.sql b/data/sql/updates/pending_db_world/rev_1671645973738924500.sql new file mode 100644 index 000000000..96420d688 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671645973738924500.sql @@ -0,0 +1,6 @@ +-- +-- Recipe: Super Mana Potion 30m +UPDATE `npc_vendor` SET `incrtime`=1800 WHERE `entry` IN (18005, 19837) AND `item`=22907 AND `ExtendedCost`=0; +-- Recipe: Elixir of Major Frost Power +UPDATE `npc_vendor` SET `incrtime`=600 WHERE `entry`=18017 AND `item`=22902 AND `ExtendedCost`=0; +UPDATE `npc_vendor` SET `incrtime`=600 WHERE `entry`=19837 AND `item`=22902 AND `ExtendedCost`=0; From 95461e30d0982bb9797bdb057e79f3afa05345a1 Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Thu, 22 Dec 2022 00:26:53 -0600 Subject: [PATCH 44/83] fix(DB/Vendor): Improve Xerintha Ravenoak vendor timers (#14319) --- data/sql/updates/pending_db_world/rev_1671639583415891400.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671639583415891400.sql diff --git a/data/sql/updates/pending_db_world/rev_1671639583415891400.sql b/data/sql/updates/pending_db_world/rev_1671639583415891400.sql new file mode 100644 index 000000000..3f4415335 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671639583415891400.sql @@ -0,0 +1,4 @@ +-- +-- Xerintha Ravenoak vendor timers repaired +UPDATE `npc_vendor` SET `incrtime`=300 WHERE `entry`=20916 AND `item`=31674 AND `ExtendedCost`=0; +UPDATE `npc_vendor` SET `incrtime`=600 WHERE `entry`=20916 AND `item`=31675 AND `ExtendedCost`=0; From 7f7cd4d21bde8f3e7528cbae97988225c521fabc Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 22 Dec 2022 06:28:59 +0000 Subject: [PATCH 45/83] chore(DB): import pending files Referenced commit(s): 95461e30d0982bb9797bdb057e79f3afa05345a1 --- .../rev_1671639583415891400.sql => db_world/2022_12_22_03.sql} | 1 + .../rev_1671645973738924500.sql => db_world/2022_12_22_04.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1671639583415891400.sql => db_world/2022_12_22_03.sql} (84%) rename data/sql/updates/{pending_db_world/rev_1671645973738924500.sql => db_world/2022_12_22_04.sql} (89%) diff --git a/data/sql/updates/pending_db_world/rev_1671639583415891400.sql b/data/sql/updates/db_world/2022_12_22_03.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1671639583415891400.sql rename to data/sql/updates/db_world/2022_12_22_03.sql index 3f4415335..ffa7e57f8 100644 --- a/data/sql/updates/pending_db_world/rev_1671639583415891400.sql +++ b/data/sql/updates/db_world/2022_12_22_03.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_02 -> 2022_12_22_03 -- -- Xerintha Ravenoak vendor timers repaired UPDATE `npc_vendor` SET `incrtime`=300 WHERE `entry`=20916 AND `item`=31674 AND `ExtendedCost`=0; diff --git a/data/sql/updates/pending_db_world/rev_1671645973738924500.sql b/data/sql/updates/db_world/2022_12_22_04.sql similarity index 89% rename from data/sql/updates/pending_db_world/rev_1671645973738924500.sql rename to data/sql/updates/db_world/2022_12_22_04.sql index 96420d688..99e0f091c 100644 --- a/data/sql/updates/pending_db_world/rev_1671645973738924500.sql +++ b/data/sql/updates/db_world/2022_12_22_04.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_03 -> 2022_12_22_04 -- -- Recipe: Super Mana Potion 30m UPDATE `npc_vendor` SET `incrtime`=1800 WHERE `entry` IN (18005, 19837) AND `item`=22907 AND `ExtendedCost`=0; From 94e45ca9c30cbfe164d618e4c543d6717439db15 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:29:45 -0300 Subject: [PATCH 46/83] fix(DB/Gameobject): Add more Ravenous Flayer Eggs (#14238) --- .../rev_1671209376089138300.sql | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671209376089138300.sql diff --git a/data/sql/updates/pending_db_world/rev_1671209376089138300.sql b/data/sql/updates/pending_db_world/rev_1671209376089138300.sql new file mode 100644 index 000000000..4a389bf3f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671209376089138300.sql @@ -0,0 +1,75 @@ +-- +SET @GUID := 9704; + +DELETE FROM `gameobject` WHERE `id`=184684; +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 +(@GUID+0 , 184684, 530, 3520, 0, 1, 1, -2502.91, 1168.12, 55.5328, -2.05949, 0, 0, 0.857167, -0.515038, 120, 255, 1, '', 0), +(@GUID+1 , 184684, 530, 3520, 0, 1, 1, -2562.92, 1063.91, 45.3053, -0.383972, 0, 0, 0.190809, -0.981627, 120, 255, 1, '', 0), +(@GUID+2 , 184684, 530, 3520, 0, 1, 1, -2539.85, 1174.34, 79.2236, -1.88496, 0, 0, 0.809017, -0.587785, 120, 255, 1, '', 0), +(@GUID+3 , 184684, 530, 3520, 0, 1, 1, -2564.83, 1101.64, 65.0654, -2.79253, 0, 0, 0.984808, -0.173648, 120, 255, 1, '', 0), +(@GUID+4 , 184684, 530, 3520, 0, 1, 1, -2576.15, 1177.07, 74.8158, 1.81514, 0, 0, 0.788011, 0.615662, 120, 255, 1, '', 0), +(@GUID+5 , 184684, 530, 3520, 0, 1, 1, -2606.99, 1077.82, 54.3653, 2.26893, 0, 0, 0.906308, 0.422618, 120, 255, 1, '', 0), +(@GUID+6 , 184684, 530, 3520, 0, 1, 1, -2497.18, 1069.18, 51.8808, -1.22173, 0, 0, 0.573576, -0.819152, 120, 255, 1, '', 0), +(@GUID+7 , 184684, 530, 3520, 0, 1, 1, -2482.5, 1118.31, 49.096, 0.20944, 0, 0, 0.104528, 0.994522, 120, 255, 1, '', 0), +(@GUID+8 , 184684, 530, 3520, 0, 1, 1, -2532.08, 1102.09, 66.699, 1.20428, 0, 0, 0.566406, 0.824126, 120, 255, 1, '', 0), +(@GUID+9 , 184684, 530, 3520, 0, 1, 1, -2708.96, 1128.65, 58.9191, 2.62378, 0, 0, 0.96667, 0.256025, 120, 255, 1, '', 46924), +(@GUID+10, 184684, 530, 3520, 0, 1, 1, -2694.1, 1092.73, 50.6055, 0.890563, 0, 0, 0.430712, 0.90249, 120, 255, 1, '', 46924), +(@GUID+11, 184684, 530, 3520, 0, 1, 1, -2723.83, 1077.73, 46.9453, 1.98967, 0, 0, 0.83867, 0.54464, 120, 255, 1, '', 46924), +(@GUID+12, 184684, 530, 3520, 0, 1, 1, -2664.99, 1081.4, 48.9334, 5.79771, 0, 0, -0.240362, 0.970683, 120, 255, 1, '', 46924), +(@GUID+13, 184684, 530, 3520, 0, 1, 1, -2638.52, 1122.91, 65.8191, 4.20625, 0, 0, -0.861629, 0.507539, 120, 255, 1, '', 46924), +(@GUID+14, 184684, 530, 3520, 0, 1, 1, -2596.45, 1037.23, 38.2863, 4.7473, 0, 0, -0.694658, 0.71934, 120, 255, 1, '', 46924), +(@GUID+15, 184684, 530, 3520, 0, 1, 1, -2580.55, 1121.57, 69.7769, 4.40485, 0, 0, -0.807068, 0.590459, 120, 255, 1, '', 46924), +(@GUID+16, 184684, 530, 3520, 0, 1, 1, -2534.9, 1131.53, 75.7671, 4.83456, 0, 0, -0.66262, 0.748956, 120, 255, 1, '', 46924), +(@GUID+17, 184684, 530, 3520, 0, 1, 1, -2531.89, 1035.4, 45.5817, 1.09956, 0, 0, 0.522498, 0.85264, 120, 255, 1, '', 46924), +(@GUID+18, 184684, 530, 3520, 0, 1, 1, -2516.96, 1029.69, 39.0831, 1.01748, 0, 0, 0.487076, 0.87336, 120, 255, 1, '', 46924), +(@GUID+19, 184684, 530, 3520, 0, 1, 1, -2494.83, 1036.67, 45.8349, 5.61996, 0, 0, -0.325567, 0.945519, 120, 255, 1, '', 46924), +(@GUID+20, 184684, 530, 3520, 0, 1, 1, -2490.16, 1008.91, 26.3388, 4.2237, 0, 0, -0.857167, 0.515038, 120, 255, 1, '', 46924), +(@GUID+21, 184684, 530, 3520, 0, 1, 1, -2548.29, 1026.32, 38.904, 6.14115, 0, 0, -0.0709572, 0.997479, 120, 255, 1, '', 46924), +(@GUID+22, 184684, 530, 3520, 0, 1, 1, -2602.67, 1101.67, 62.4206, 0.087266, 0, 0, 0.0436192, 0.999048, 120, 255, 1, '', 46924), +(@GUID+23, 184684, 530, 3520, 0, 1, 1, -2665.52, 1103.14, 57.2047, 1.43117, 0, 0, 0.656058, 0.75471, 120, 255, 1, '', 46924), +(@GUID+24, 184684, 530, 3520, 0, 1, 1, -2702.5, 1130.36, 59.5393, 4.62512, 0, 0, -0.737277, 0.675591, 120, 255, 1, '', 46924), +(@GUID+25, 184684, 530, 3520, 0, 1, 1, -2697.93, 1102.31, 54.1485, 5.46288, 0, 0, -0.398748, 0.91706, 120, 255, 1, '', 46924), +(@GUID+26, 184684, 530, 3520, 0, 1, 1, -2744.74, 1118.77, 47.8999, 3.194, 0, 0, -0.999657, 0.0262016, 120, 255, 1, '', 46924), +(@GUID+27, 184684, 530, 3520, 0, 1, 1, -2636.59, 1068.31, 52.026, 3.4034, 0, 0, -0.991445, 0.130528, 120, 255, 1, '', 46924), +(@GUID+28, 184684, 530, 3520, 0, 1, 1, -2598.06, 1130.64, 68.7114, 3.4383, 0, 0, -0.989016, 0.147811, 120, 255, 1, '', 46924), +(@GUID+29, 184684, 530, 3520, 0, 1, 1, -2511.26, 1072.8, 59.3213, 2.09866, 0, 0, 0.867089, 0.498153, 120, 255, 1, '', 46924), +(@GUID+30, 184684, 530, 3520, 0, 1, 1, -2628.11, 1119.41, 64.9071, 3.00824, 0, 0, 0.997778, 0.0666271, 120, 255, 1, '', 46924), +(@GUID+31, 184684, 530, 3520, 0, 1, 1, -2638.2, 1063.25, 51.6139, 5.5967, 0, 0, -0.336542, 0.941668, 120, 255, 1, '', 46924); + +DELETE FROM `pool_template` WHERE `entry`=1077 AND `description`='Ravenous Flayer Egg (184684)'; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES (1077, 20, 'Ravenous Flayer Egg (184684)'); + +DELETE FROM `pool_gameobject` WHERE `pool_entry`=1077 AND `description`='Ravenous Flayer Egg (184684)'; +INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID+0 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+1 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+2 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+3 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+4 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+5 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+6 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+7 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+8 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+9 , 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+10, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+11, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+12, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+13, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+14, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+15, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+16, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+17, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+18, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+19, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+20, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+21, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+22, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+23, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+24, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+25, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+26, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+27, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+28, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+29, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+30, 1077, 0, 'Ravenous Flayer Egg (184684)'), +(@GUID+31, 1077, 0, 'Ravenous Flayer Egg (184684)'); From 61a436cd71ac6d3266afcbfa0ffe8c8bd8687c4a Mon Sep 17 00:00:00 2001 From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com> Date: Thu, 22 Dec 2022 00:30:53 -0600 Subject: [PATCH 47/83] fix(DB/Loot): Hellfire quest loot improvements (#14236) --- data/sql/updates/pending_db_world/rev_1671138587360304900.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671138587360304900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671138587360304900.sql b/data/sql/updates/pending_db_world/rev_1671138587360304900.sql new file mode 100644 index 000000000..d712830d5 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671138587360304900.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_loot_template` SET `Chance`=30 WHERE `Entry`=16951 AND `Item`=23269 AND `Reference`=0 AND `GroupId`=0; +UPDATE `creature_loot_template` SET `Chance`=30 WHERE `Entry` IN (19442, 16871, 16873, 16907, 19422, 19424, 19457) AND `Item`=30425 AND `Reference`=0 AND `GroupId`=0; From 8cee606a18bf768ca327b88201b1c7c5898082d8 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:31:50 -0300 Subject: [PATCH 48/83] fix(DB/SAI): Morph Honor Hold Scout Archery Target into correct modelid on respawn (#14239) --- .../updates/pending_db_world/rev_1671210972250683700.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671210972250683700.sql diff --git a/data/sql/updates/pending_db_world/rev_1671210972250683700.sql b/data/sql/updates/pending_db_world/rev_1671210972250683700.sql new file mode 100644 index 000000000..b23fcc0aa --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671210972250683700.sql @@ -0,0 +1,6 @@ +-- +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20251; + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 20251) AND (`source_type` = 0) AND (`id` IN (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 +(20251, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 16925, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Honor Hold Scout Archery Target - On Respawn - Morph To Model 16925 - Temporary modelid Workaround'); From 04205793b312232f05ed4a0e2a26f4e9339c4e32 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:33:01 -0300 Subject: [PATCH 49/83] fix(DB/SAI): Correct Vagrant 19283 target_type (#14242) --- .../updates/pending_db_world/rev_1671217721798848700.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671217721798848700.sql diff --git a/data/sql/updates/pending_db_world/rev_1671217721798848700.sql b/data/sql/updates/pending_db_world/rev_1671217721798848700.sql new file mode 100644 index 000000000..316a304c0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671217721798848700.sql @@ -0,0 +1,7 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 19283); +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 +(19283, 0, 0, 0, 1, 0, 100, 0, 5000, 30000, 45000, 45000, 0, 10, 12, 13, 64, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vagrant - Out of Combat - Play Random Emote (12, 13, 64)'), +(19283, 0, 1, 0, 1, 0, 100, 0, 30000, 60000, 45000, 90000, 0, 5, 26, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vagrant - Out of Combat - Play Emote 26'), +(19283, 0, 2, 0, 1, 0, 100, 0, 15000, 40000, 20000, 40000, 0, 10, 18, 20, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Vagrant - Out of Combat - Play Random Emote (18, 20, 1)'), +(19283, 0, 3, 0, 1, 0, 100, 0, 30000, 300000, 240000, 520000, 0, 1, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 0, 'Vagrant - Out of Combat - Say Line 0'); From 57d49265be0a99c8cd5f3275d692b6660c0920b3 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:33:37 -0300 Subject: [PATCH 50/83] fix(DB/Loot): Jaggal Clam (#14243) --- data/sql/updates/pending_db_world/rev_1671218467178621900.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671218467178621900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671218467178621900.sql b/data/sql/updates/pending_db_world/rev_1671218467178621900.sql new file mode 100644 index 000000000..c96bac064 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671218467178621900.sql @@ -0,0 +1,3 @@ +-- +DELETE FROM `spell_loot_template` WHERE `Entry`=58160 AND `Item`=13926; +DELETE FROM `creature_loot_template` WHERE `item`=24478 AND `entry` IN (21044, 21126, 21842); From 64145b7d0516fac11f03c1be6c2b0f52a7e02143 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:34:42 -0300 Subject: [PATCH 51/83] fix(DB/Reputation): Fiendish Hound (#14245) --- .../updates/pending_db_world/rev_1671221785210348000.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671221785210348000.sql diff --git a/data/sql/updates/pending_db_world/rev_1671221785210348000.sql b/data/sql/updates/pending_db_world/rev_1671221785210348000.sql new file mode 100644 index 000000000..503db9d63 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671221785210348000.sql @@ -0,0 +1,6 @@ +-- +UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 4, `MaxStanding2` = 4, `RewOnKillRepValue1` = 1, `RewOnKillRepValue2` = 1 WHERE (`creature_id` = 17540); + +DELETE FROM `creature_onkill_reputation` WHERE (`creature_id` = 18056); +INSERT INTO `creature_onkill_reputation` (`creature_id`, `RewOnKillRepFaction1`, `RewOnKillRepFaction2`, `MaxStanding1`, `IsTeamAward1`, `RewOnKillRepValue1`, `MaxStanding2`, `IsTeamAward2`, `RewOnKillRepValue2`, `TeamDependent`) VALUES +(18056, 946, 947, 7, 0, 2, 7, 0, 2, 1); From 20c9e80d4a6e71203b343e4a03c7a2e0fde30ecf Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 22 Dec 2022 06:36:59 +0000 Subject: [PATCH 52/83] chore(DB): import pending files Referenced commit(s): 64145b7d0516fac11f03c1be6c2b0f52a7e02143 --- .../rev_1671138587360304900.sql => db_world/2022_12_22_05.sql} | 1 + .../rev_1671209376089138300.sql => db_world/2022_12_22_06.sql} | 1 + .../rev_1671210972250683700.sql => db_world/2022_12_22_07.sql} | 1 + .../rev_1671217721798848700.sql => db_world/2022_12_22_08.sql} | 1 + .../rev_1671218467178621900.sql => db_world/2022_12_22_09.sql} | 1 + .../rev_1671221785210348000.sql => db_world/2022_12_22_10.sql} | 1 + 6 files changed, 6 insertions(+) rename data/sql/updates/{pending_db_world/rev_1671138587360304900.sql => db_world/2022_12_22_05.sql} (86%) rename data/sql/updates/{pending_db_world/rev_1671209376089138300.sql => db_world/2022_12_22_06.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1671210972250683700.sql => db_world/2022_12_22_07.sql} (95%) rename data/sql/updates/{pending_db_world/rev_1671217721798848700.sql => db_world/2022_12_22_08.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1671218467178621900.sql => db_world/2022_12_22_09.sql} (79%) rename data/sql/updates/{pending_db_world/rev_1671221785210348000.sql => db_world/2022_12_22_10.sql} (92%) diff --git a/data/sql/updates/pending_db_world/rev_1671138587360304900.sql b/data/sql/updates/db_world/2022_12_22_05.sql similarity index 86% rename from data/sql/updates/pending_db_world/rev_1671138587360304900.sql rename to data/sql/updates/db_world/2022_12_22_05.sql index d712830d5..48a709ec2 100644 --- a/data/sql/updates/pending_db_world/rev_1671138587360304900.sql +++ b/data/sql/updates/db_world/2022_12_22_05.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_04 -> 2022_12_22_05 -- UPDATE `creature_loot_template` SET `Chance`=30 WHERE `Entry`=16951 AND `Item`=23269 AND `Reference`=0 AND `GroupId`=0; UPDATE `creature_loot_template` SET `Chance`=30 WHERE `Entry` IN (19442, 16871, 16873, 16907, 19422, 19424, 19457) AND `Item`=30425 AND `Reference`=0 AND `GroupId`=0; diff --git a/data/sql/updates/pending_db_world/rev_1671209376089138300.sql b/data/sql/updates/db_world/2022_12_22_06.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1671209376089138300.sql rename to data/sql/updates/db_world/2022_12_22_06.sql index 4a389bf3f..922afbf33 100644 --- a/data/sql/updates/pending_db_world/rev_1671209376089138300.sql +++ b/data/sql/updates/db_world/2022_12_22_06.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_05 -> 2022_12_22_06 -- SET @GUID := 9704; diff --git a/data/sql/updates/pending_db_world/rev_1671210972250683700.sql b/data/sql/updates/db_world/2022_12_22_07.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1671210972250683700.sql rename to data/sql/updates/db_world/2022_12_22_07.sql index b23fcc0aa..d2f951f6c 100644 --- a/data/sql/updates/pending_db_world/rev_1671210972250683700.sql +++ b/data/sql/updates/db_world/2022_12_22_07.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_06 -> 2022_12_22_07 -- UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20251; diff --git a/data/sql/updates/pending_db_world/rev_1671217721798848700.sql b/data/sql/updates/db_world/2022_12_22_08.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1671217721798848700.sql rename to data/sql/updates/db_world/2022_12_22_08.sql index 316a304c0..1ee8edaf1 100644 --- a/data/sql/updates/pending_db_world/rev_1671217721798848700.sql +++ b/data/sql/updates/db_world/2022_12_22_08.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_07 -> 2022_12_22_08 -- DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 19283); 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 diff --git a/data/sql/updates/pending_db_world/rev_1671218467178621900.sql b/data/sql/updates/db_world/2022_12_22_09.sql similarity index 79% rename from data/sql/updates/pending_db_world/rev_1671218467178621900.sql rename to data/sql/updates/db_world/2022_12_22_09.sql index c96bac064..d65022462 100644 --- a/data/sql/updates/pending_db_world/rev_1671218467178621900.sql +++ b/data/sql/updates/db_world/2022_12_22_09.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_08 -> 2022_12_22_09 -- DELETE FROM `spell_loot_template` WHERE `Entry`=58160 AND `Item`=13926; DELETE FROM `creature_loot_template` WHERE `item`=24478 AND `entry` IN (21044, 21126, 21842); diff --git a/data/sql/updates/pending_db_world/rev_1671221785210348000.sql b/data/sql/updates/db_world/2022_12_22_10.sql similarity index 92% rename from data/sql/updates/pending_db_world/rev_1671221785210348000.sql rename to data/sql/updates/db_world/2022_12_22_10.sql index 503db9d63..25a5d3f10 100644 --- a/data/sql/updates/pending_db_world/rev_1671221785210348000.sql +++ b/data/sql/updates/db_world/2022_12_22_10.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_09 -> 2022_12_22_10 -- UPDATE `creature_onkill_reputation` SET `MaxStanding1` = 4, `MaxStanding2` = 4, `RewOnKillRepValue1` = 1, `RewOnKillRepValue2` = 1 WHERE (`creature_id` = 17540); From 962cefdcd8391abb4433e1e7e0ab059ac0a8700d Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Thu, 22 Dec 2022 07:38:09 +0100 Subject: [PATCH 53/83] fix(Core/Misc): Consider `/dance` as an emote state. (#14275) --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ src/server/game/Handlers/ChatHandler.cpp | 3 +++ src/server/game/Handlers/MovementHandler.cpp | 9 +++++++++ 3 files changed, 15 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 28ed2ae35..7227ec04d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14464,6 +14464,9 @@ void Unit::setDeathState(DeathState s, bool despawn) SetHealth(0); SetPower(getPowerType(), 0); + // Stop emote on death + SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + // players in instance don't have ZoneScript, but they have InstanceScript if (ZoneScript* zoneScript = GetZoneScript() ? GetZoneScript() : (ZoneScript*)GetInstanceScript()) zoneScript->OnUnitDeath(this); diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 5d0642fca..e580a378a 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -755,6 +755,9 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recvData) case EMOTE_STATE_KNEEL: case EMOTE_ONESHOT_NONE: break; + case EMOTE_STATE_DANCE: + GetPlayer()->SetUInt32Value(UNIT_NPC_EMOTESTATE, emote_anim); + break; default: // Only allow text-emotes for "dead" entities (feign death included) if (GetPlayer()->HasUnitState(UNIT_STATE_DIED)) diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 73d98d3e1..f0889150b 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -370,6 +370,15 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvData) movementInfo.guid = guid; ReadMovementInfo(recvData, &movementInfo); + // Stop emote on move + if (Player* plrMover = mover->ToPlayer()) + { + if (plrMover->GetUInt32Value(UNIT_NPC_EMOTESTATE) != EMOTE_ONESHOT_NONE) + { + plrMover->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + } + } + if (!movementInfo.pos.IsPositionValid()) { if (plrMover) From c158d4bd2b83bc3c3ea40b6b7e9a39a0368b865a Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:38:56 -0300 Subject: [PATCH 54/83] fix(DB/Gameobject): Delete bad Nightmare Vine node (#14285) --- data/sql/updates/pending_db_world/rev_1671391096303779900.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671391096303779900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671391096303779900.sql b/data/sql/updates/pending_db_world/rev_1671391096303779900.sql new file mode 100644 index 000000000..2cc289e9a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671391096303779900.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `gameobject` WHERE `id`=181280 AND `guid`=21587; From 04edd74f91b6ccf6562acc1262aa37c98462096f Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:39:25 -0300 Subject: [PATCH 55/83] fix(DB/Creature): Fix Dreadfang Widow bad Z coord (#14286) --- data/sql/updates/pending_db_world/rev_1671392360824482200.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671392360824482200.sql diff --git a/data/sql/updates/pending_db_world/rev_1671392360824482200.sql b/data/sql/updates/pending_db_world/rev_1671392360824482200.sql new file mode 100644 index 000000000..688ecc481 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671392360824482200.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature` SET `position_z`=0.350764 WHERE `id1`=18467 AND `guid`=66274; From b4b49d2a6693fb39273d8773b4a0cc17ce346c26 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:40:11 -0300 Subject: [PATCH 56/83] fix(DB/Creature): Add trigger flag to Credit Marker: Water (#14287) --- data/sql/updates/pending_db_world/rev_1671392697767302400.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671392697767302400.sql diff --git a/data/sql/updates/pending_db_world/rev_1671392697767302400.sql b/data/sql/updates/pending_db_world/rev_1671392697767302400.sql new file mode 100644 index 000000000..f3d2f738b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671392697767302400.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE (`entry` = 21095); From 3fc22f2ff924efad1219b05e7364fc741a71d8be Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Thu, 22 Dec 2022 07:40:38 +0100 Subject: [PATCH 57/83] fix(Core/Spells): Cursed Cauldron gobs despawn after 5 seconds. (#14252) Fixes #14241 --- src/server/game/Spells/SpellInfoCorrections.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index d62f556e7..18fdefb60 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4448,6 +4448,13 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->AttributesEx3 |= SPELL_ATTR3_SUPRESS_TARGET_PROCS; }); + // Summon Cauldron Stuff + ApplySpellFix({ 36549 }, [](SpellInfo* spellInfo) + { + spellInfo->DurationEntry = sSpellDurationStore.LookupEntry(28); // 5 seconds + spellInfo->Effects[EFFECT_0].TargetB = TARGET_DEST_CASTER; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; From 2eb621c2f9df9973e7b7b23dac90e878aab75591 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Thu, 22 Dec 2022 03:40:50 -0300 Subject: [PATCH 58/83] fix(DB/Gameobject): Remove Chests from TBC dungeons (#14320) --- data/sql/updates/pending_db_world/rev_1671637638291608900.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671637638291608900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671637638291608900.sql b/data/sql/updates/pending_db_world/rev_1671637638291608900.sql new file mode 100644 index 000000000..805cc5653 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671637638291608900.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `gameobject` WHERE `id` IN (184931, 184934, 184935, 184937, 184940, 184941) AND `map` IN (543, 545, 546, 555, 557) AND `guid` IN (6990, 11222, 13822, 25829, 25830, 25831, 25832, 32635, 32636, 32710, 32632, 43140, 43141); From c05c45c51d3d414ab3bec40e3e4bc2b5c10a977e Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Thu, 22 Dec 2022 06:42:54 +0000 Subject: [PATCH 59/83] chore(DB): import pending files Referenced commit(s): 2eb621c2f9df9973e7b7b23dac90e878aab75591 --- .../rev_1671391096303779900.sql => db_world/2022_12_22_11.sql} | 1 + .../rev_1671392360824482200.sql => db_world/2022_12_22_12.sql} | 1 + .../rev_1671392697767302400.sql => db_world/2022_12_22_13.sql} | 1 + .../rev_1671637638291608900.sql => db_world/2022_12_22_14.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1671391096303779900.sql => db_world/2022_12_22_11.sql} (59%) rename data/sql/updates/{pending_db_world/rev_1671392360824482200.sql => db_world/2022_12_22_12.sql} (65%) rename data/sql/updates/{pending_db_world/rev_1671392697767302400.sql => db_world/2022_12_22_13.sql} (67%) rename data/sql/updates/{pending_db_world/rev_1671637638291608900.sql => db_world/2022_12_22_14.sql} (84%) diff --git a/data/sql/updates/pending_db_world/rev_1671391096303779900.sql b/data/sql/updates/db_world/2022_12_22_11.sql similarity index 59% rename from data/sql/updates/pending_db_world/rev_1671391096303779900.sql rename to data/sql/updates/db_world/2022_12_22_11.sql index 2cc289e9a..a3c384f8a 100644 --- a/data/sql/updates/pending_db_world/rev_1671391096303779900.sql +++ b/data/sql/updates/db_world/2022_12_22_11.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_22_10 -> 2022_12_22_11 -- DELETE FROM `gameobject` WHERE `id`=181280 AND `guid`=21587; diff --git a/data/sql/updates/pending_db_world/rev_1671392360824482200.sql b/data/sql/updates/db_world/2022_12_22_12.sql similarity index 65% rename from data/sql/updates/pending_db_world/rev_1671392360824482200.sql rename to data/sql/updates/db_world/2022_12_22_12.sql index 688ecc481..da8b65bfc 100644 --- a/data/sql/updates/pending_db_world/rev_1671392360824482200.sql +++ b/data/sql/updates/db_world/2022_12_22_12.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_22_11 -> 2022_12_22_12 -- UPDATE `creature` SET `position_z`=0.350764 WHERE `id1`=18467 AND `guid`=66274; diff --git a/data/sql/updates/pending_db_world/rev_1671392697767302400.sql b/data/sql/updates/db_world/2022_12_22_13.sql similarity index 67% rename from data/sql/updates/pending_db_world/rev_1671392697767302400.sql rename to data/sql/updates/db_world/2022_12_22_13.sql index f3d2f738b..1e9a1667d 100644 --- a/data/sql/updates/pending_db_world/rev_1671392697767302400.sql +++ b/data/sql/updates/db_world/2022_12_22_13.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_22_12 -> 2022_12_22_13 -- UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE (`entry` = 21095); diff --git a/data/sql/updates/pending_db_world/rev_1671637638291608900.sql b/data/sql/updates/db_world/2022_12_22_14.sql similarity index 84% rename from data/sql/updates/pending_db_world/rev_1671637638291608900.sql rename to data/sql/updates/db_world/2022_12_22_14.sql index 805cc5653..252e2efed 100644 --- a/data/sql/updates/pending_db_world/rev_1671637638291608900.sql +++ b/data/sql/updates/db_world/2022_12_22_14.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_22_13 -> 2022_12_22_14 -- DELETE FROM `gameobject` WHERE `id` IN (184931, 184934, 184935, 184937, 184940, 184941) AND `map` IN (543, 545, 546, 555, 557) AND `guid` IN (6990, 11222, 13822, 25829, 25830, 25831, 25832, 32635, 32636, 32710, 32632, 43140, 43141); From 4df5302e2f3c4c67fe96198bdda34ebbf9094bf9 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 24 Dec 2022 09:47:13 -0300 Subject: [PATCH 60/83] =?UTF-8?q?feat(Scripts/Commands):=20Output=20SpellC?= =?UTF-8?q?astResult=20if=20the=20spell=20fails=20to=20=E2=80=A6=20(#14359?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(Scripts/Commands): Output SpellCastResult if the spell fails to cast when using the cast spell commands --- .../rev_1671880843744472600.sql | 4 ++ src/server/game/Miscellaneous/Language.h | 4 +- src/server/scripts/Commands/cs_cast.cpp | 48 ++++++++++++++++--- 3 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1671880843744472600.sql diff --git a/data/sql/updates/pending_db_world/rev_1671880843744472600.sql b/data/sql/updates/pending_db_world/rev_1671880843744472600.sql new file mode 100644 index 000000000..aa774d394 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671880843744472600.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `acore_string` WHERE `entry` = 5084; +INSERT INTO `acore_string` (`entry`, `content_default`) VALUES +(5084, 'Spell cast failed! SpellCastResult returned: %s (%u).'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index f907ddaf8..587abd97c 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1148,7 +1148,9 @@ enum AcoreStrings LANG_CMD_CHAR_CHANGE_ACC_SUCCESS = 5083, - // Room for more strings 5083-9999 + LANG_CMD_CAST_ERROR_CODE = 5084, + + // Room for more strings 5084-9999 // Level requirement notifications LANG_SAY_REQ = 6604, diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index eb9d9f6dc..311cfdb9a 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -56,6 +56,17 @@ public: return commandTable; } + static bool CheckSpellCastResult(ChatHandler* handler, SpellCastResult result) + { + if (result != SPELL_CAST_OK) + { + handler->PSendSysMessage(LANG_CMD_CAST_ERROR_CODE, EnumUtils::ToTitle(SpellCastResult(result)), result); + return false; + } + + return true; + } + static bool CheckSpellExistsAndIsValid(ChatHandler* handler, SpellInfo const* spell) { if (!spell) @@ -103,7 +114,11 @@ public: if (!triggerFlags) return false; - handler->GetSession()->GetPlayer()->CastSpell(target, spell->Id, *triggerFlags); + if (!CheckSpellCastResult(handler, handler->GetSession()->GetPlayer()->CastSpell(target, spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } @@ -125,7 +140,11 @@ public: if (!triggerFlags) return false; - caster->CastSpell(handler->GetSession()->GetPlayer(), spell->Id, *triggerFlags); + if (!CheckSpellCastResult(handler, caster->CastSpell(handler->GetSession()->GetPlayer(), spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } @@ -141,7 +160,12 @@ public: float x, y, z; handler->GetSession()->GetPlayer()->GetClosePoint(x, y, z, dist); - handler->GetSession()->GetPlayer()->CastSpell(x, y, z, spell->Id, *triggerFlags); + + if (!CheckSpellCastResult(handler, handler->GetSession()->GetPlayer()->CastSpell(x, y, z, spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } @@ -163,7 +187,11 @@ public: if (!triggerFlags) return false; - target->CastSpell(target, spell->Id, *triggerFlags); + if (!CheckSpellCastResult(handler, target->CastSpell(target, spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } @@ -192,7 +220,11 @@ public: if (!triggerFlags) return false; - caster->CastSpell(caster->GetVictim(), spell->Id, *triggerFlags); + if (!CheckSpellCastResult(handler, caster->CastSpell(caster->GetVictim(), spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } @@ -214,7 +246,11 @@ public: if (!triggerFlags) return false; - caster->CastSpell(x, y, z, spell->Id, *triggerFlags); + if (!CheckSpellCastResult(handler, caster->CastSpell(x, y, z, spell->Id, *triggerFlags))) + { + handler->SetSentErrorMessage(true); + return false; + } return true; } From e7f9f1ef72df9a01766782817237c1d00536edb3 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sat, 24 Dec 2022 12:49:19 +0000 Subject: [PATCH 61/83] chore(DB): import pending files Referenced commit(s): 4df5302e2f3c4c67fe96198bdda34ebbf9094bf9 --- .../rev_1671880843744472600.sql => db_world/2022_12_24_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671880843744472600.sql => db_world/2022_12_24_00.sql} (80%) diff --git a/data/sql/updates/pending_db_world/rev_1671880843744472600.sql b/data/sql/updates/db_world/2022_12_24_00.sql similarity index 80% rename from data/sql/updates/pending_db_world/rev_1671880843744472600.sql rename to data/sql/updates/db_world/2022_12_24_00.sql index aa774d394..2b9088ba0 100644 --- a/data/sql/updates/pending_db_world/rev_1671880843744472600.sql +++ b/data/sql/updates/db_world/2022_12_24_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_22_14 -> 2022_12_24_00 -- DELETE FROM `acore_string` WHERE `entry` = 5084; INSERT INTO `acore_string` (`entry`, `content_default`) VALUES From a73d4173dfab04de9f58a9768c97f31caf5f81ea Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 24 Dec 2022 11:38:21 -0300 Subject: [PATCH 62/83] =?UTF-8?q?feat(Core/Scripting):=20Pass=20SpellInfo?= =?UTF-8?q?=20through=20the=20ModifyPeriodicDamage=E2=80=A6=20(#14360)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(Core/Scripting): Pass SpellInfo through the ModifyPeriodicDamageAurasTick() hook --- src/server/game/Scripting/ScriptDefines/UnitScript.cpp | 4 ++-- src/server/game/Scripting/ScriptMgr.h | 4 ++-- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp index dd5f20709..5d66f7a88 100644 --- a/src/server/game/Scripting/ScriptDefines/UnitScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/UnitScript.cpp @@ -53,11 +53,11 @@ void ScriptMgr::OnDamage(Unit* attacker, Unit* victim, uint32& damage) }); } -void ScriptMgr::ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage) +void ScriptMgr::ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage, SpellInfo const* spellInfo) { ExecuteScript([&](UnitScript* script) { - script->ModifyPeriodicDamageAurasTick(target, attacker, damage); + script->ModifyPeriodicDamageAurasTick(target, attacker, damage, spellInfo); }); } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 8e3545bd3..8c30b28d8 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -422,7 +422,7 @@ public: // Called when DoT's Tick Damage is being Dealt // Attacker can be nullptr if he is despawned while the aura still exists on target - virtual void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { } + virtual void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/, SpellInfo const* /*spellInfo*/) { } // Called when Melee Damage is being Dealt virtual void ModifyMeleeDamage(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { } @@ -2437,7 +2437,7 @@ public: /* Scheduled scripts */ public: /* UnitScript */ void OnHeal(Unit* healer, Unit* reciever, uint32& gain); void OnDamage(Unit* attacker, Unit* victim, uint32& damage); - void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage); + void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage, SpellInfo const* spellInfo); void ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage); void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage, SpellInfo const* spellInfo); void ModifyHealReceived(Unit* target, Unit* healer, uint32& addHealth, SpellInfo const* spellInfo); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 997e7e5bf..cfe37f4e8 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6298,7 +6298,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const uint32 damage = std::max(GetAmount(), 0); // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage, GetSpellInfo()); if (GetAuraType() == SPELL_AURA_PERIODIC_DAMAGE) { @@ -6410,7 +6410,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c uint32 damage = std::max(GetAmount(), 0); // Script Hook For HandlePeriodicHealthLeechAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage); + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage, GetSpellInfo()); if (GetBase()->GetType() == DYNOBJ_AURA_TYPE) damage = caster->SpellDamageBonusDone(target, GetSpellInfo(), damage, DOT, GetEffIndex(), 0.0f, GetBase()->GetStackAmount()); @@ -6618,7 +6618,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const uint32 heal = uint32(damage); // Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations - sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, heal); + sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, heal, GetSpellInfo()); sScriptMgr->ModifyHealReceived(target, caster, heal, GetSpellInfo()); HealInfo healInfo(caster, target, heal, GetSpellInfo(), GetSpellInfo()->GetSchoolMask()); From d3339aee00be3320a923ffbcbb368a675fea6b61 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sun, 25 Dec 2022 04:08:48 -0500 Subject: [PATCH 63/83] fix(DB/Creature): Attach auras to Winter Revelers to correct models. (#14366) * Create winter-reveler.sql Co-authored by: @cala, @AnonXS * Formatting fixes. * Correct a couple bad spell IDs. --- .../pending_db_world/winter-reveler.sql | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 data/sql/updates/pending_db_world/winter-reveler.sql diff --git a/data/sql/updates/pending_db_world/winter-reveler.sql b/data/sql/updates/pending_db_world/winter-reveler.sql new file mode 100644 index 000000000..2295f47c3 --- /dev/null +++ b/data/sql/updates/pending_db_world/winter-reveler.sql @@ -0,0 +1,50 @@ +DELETE FROM `creature_addon` WHERE `guid` IN (89359, 89360, 89361, 89362, 89363, 89364, 89365, 89366, 89367, 89368, 89369, 89370, 89371, 89372, 89373, 89374, 89375, 89376, 89377, 89378, 89379, 89380, 89381, 89382, 89383, 89384, 89385, 89386, 89387, 89388, 89389, 89390, 89391, 89392, 89393, 89394, 89395, 89396, 89397, 89398, 89399, 89400, 89401, 89402, 89403, 89404, 89405, 89406); +INSERT INTO `creature_addon` (`guid`, `bytes2`, `auras`) VALUES +(89359, 4097, '26239'), +(89360, 4097, '26240'), +(89361, 4097, '26239'), +(89362, 4097, '26240'), +(89363, 4097, '26240'), +(89364, 4097, '26239'), +(89365, 4097, '26240'), +(89366, 4097, '26239'), +(89367, 4097, '26239'), +(89368, 4097, '26240'), +(89369, 4097, '26241'), +(89370, 4097, '26242'), +(89371, 4097, '26241'), +(89372, 4097, '26242'), +(89373, 4097, '39858'), +(89374, 4097, '39859'), +(89375, 4097, '26245'), +(89376, 4097, '26246'), +(89377, 4097, '39859'), +(89378, 4097, '39858'), +(89379, 4097, '26243'), +(89380, 4097, '26244'), +(89381, 4097, '26247'), +(89382, 4097, '26248'), +(89383, 4097, '26247'), +(89384, 4097, '26248'), +(89385, 4097, '26249'), +(89386, 4097, '26250'), +(89387, 4097, '26253'), +(89388, 4097, '26254'), +(89389, 4097, '26253'), +(89390, 4097, '26254'), +(89391, 4097, '26253'), +(89392, 4097, '26254'), +(89393, 4097, '26247'), +(89394, 4097, '26248'), +(89395, 4097, '26249'), +(89396, 4097, '26250'), +(89397, 4097, '26247'), +(89398, 4097, '26248'), +(89399, 4097, '39860'), +(89400, 4097, '39861'), +(89401, 4097, '39861'), +(89402, 4097, '39861'), +(89403, 4097, '39861'), +(89404, 4097, '39860'), +(89405, 4097, '26239'), +(89406, 4097, '26240'); From 40c2aa3e70484c74ed04cfdb15a4dcc3abe81c38 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sun, 25 Dec 2022 09:10:50 +0000 Subject: [PATCH 64/83] chore(DB): import pending files Referenced commit(s): d3339aee00be3320a923ffbcbb368a675fea6b61 --- .../winter-reveler.sql => db_world/2022_12_25_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/winter-reveler.sql => db_world/2022_12_25_00.sql} (97%) diff --git a/data/sql/updates/pending_db_world/winter-reveler.sql b/data/sql/updates/db_world/2022_12_25_00.sql similarity index 97% rename from data/sql/updates/pending_db_world/winter-reveler.sql rename to data/sql/updates/db_world/2022_12_25_00.sql index 2295f47c3..2c2518c2e 100644 --- a/data/sql/updates/pending_db_world/winter-reveler.sql +++ b/data/sql/updates/db_world/2022_12_25_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_24_00 -> 2022_12_25_00 DELETE FROM `creature_addon` WHERE `guid` IN (89359, 89360, 89361, 89362, 89363, 89364, 89365, 89366, 89367, 89368, 89369, 89370, 89371, 89372, 89373, 89374, 89375, 89376, 89377, 89378, 89379, 89380, 89381, 89382, 89383, 89384, 89385, 89386, 89387, 89388, 89389, 89390, 89391, 89392, 89393, 89394, 89395, 89396, 89397, 89398, 89399, 89400, 89401, 89402, 89403, 89404, 89405, 89406); INSERT INTO `creature_addon` (`guid`, `bytes2`, `auras`) VALUES (89359, 4097, '26239'), From c7f9f9bc27f86966aab01da52b46a1c25a76a0ee Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 25 Dec 2022 13:46:01 +0100 Subject: [PATCH 65/83] fix(Core/Pets): Taunt should work on pets. (#14255) Fixes #14217 --- src/server/game/AI/CoreAI/PetAI.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index a60083a67..8e86d4658 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -578,7 +578,12 @@ void PetAI::SpellHit(Unit* caster, SpellInfo const* spellInfo) { me->GetCharmInfo()->SetForcedSpell(0); me->GetCharmInfo()->SetForcedTargetGUID(); - AttackStart(caster); + + if (CanAttack(caster, spellInfo)) + { + // Only chase if not commanded to stay or if stay but commanded to attack + DoAttack(caster, (!me->GetCharmInfo()->HasCommandState(COMMAND_STAY) || me->GetCharmInfo()->IsCommandAttack())); + } } } @@ -709,6 +714,12 @@ bool PetAI::CanAttack(Unit* target, SpellInfo const* spellInfo) // Pets attacking something (or chasing) should only switch targets if owner tells them to if (me->GetVictim() && me->GetVictim() != target) { + // Forced change target if it's taunt + if (spellInfo && spellInfo->HasAura(SPELL_AURA_MOD_TAUNT)) + { + return true; + } + // Check if our owner selected this target and clicked "attack" Unit* ownerTarget = nullptr; if (Player* owner = me->GetCharmerOrOwner()->ToPlayer()) From 2e001e7a6dfca9d1fcb08e94b38fae8551e61335 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 25 Dec 2022 14:16:30 +0100 Subject: [PATCH 66/83] =?UTF-8?q?fix(DB/Creatures):=20Fixed=20Frozen=20Sph?= =?UTF-8?q?eres=20not=20floating=20in=20the=20air=20in=20he=E2=80=A6=20(#1?= =?UTF-8?q?4251)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(DB/Creatures): Fixed Frozen Spheres not floating in the air in heroic modes. Fixes #14204 --- .../sql/updates/pending_db_world/rev_1671267139648095100.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671267139648095100.sql diff --git a/data/sql/updates/pending_db_world/rev_1671267139648095100.sql b/data/sql/updates/pending_db_world/rev_1671267139648095100.sql new file mode 100644 index 000000000..36b7b3dd6 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671267139648095100.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `creature_template_movement` WHERE `CreatureID` IN (3460602,3460603); +INSERT INTO `creature_template_movement` VALUES +(3460602,0,1,1,0,0,0,NULL), +(3460603,0,1,1,0,0,0,NULL); From 49ad7402d90f1254eddcab2fa119bc14e079097d Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 25 Dec 2022 14:17:15 +0100 Subject: [PATCH 67/83] =?UTF-8?q?fix(Core/LFG):=20Fixed=20showing=20dungeo?= =?UTF-8?q?n=20access=20requirements=20only=20for=20lea=E2=80=A6=20(#14116?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/LFG): Fixed showing dungeon access requirements only for leaders in LFG. Fixes #14070 --- src/server/game/DungeonFinding/LFGMgr.cpp | 40 +++++++++++-------- src/server/game/DungeonFinding/LFGMgr.h | 2 +- src/server/game/DungeonFinding/LFGScripts.cpp | 9 +++-- src/server/game/Handlers/LFGHandler.cpp | 4 +- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index eff82b442..2977570f7 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -269,7 +269,7 @@ namespace lfg // Recalculate locked dungeons for (LfgPlayerDataContainer::const_iterator it = PlayersStore.begin(); it != PlayersStore.end(); ++it) if (Player* player = ObjectAccessor::FindConnectedPlayer(it->first)) - InitializeLockedDungeons(player); + InitializeLockedDungeons(player, nullptr); } } @@ -388,11 +388,10 @@ namespace lfg @param[in] player Player we need to initialize the lock status map */ - void LFGMgr::InitializeLockedDungeons(Player* player, uint8 level /* = 0 */) + void LFGMgr::InitializeLockedDungeons(Player* player, Group const* group) { ObjectGuid guid = player->GetGUID(); - if (!level) - level = player->getLevel(); + uint8 level = player->getLevel(); uint8 expansion = player->GetSession()->Expansion(); LfgDungeonSet const& dungeons = GetDungeonsByRandom(0); LfgLockMap lock; @@ -429,12 +428,15 @@ namespace lfg // Check required items for (const ProgressionRequirement* itemRequirement : ar->items) { - if (itemRequirement->faction == TEAM_NEUTRAL || itemRequirement->faction == player->GetTeamId(true)) + if (!itemRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { - if (!player->HasItemCount(itemRequirement->id, 1)) + if (itemRequirement->faction == TEAM_NEUTRAL || itemRequirement->faction == player->GetTeamId(true)) { - lockData = LFG_LOCKSTATUS_MISSING_ITEM; - break; + if (!player->HasItemCount(itemRequirement->id, 1)) + { + lockData = LFG_LOCKSTATUS_MISSING_ITEM; + break; + } } } } @@ -442,12 +444,15 @@ namespace lfg //Check for quests for (const ProgressionRequirement* questRequirement : ar->quests) { - if (questRequirement->faction == TEAM_NEUTRAL || questRequirement->faction == player->GetTeamId(true)) + if (!questRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { - if (!player->GetQuestRewardStatus(questRequirement->id)) + if (questRequirement->faction == TEAM_NEUTRAL || questRequirement->faction == player->GetTeamId(true)) { - lockData = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED; - break; + if (!player->GetQuestRewardStatus(questRequirement->id)) + { + lockData = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED; + break; + } } } } @@ -461,12 +466,15 @@ namespace lfg //Check if player has the required achievements for (const ProgressionRequirement* achievementRequirement : ar->achievements) { - if (achievementRequirement->faction == TEAM_NEUTRAL || achievementRequirement->faction == player->GetTeamId(true)) + if (!achievementRequirement->checkLeaderOnly || !group || group->GetLeaderGUID() == player->GetGUID()) { - if (!player->HasAchieved(achievementRequirement->id)) + if (achievementRequirement->faction == TEAM_NEUTRAL || achievementRequirement->faction == player->GetTeamId(true)) { - lockData = LFG_LOCKSTATUS_MISSING_ACHIEVEMENT; - break; + if (!player->HasAchieved(achievementRequirement->id)) + { + lockData = LFG_LOCKSTATUS_MISSING_ACHIEVEMENT; + break; + } } } } diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 1b2636156..31a067a60 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -491,7 +491,7 @@ namespace lfg /// Get leader of the group (using internal data) ObjectGuid GetLeader(ObjectGuid guid); /// Initializes locked dungeons for given player (called at login or level change) - void InitializeLockedDungeons(Player* player, uint8 level = 0); + void InitializeLockedDungeons(Player* player, Group const* group = nullptr); /// Sets player team void SetTeam(ObjectGuid guid, TeamId teamId); /// Sets player group diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index dbf725f8b..151623140 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -36,7 +36,7 @@ namespace lfg if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER | LFG_OPTION_ENABLE_SEASONAL_BOSSES)) return; - sLFGMgr->InitializeLockedDungeons(player); + sLFGMgr->InitializeLockedDungeons(player, player->GetGroup()); } void LFGPlayerScript::OnLogout(Player* player) @@ -68,7 +68,8 @@ namespace lfg ObjectGuid guid = player->GetGUID(); ObjectGuid gguid = sLFGMgr->GetGroup(guid); - if (Group const* group = player->GetGroup()) + Group const* group = player->GetGroup(); + if (group) { ObjectGuid gguid2 = group->GetGUID(); if (gguid != gguid2) @@ -77,7 +78,7 @@ namespace lfg } } - sLFGMgr->InitializeLockedDungeons(player); + sLFGMgr->InitializeLockedDungeons(player, group); sLFGMgr->SetTeam(player->GetGUID(), player->GetTeamId()); // TODO - Restore LfgPlayerData and send proper status to player if it was in a group } @@ -86,7 +87,7 @@ namespace lfg { MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); if (mapEntry->IsDungeon() && difficulty > DUNGEON_DIFFICULTY_NORMAL) - sLFGMgr->InitializeLockedDungeons(player); + sLFGMgr->InitializeLockedDungeons(player, player->GetGroup()); } void LFGPlayerScript::OnMapChanged(Player* player) diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index e7cf852a6..e94096b8b 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -157,7 +157,7 @@ void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData* sLFGMgr->GetRandomAndSeasonalDungeons(level, GetPlayer()->GetSession()->Expansion()); // Get player locked Dungeons - sLFGMgr->InitializeLockedDungeons(GetPlayer()); // pussywizard + sLFGMgr->InitializeLockedDungeons(GetPlayer(), GetPlayer()->GetGroup()); // pussywizard lfg::LfgLockMap const& lock = sLFGMgr->GetLockedDungeons(guid); uint32 rsize = uint32(randomDungeons.size()); uint32 lsize = uint32(lock.size()); @@ -239,7 +239,7 @@ void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData* if (pguid == guid) continue; - sLFGMgr->InitializeLockedDungeons(plrg); // pussywizard + sLFGMgr->InitializeLockedDungeons(plrg, group); // pussywizard lockMap[pguid] = sLFGMgr->GetLockedDungeons(pguid); } From bf6e1ac43ae6cb69fe548ef3683b8499b9a73d79 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sun, 25 Dec 2022 10:17:36 -0300 Subject: [PATCH 68/83] fix(DB/SAI): Aggonis In Combat spells (#14336) Create rev_1671751333190578800.sql --- .../sql/updates/pending_db_world/rev_1671751333190578800.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671751333190578800.sql diff --git a/data/sql/updates/pending_db_world/rev_1671751333190578800.sql b/data/sql/updates/pending_db_world/rev_1671751333190578800.sql new file mode 100644 index 000000000..c7df5e741 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671751333190578800.sql @@ -0,0 +1,5 @@ +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 17000) AND (`source_type` = 0) AND (`id` IN (7, 8)); +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 +(17000, 0, 7, 0, 0, 0, 100, 0, 9000, 12000, 27000, 31000, 0, 11, 21068, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Aggonis - In Combat - Cast \'Corruption\''), +(17000, 0, 8, 0, 0, 0, 100, 0, 17000, 25000, 17000, 25000, 0, 11, 22678, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Aggonis - In Combat - Cast \'Fear\''); From a8cd4c91a02bbe3b0583a397467d04c444df6cd0 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sun, 25 Dec 2022 13:19:34 +0000 Subject: [PATCH 69/83] chore(DB): import pending files Referenced commit(s): bf6e1ac43ae6cb69fe548ef3683b8499b9a73d79 --- .../rev_1671267139648095100.sql => db_world/2022_12_25_01.sql} | 1 + .../rev_1671751333190578800.sql => db_world/2022_12_25_02.sql} | 1 + 2 files changed, 2 insertions(+) rename data/sql/updates/{pending_db_world/rev_1671267139648095100.sql => db_world/2022_12_25_01.sql} (81%) rename data/sql/updates/{pending_db_world/rev_1671751333190578800.sql => db_world/2022_12_25_02.sql} (95%) diff --git a/data/sql/updates/pending_db_world/rev_1671267139648095100.sql b/data/sql/updates/db_world/2022_12_25_01.sql similarity index 81% rename from data/sql/updates/pending_db_world/rev_1671267139648095100.sql rename to data/sql/updates/db_world/2022_12_25_01.sql index 36b7b3dd6..7548ffc52 100644 --- a/data/sql/updates/pending_db_world/rev_1671267139648095100.sql +++ b/data/sql/updates/db_world/2022_12_25_01.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_00 -> 2022_12_25_01 -- DELETE FROM `creature_template_movement` WHERE `CreatureID` IN (3460602,3460603); INSERT INTO `creature_template_movement` VALUES diff --git a/data/sql/updates/pending_db_world/rev_1671751333190578800.sql b/data/sql/updates/db_world/2022_12_25_02.sql similarity index 95% rename from data/sql/updates/pending_db_world/rev_1671751333190578800.sql rename to data/sql/updates/db_world/2022_12_25_02.sql index c7df5e741..701cee044 100644 --- a/data/sql/updates/pending_db_world/rev_1671751333190578800.sql +++ b/data/sql/updates/db_world/2022_12_25_02.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_01 -> 2022_12_25_02 -- DELETE FROM `smart_scripts` WHERE (`entryorguid` = 17000) AND (`source_type` = 0) AND (`id` IN (7, 8)); 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 From 0c1b967f9bd15811c0f61a3417aa724fe14050e6 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 25 Dec 2022 14:35:55 +0100 Subject: [PATCH 70/83] fix(Core/Transports): Added Arrival bell sound for boats. (#14272) Fixes #11340 --- .../rev_1671361010497519200.sql | 20 +++++++++++++ src/server/game/Entities/Player/Player.cpp | 29 +++++++++++++++++++ src/server/game/Entities/Player/Player.h | 4 +-- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1671361010497519200.sql diff --git a/data/sql/updates/pending_db_world/rev_1671361010497519200.sql b/data/sql/updates/pending_db_world/rev_1671361010497519200.sql new file mode 100644 index 000000000..c71d90569 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671361010497519200.sql @@ -0,0 +1,20 @@ +-- +DELETE FROM `event_scripts` WHERE `id` IN (10301,10302,16395,16396,16397,16398,16399,16400,16401,16402,16522,19030,19031,19032,19033,19123,19124); +INSERT INTO `event_scripts` VALUES +(10301,0,16,5495,2,0,0,0,0,0), +(10302,0,16,5495,2,0,0,0,0,0), +(16395,0,16,5495,2,0,0,0,0,0), +(16396,0,16,5495,2,0,0,0,0,0), +(16397,0,16,5495,2,0,0,0,0,0), +(16398,0,16,5495,2,0,0,0,0,0), +(16399,0,16,5495,2,0,0,0,0,0), +(16400,0,16,5495,2,0,0,0,0,0), +(16401,0,16,5495,2,0,0,0,0,0), +(16402,0,16,5495,2,0,0,0,0,0), +(16522,0,16,5495,2,0,0,0,0,0), +(19030,0,16,5495,2,0,0,0,0,0), +(19031,0,16,5495,2,0,0,0,0,0), +(19032,0,16,5495,2,0,0,0,0,0), +(19033,0,16,5495,2,0,0,0,0,0), +(19123,0,16,5495,2,0,0,0,0,0), +(19124,0,16,5495,2,0,0,0,0,0); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2e6b965ab..e17d7ffd4 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -11152,6 +11152,35 @@ WorldLocation Player::GetStartPosition() const return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0); } +bool Player::HaveAtClient(WorldObject const* u) const +{ + if (u == this) + { + return true; + } + + // Motion Transports are always present in player's client + if (GameObject const* gameobject = u->ToGameObject()) + { + if (gameobject->IsMotionTransport()) + { + return true; + } + } + + return m_clientGUIDs.find(u->GetGUID()) != m_clientGUIDs.end(); +} + +bool Player::HaveAtClient(ObjectGuid guid) const +{ + if (guid == GetGUID()) + { + return true; + } + + return m_clientGUIDs.find(guid) != m_clientGUIDs.end(); +} + bool Player::IsNeverVisible() const { if (Unit::IsNeverVisible()) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 3d13fc8f5..b50471700 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2330,8 +2330,8 @@ public: GuidUnorderedSet m_clientGUIDs; std::vector m_newVisible; // pussywizard - bool HaveAtClient(WorldObject const* u) const { return u == this || m_clientGUIDs.find(u->GetGUID()) != m_clientGUIDs.end(); } - [[nodiscard]] bool HaveAtClient(ObjectGuid guid) const { return guid == GetGUID() || m_clientGUIDs.find(guid) != m_clientGUIDs.end(); } + [[nodiscard]] bool HaveAtClient(WorldObject const* u) const; + [[nodiscard]] bool HaveAtClient(ObjectGuid guid) const; [[nodiscard]] bool IsNeverVisible() const override; From cb714057cfe046d2638e8a8d6b6784fca8bef3a0 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sun, 25 Dec 2022 10:36:35 -0300 Subject: [PATCH 71/83] fix(DB/Loot): Correct Primal Nether drop chance from normal dungeons (#14329) Create rev_1671668610731654600.sql --- data/sql/updates/pending_db_world/rev_1671668610731654600.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671668610731654600.sql diff --git a/data/sql/updates/pending_db_world/rev_1671668610731654600.sql b/data/sql/updates/pending_db_world/rev_1671668610731654600.sql new file mode 100644 index 000000000..3e8097e87 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671668610731654600.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_loot_template` SET `Chance`=5 WHERE `Entry` IN (17881, 20912) AND `Item`=23572; +UPDATE `creature_loot_template` SET `Chance`=2.5 WHERE `Entry`=18473 AND `Item`=23572; From 2d477b1b00977e107d5e9c6f16114099e77f6a55 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sun, 25 Dec 2022 10:37:00 -0300 Subject: [PATCH 72/83] fix(DB/Creature): Rebuild Bonechewer Ruins (#14335) * Create rev_1671717341416145500.sql * Update rev_1671717341416145500.sql * Update rev_1671717341416145500.sql --- .../rev_1671717341416145500.sql | 170 ++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671717341416145500.sql diff --git a/data/sql/updates/pending_db_world/rev_1671717341416145500.sql b/data/sql/updates/pending_db_world/rev_1671717341416145500.sql new file mode 100644 index 000000000..4ff60031a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671717341416145500.sql @@ -0,0 +1,170 @@ +-- +DELETE FROM `creature` WHERE `id1` IN (16772, 16810, 18583, 18595, 21244, 21245) AND `map`=530; +DELETE FROM `creature_addon` WHERE (`guid` IN (57784)); +DELETE FROM `waypoint_data` WHERE `id`=577840; + +SET @CGUID := 126173; + +DELETE FROM `creature` WHERE `id1` IN (16772, 16810, 18583, 18595, 21244, 21245) AND `map`=530 AND `guid` BETWEEN @CGUID+0 AND @CGUID+65; +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@CGUID+0 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2952.66, 3561.35, -8.78986, 1.89069, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+1 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2978.11, 3572.78, -1.49493, 4.83592, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+2 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -3011.02, 3590.05, -1.06979, 2.40384, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+3 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2900.73, 3546.49, -8.56535, 2.882, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+4 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2912.7, 3598.6, -7.89096, 0.475943, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+5 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2889.63, 3655.79, -16.641, 0.674741, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+6 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2996.76, 3534.45, -2.91647, 0.377968, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+7 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2878.11, 3512.63, -31.2577, 3.65704, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+8 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2842.25, 3520.17, -32.6155, 0.8884, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+9 , 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2854.84, 3543.86, -28.5847, 3.75365, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+10, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2847.62, 3423.77, -38.6338, 1.39217, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+11, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2920.82, 3439.34, 1.89517, 2.16381, 300, 4, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+12, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2989.85, 3474.44, 0.242866, 3.13417, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+13, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2970.8, 3428.27, 0.369956, 1.15121, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+14, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2992.71, 3433.33, 0.140028, 4.65778, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+15, 16772, 0, 0, 530, 3519, 3685, 1, 1, 1, -2969.89, 3387.38, -2.8441, 0.688363, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+16, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2958.42, 3570.89, -8.49691, 1.53806, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+17, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2959.52, 3599.75, -8.21553, 6.19821, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+18, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2916.19, 3655.01, -13.6, 5.71277, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+19, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2982.65, 3610.84, -7.54508, 1.19283, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+20, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2928.79, 3579.73, -8.3294, 3.07535, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+21, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2985.11, 3534.84, -4.96737, 5.16294, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+22, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2853.91, 3594.71, -16.4873, 2.24127, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+23, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2916.96, 3527.39, -20.6777, 2.36518, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+24, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -3017.15, 3539.73, 3.42819, 4.05015, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+25, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2943.11, 3515.03, -3.35069, 2.15934, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+26, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2894.59, 3511.19, -27.3974, 5.62996, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+27, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2945.82, 3485.89, -0.794651, 2.44335, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+28, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2835.23, 3476.84, -36.6966, 5.35597, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+29, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2910.26, 3429.49, 1.89258, 0.243211, 300, 4, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+30, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2934.43, 3432.64, 1.44274, 0.169485, 300, 4, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+31, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2924.21, 3412.8, 1.8932, 5.65184, 300, 4, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+32, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2894.67, 3388, -16.0053, 2.73388, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+33, 16810, 0, 0, 530, 3519, 3685, 1, 1, 1, -2922.86, 3355.23, -4.37179, 2.41487, 300, 8, 0, 0, 0, 1, 0, 0, 0, '', 46902), +(@CGUID+34, 18583, 0, 0, 530, 3519, 3685, 1, 1, 0, -2918.13, 3419.44, 1.95939, 1.8675, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+35, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2908.88, 3642.13, -14.6527, 3.87463, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+36, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2930.01, 3650.55, -13.9865, 4.7473, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+37, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2892.56, 3661.07, -15.156, 1.36136, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+38, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2900.37, 3629.99, -15.9055, 3.59538, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+39, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2867.07, 3628.48, -18.924, 3.28122, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+40, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2886.25, 3601.66, -12.7957, 4.90438, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+41, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2865.16, 3522.96, -31.2675, 3.29867, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+42, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2863.11, 3487.31, -34.7281, 4.53786, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+43, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2867.3, 3507.89, -32.9131, 4.4855, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+44, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2869.42, 3533.9, -27.6314, 3.80482, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+45, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2846.26, 3473.25, -35.2073, 5.14872, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+46, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2795.97, 3542.4, -23.3668, 5.63741, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+47, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2785.02, 3535.61, -21.1517, 2.40855, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+48, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2844.44, 3449.82, -34.4622, 3.1765, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+49, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2864.73, 3441.21, -33.3934, 5.28835, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+50, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2774.82, 3515.33, -21.8647, 4.85202, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+51, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2763.34, 3511.97, -20.4736, 3.24631, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+52, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2773.2, 3485.57, -25.7095, 4.92183, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+53, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2783.61, 3476.76, -29.2956, 1.98968, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+54, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2820.51, 3386.5, -33.2632, 3.7001, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+55, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2837.91, 3374.03, -32.5019, 0.959931, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+56, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2963.98, 3392.01, -0.105973, 1.71042, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+57, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2948.97, 3386.08, 0.147994, 0.0523599, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+58, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2928.96, 3353.67, -2.49567, 2.67035, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+59, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2928.81, 3372.29, 0.0617593, 1.53589, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+60, 18595, 0, 0, 530, 3519, 3685, 1, 1, 1, -2948.36, 3343.35, 2.30562, 0.279253, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+61, 21244, 0, 0, 530, 3519, 3685, 1, 1, 1, -2976.06, 3396.42, -0.132245, 4.50382, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+62, 21245, 0, 0, 530, 3519, 3685, 1, 1, 1, -2977.07, 3418.29, 0.265028, 4.78299, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+63, 21245, 0, 0, 530, 3519, 3685, 1, 1, 1, -2976.71, 3413.3, 0.265028, 4.78338, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+64, 21245, 0, 0, 530, 3519, 3685, 1, 1, 1, -2976.36, 3408.32, 0.265028, 4.783, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902), +(@CGUID+65, 21245, 0, 0, 530, 3519, 3685, 1, 1, 1, -2975.86, 3401.42, 0.25352, 4.78756, 300, 0, 0, 0, 0, 0, 0, 0, 0, '', 46902); + +-- Pathing for Bonechewer Devastator Entry: 16772 +SET @NPC := @CGUID+6; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `wander_distance`=0,`MovementType`=2,`position_x`=-3001.6157,`position_y`=3520.3882,`position_z`=-2.1066082 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPC,@PATH,0,0,1,0,0, ''); +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,-3001.6157,3520.3882,-2.1066082,NULL,0,0,0,100,0), +(@PATH,2,-3001.3333,3532.6335,-1.8141277,NULL,0,0,0,100,0), +(@PATH,3,-2987.635,3538.0776,-4.0791826,NULL,0,0,0,100,0), +(@PATH,4,-2978.9177,3527.6497,-5.657403,NULL,0,0,0,100,0), +(@PATH,5,-2985.4775,3515.2988,-3.5458307,NULL,0,0,0,100,0), +(@PATH,6,-2978.9177,3527.6497,-5.657403,NULL,0,0,0,100,0), +(@PATH,7,-2987.635,3538.0776,-4.0791826,NULL,0,0,0,100,0), +(@PATH,8,-3001.3333,3532.6335,-1.8141277,NULL,0,0,0,100,0); +-- 0x2044A0424010610000003F00000AF10E .go xyz -3001.6157 3520.3882 -2.1066082 + +-- Pathing for Bonechewer Messenger Entry: 21244 +SET @PATH := 21244; +DELETE FROM `waypoints` WHERE `entry`=21244; +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`, `point_comment`) VALUES +(@PATH,1,-2963.8152,3384.4705,-4.32232,NULL,0, 'Bonechewer Messenger'), +(@PATH,2,-2950.451,3376.3174,-4.5470514,NULL,0, 'Bonechewer Messenger'), +(@PATH,3,-2937.0715,3369.056,-2.6787653,NULL,0, 'Bonechewer Messenger'), +(@PATH,4,-2920.6184,3365.0627,-6.0619173,NULL,0, 'Bonechewer Messenger'), +(@PATH,5,-2906.0073,3355.5474,-9.676908,NULL,0, 'Bonechewer Messenger'), +(@PATH,6,-2893.5813,3347.7058,-12.432917,NULL,8000, 'Bonechewer Messenger'), +(@PATH,7,-2853.67,3339.4631,-19.31733,NULL,0, 'Bonechewer Messenger'), +(@PATH,8,-2828.4744,3336.9526,-19.98904,NULL,0, 'Bonechewer Messenger'), +(@PATH,9,-2806.9248,3336.6526,-16.515285,NULL,0, 'Bonechewer Messenger'), +(@PATH,10,-2781.681,3334.472,-11.263605,NULL,0, 'Bonechewer Messenger'), +(@PATH,11,-2760.3318,3331.239,-3.674642,NULL,0, 'Bonechewer Messenger'), +(@PATH,12,-2738.6455,3311.7334,-0.4475913,NULL,0, 'Bonechewer Messenger'), +(@PATH,13,-2749.0579,3301.8867,0.1774087,NULL,0, 'Bonechewer Messenger'), +(@PATH,14,-2759.0356,3292.9302,1.1048448,NULL,0, 'Bonechewer Messenger'), +(@PATH,15,-2772.5703,3281.082,2.6573079,NULL,0, 'Bonechewer Messenger'), +(@PATH,16,-2791.8616,3259.4817,6.0626225,NULL,0, 'Bonechewer Messenger'), +(@PATH,17,-2810.34,3238.4185,9.016041,NULL,0, 'Bonechewer Messenger'), +(@PATH,18,-2819.3567,3227.828,10.90516,NULL,0, 'Bonechewer Messenger'), +(@PATH,19,-2839.8337,3204.2468,5.405695,NULL,0, 'Bonechewer Messenger'), +(@PATH,20,-2849.9036,3194.4292,7.7838273,NULL,0, 'Bonechewer Messenger'), +(@PATH,21,-2866.234,3176.2747,11.831678,NULL,0, 'Bonechewer Messenger'), +(@PATH,22,-2888.5881,3141.597,21.932083,NULL,0, 'Bonechewer Messenger'), +(@PATH,23,-2912.2192,3116.3413,30.006544,NULL,0, 'Bonechewer Messenger'), +(@PATH,24,-2916.9692,3098.7366,34.98528,NULL,0, 'Bonechewer Messenger'), +(@PATH,25,-2916.139,3081.2493,39.592457,NULL,0, 'Bonechewer Messenger'), +(@PATH,26,-2911.0117,3060.8848,44.216846,NULL,0, 'Bonechewer Messenger'), +(@PATH,27,-2909.7932,3039.7122,48.811085,NULL,0, 'Bonechewer Messenger'), +(@PATH,28,-2925.22,3022.37,54.951515,NULL,0, 'Bonechewer Messenger'), +(@PATH,29,-2944.5332,3008.12,62.06543,NULL,0, 'Bonechewer Messenger'), +(@PATH,30,-2971.1707,2991.1614,71.298584,NULL,0, 'Bonechewer Messenger'), +(@PATH,31,-2990.0012,2978.322,77.91162,NULL,0, 'Bonechewer Messenger'), +(@PATH,32,-3012.7334,2960.9658,84.21651,NULL,1500, 'Bonechewer Messenger'), +(@PATH,33,-3017.1653,2956.027,85.25105,NULL,0, 'Bonechewer Messenger'), +(@PATH,34,-3030.8447,2940.8096,86.53926,NULL,60000, 'Bonechewer Messenger'); +-- 0x2044A0424014BF0000004600000B2867 .go xyz -2963.8152 3384.4705 -4.32232 + +DELETE FROM `creature_text` WHERE `creatureID`=21244; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `Text`, `Type`, `Probability`, `BroadcastTextId`, `comment`) VALUES +(21244, 0, 'Be on your guard! The enemy is on the prowl.', 12, 100, 18845, 'Bloodchewer Messenger'), +(21244, 1, 'There they are!', 12, 100, 18846, 'Bloodchewer Messenger'); + +DELETE FROM `creature_summon_groups` WHERE `summonerId`=21244 AND `summonerType`=0; +INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES +(21244, 0, 0, 21249, -3051.46484375, 2917.865234375, 85.8242340087890625, 0.743266940116882324, 4, 5000), +(21244, 0, 0, 21249, -3020.530029296875, 2917.9873046875, 91.1318359375, 2.470896244049072265, 4, 5000), +(21244, 0, 0, 21249, -3045.5947265625, 2911.102783203125, 86.87236785888671875, 1.017653226852416992, 4, 5000), +(21244, 0, 0, 21249, -3051.833251953125, 2947.660888671875, 91.9532318115234375, 0.307999879121780395, 4, 5000); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 21244; +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21244); +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 +(21244, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 53, 0, 21244, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Respawn - Start Waypoint'), +(21244, 0, 1, 0, 40, 0, 100, 0, 6, 21244, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Waypoint 6 Reached - Set Run On'), +(21244, 0, 2, 3, 40, 0, 100, 0, 32, 21244, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Waypoint 32 Reached - Set Run Off'), +(21244, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Waypoint 32 Reached - Say Line 0'), +(21244, 0, 4, 5, 40, 0, 100, 0, 34, 21244, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Waypoint 34 Reached - Say Line 1'), +(21244, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 107, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Waypoint 34 Reached - Summon Creature Group 0'), +(21244, 0, 6, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 39, 40, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bonechewer Messenger - On Aggro - Call For Help'); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 21249; +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21249); +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 +(21249, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 11, 34427, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathstalker - On Just Summoned - Cast \'Ethereal Teleport\''), +(21249, 0, 1, 0, 0, 0, 100, 0, 5000, 6000, 9000, 11000, 0, 11, 33799, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Wrathstalker - In Combat - Cast \'Flame Wave\''); + +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 21245; +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-(@CGUID+65), -(@CGUID+64), -(@CGUID+63), -(@CGUID+62))); +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 +(-(@CGUID+65), 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 29, 5 , 180, 0, 0, 0, 0, 10, 126234, 21244, 0, 0, 0, 0, 0, 0, 'Bonechewer Marauder - On Respawn - Start Follow Closest Creature \'Bonechewer Messenger\''), +(-(@CGUID+64), 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 29, 10, 180, 0, 0, 0, 0, 10, 126234, 21244, 0, 0, 0, 0, 0, 0, 'Bonechewer Marauder - On Respawn - Start Follow Closest Creature \'Bonechewer Messenger\''), +(-(@CGUID+63), 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 29, 15, 180, 0, 0, 0, 0, 10, 126234, 21244, 0, 0, 0, 0, 0, 0, 'Bonechewer Marauder - On Respawn - Start Follow Closest Creature \'Bonechewer Messenger\''), +(-(@CGUID+62), 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 29, 20, 180, 0, 0, 0, 0, 10, 126234, 21244, 0, 0, 0, 0, 0, 0, 'Bonechewer Marauder - On Respawn - Start Follow Closest Creature \'Bonechewer Messenger\''); From a946e408cce80b354b6ae64f0c6f0eb284db4282 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sun, 25 Dec 2022 10:37:42 -0300 Subject: [PATCH 73/83] fix(DB/Creature): Port some Outland Elementals from Mangos (#14267) * Create rev_1671313957796149100.sql * Update rev_1671313957796149100.sql --- .../rev_1671313957796149100.sql | 199 ++++++++++++++++++ 1 file changed, 199 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671313957796149100.sql diff --git a/data/sql/updates/pending_db_world/rev_1671313957796149100.sql b/data/sql/updates/pending_db_world/rev_1671313957796149100.sql new file mode 100644 index 000000000..69075767a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671313957796149100.sql @@ -0,0 +1,199 @@ +SET @GUID := 25068; + +-- Raging Fire-Soul (Mangos) +DELETE FROM `creature` WHERE `id1` IN (18127,18867,19402,22309,22310,22311) AND `guid` BETWEEN @GUID+0 AND @GUID+18; +INSERT INTO `creature` (`guid`, `id1`, `map`, `zoneId`, `areaId`, `spawnMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`) VALUES +(@GUID+0 , 22311, 530, 3518, 3636, 1, 0, -850.57, 6517.23, 172.649, 2.17004, 300, 5, 0, 0, 0, 1), +(@GUID+1 , 22311, 530, 3518, 3636, 1, 0, -842.368, 6578.13, 172.678, 6.16071, 300, 5, 0, 0, 0, 1), +(@GUID+2 , 22311, 530, 3518, 3636, 1, 0, -814.464, 6552.92, 170.584, 0.686111, 300, 5, 0, 0, 0, 1), +(@GUID+3 , 22311, 530, 3518, 3636, 1, 0, -685.457, 6608.95, 176.559, 4.04063, 300, 5, 0, 0, 0, 1), +(@GUID+4 , 22311, 530, 3518, 3636, 1, 0, -652.905, 6576.91, 170.43, 4.24399, 300, 5, 0, 0, 0, 1), +(@GUID+5 , 22311, 530, 3518, 3636, 1, 0, -656.692, 6512.66, 171.639, 1.43797, 300, 5, 0, 0, 0, 1), +(@GUID+6 , 22309, 530, 3518, 3636, 1, 0, -489.655, 6924.7, 150.867, 1.71058, 300, 0, 0, 0, 0, 2), +(@GUID+7 , 22309, 530, 3518, 3636, 1, 0, -586.476, 6817.96, 141.736, 5.52784, 300, 5, 0, 0, 0, 1), +(@GUID+8 , 22310, 530, 3518, 3636, 1, 0, -751.888, 6384.63, 171.834, 3.6967, 300, 0, 0, 0, 0, 2), +(@GUID+9 , 22310, 530, 3518, 3636, 1, 0, -888.981, 6387.45, 199.163, 0.0382638, 300, 5, 0, 0, 0, 1), +(@GUID+10, 22310, 530, 3518, 3636, 1, 0, -686.529, 6346.02, 173.142, 5.77535, 300, 5, 0, 0, 0, 1), +(@GUID+11, 22310, 530, 3518, 3636, 1, 0, -677.945, 6486.36, 171.751, 3.31764, 300, 5, 0, 0, 0, 1), +(@GUID+12, 22310, 530, 3518, 3636, 1, 0, -819.057, 6413.15, 172.151, 4.21045, 300, 5, 0, 0, 0, 1), +(@GUID+13, 22310, 530, 3518, 3636, 1, 0, -722.969, 6390.33, 171.656, 1.67413, 300, 5, 0, 0, 0, 1), +(@GUID+14, 18127, 530, 3521, 3646, 1, 0, -139.09, 8044.04, 18.4877, 5.32998, 300, 0, 0, 0, 0, 2), +(@GUID+15, 19402, 530, 3521, 3648, 1, 0, 716.157, 5407.55, -27.7964, 5.54683, 300, 0, 0, 0, 0, 2), +(@GUID+16, 19402, 530, 3521, 3648, 1, 0, 564.356, 5411.31, -14.3203, 5.48638, 300, 0, 0, 0, 0, 2), +(@GUID+17, 19402, 530, 3521, 3648, 1, 0, 773.671, 5305.71, 0.419258, 0.588631, 300, 0, 0, 0, 0, 2), +(@GUID+18, 18867, 530, 3523, 3935, 1, 0, 2248.62, 2373.09, 108.931, 5.48165, 300, 0, 0, 0, 0, 2); + +DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+6, @GUID+8, @GUID+14, @GUID+15, @GUID+16, @GUID+17, @GUID+18); +INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES +(@GUID+6 , (@GUID+6 )*10), +(@GUID+8 , (@GUID+8 )*10), +(@GUID+14, (@GUID+14)*10), +(@GUID+15, (@GUID+15)*10), +(@GUID+16, (@GUID+16)*10), +(@GUID+17, (@GUID+17)*10), +(@GUID+18, (@GUID+18)*10); + +DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+6)*10, (@GUID+8)*10, (@GUID+14)*10, (@GUID+15)*10, (@GUID+16)*10, (@GUID+17)*10, (@GUID+18)*10); +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES +((@GUID+6 )*10, 1, -489.655, 6924.7, 150.867), +((@GUID+6 )*10, 2, -493.782, 6954.04, 144.896), +((@GUID+6 )*10, 3, -511.237, 6985.13, 154.013), +((@GUID+6 )*10, 4, -492.848, 6953.57, 144.83), +((@GUID+6 )*10, 5, -489.314, 6925.43, 150.441), +((@GUID+6 )*10, 6, -490.521, 6901.19, 147.195), +((@GUID+6 )*10, 7, -493.864, 6887.94, 153.431), +((@GUID+6 )*10, 8, -498.482, 6877.64, 153.86), +((@GUID+6 )*10, 9, -507.243, 6861.99, 154.836), +((@GUID+6 )*10, 10, -512.2, 6854.03, 155.059), +((@GUID+6 )*10, 11, -521.855, 6843.95, 154), +((@GUID+6 )*10, 12, -544.526, 6819.5, 151.627), +((@GUID+6 )*10, 13, -557.117, 6806.52, 151.287), +((@GUID+6 )*10, 14, -574.083, 6793.3, 148.913), +((@GUID+6 )*10, 15, -589.289, 6778.82, 146.01), +((@GUID+6 )*10, 16, -603.569, 6792.88, 144.62), +((@GUID+6 )*10, 17, -612.694, 6807.51, 146.297), +((@GUID+6 )*10, 18, -607.092, 6825.32, 152.185), +((@GUID+6 )*10, 19, -598.134, 6847.87, 151.429), +((@GUID+6 )*10, 20, -578.676, 6860.53, 147.242), +((@GUID+6 )*10, 21, -597.763, 6847.92, 151.263), +((@GUID+6 )*10, 22, -607.207, 6824.72, 152.25), +((@GUID+6 )*10, 23, -612.026, 6808.12, 146.265), +((@GUID+6 )*10, 24, -603.235, 6793.22, 144.6), +((@GUID+6 )*10, 25, -589.792, 6780.03, 146.405), +((@GUID+6 )*10, 26, -573.818, 6793.62, 148.698), +((@GUID+6 )*10, 27, -557.026, 6806.55, 151.207), +((@GUID+6 )*10, 28, -544.01, 6819.96, 151.023), +((@GUID+6 )*10, 29, -521.534, 6844.34, 153.971), +((@GUID+6 )*10, 30, -511.78, 6854.08, 154.805), +((@GUID+6 )*10, 31, -507.052, 6862.42, 155.014), +((@GUID+6 )*10, 32, -498.332, 6877.99, 154.273), +((@GUID+6 )*10, 33, -493.727, 6888.47, 153.276), +((@GUID+6 )*10, 34, -490.352, 6901.33, 147.328), +((@GUID+8 )*10, 1, -751.888, 6384.63, 171.834), +((@GUID+8 )*10, 2, -771.13, 6403.88, 171.552), +((@GUID+8 )*10, 3, -797.518, 6423.94, 171.792), +((@GUID+8 )*10, 4, -815.385, 6439.03, 173.824), +((@GUID+8 )*10, 5, -837.225, 6442.6, 174.104), +((@GUID+8 )*10, 6, -845.993, 6429.48, 175.23), +((@GUID+8 )*10, 7, -855.094, 6418.79, 177.975), +((@GUID+8 )*10, 8, -864.832, 6419.22, 180.895), +((@GUID+8 )*10, 9, -854.687, 6418.86, 177.824), +((@GUID+8 )*10, 10, -847.445, 6426.73, 175.228), +((@GUID+8 )*10, 11, -838.397, 6440.33, 174.254), +((@GUID+8 )*10, 12, -817.827, 6439.51, 173.717), +((@GUID+8 )*10, 13, -798.728, 6425.02, 171.859), +((@GUID+8 )*10, 14, -770.57, 6403.47, 171.553), +((@GUID+8 )*10, 15, -751.633, 6384.58, 171.824), +((@GUID+8 )*10, 16, -739.908, 6391.97, 171.552), +((@GUID+8 )*10, 17, -730.005, 6411.87, 171.552), +((@GUID+8 )*10, 18, -740.836, 6391.88, 171.552), +((@GUID+14)*10, 1, -144.8, 8043.49, 18.4396), +((@GUID+14)*10, 2, -134.185, 8019.89, 17.8878), +((@GUID+14)*10, 3, -117.734, 8007.63, 21.2322), +((@GUID+14)*10, 4, -123.556, 7973.87, 17.507), +((@GUID+14)*10, 5, -129.849, 7954.92, 17.9462), +((@GUID+14)*10, 6, -163.227, 7928.98, 18.0819), +((@GUID+14)*10, 7, -196.603, 7930.87, 18.1399), +((@GUID+14)*10, 8, -212.474, 7936.17, 18.953), +((@GUID+14)*10, 9, -218.211, 7955.71, 18.2579), +((@GUID+14)*10, 10, -219.291, 7990.01, 18.2447), +((@GUID+14)*10, 11, -218.332, 8004.6, 18.1361), +((@GUID+14)*10, 12, -232.794, 8024.8, 18.4267), +((@GUID+14)*10, 13, -236.894, 8044.53, 17.8929), +((@GUID+14)*10, 14, -235.998, 8107.95, 20.2095), +((@GUID+14)*10, 15, -220.981, 8132.33, 20.1735), +((@GUID+14)*10, 16, -187.284, 8158.97, 18.5926), +((@GUID+14)*10, 17, -163.887, 8158.91, 19.8074), +((@GUID+14)*10, 18, -149.345, 8131.77, 17.7811), +((@GUID+14)*10, 19, -156.097, 8086.68, 18.1703), +((@GUID+15)*10, 1, 716.157, 5407.55, -27.7964), +((@GUID+15)*10, 2, 722.599, 5385.87, -26.8107), +((@GUID+15)*10, 3, 722.524, 5368.68, -17.4538), +((@GUID+15)*10, 4, 720.968, 5349.49, -14.9477), +((@GUID+15)*10, 5, 715.003, 5334.92, -14.1241), +((@GUID+15)*10, 6, 700.754, 5327.11, -18.3744), +((@GUID+15)*10, 7, 683.456, 5335.59, -24.7188), +((@GUID+15)*10, 8, 673.124, 5351.15, -23.5727), +((@GUID+15)*10, 9, 657.053, 5370.73, -27.4679), +((@GUID+15)*10, 10, 634.233, 5392.31, -24.3929), +((@GUID+15)*10, 11, 623.152, 5409.89, -25.9683), +((@GUID+15)*10, 12, 613.196, 5424.89, -15.5283), +((@GUID+15)*10, 13, 633.915, 5428.52, -26.0719), +((@GUID+15)*10, 14, 645.193, 5441.31, -27.7671), +((@GUID+15)*10, 15, 660.208, 5449.39, -27.0929), +((@GUID+15)*10, 16, 674.395, 5454.87, -24.068), +((@GUID+15)*10, 17, 690.667, 5456.42, -20.3482), +((@GUID+15)*10, 18, 702.942, 5445.61, -18.5922), +((@GUID+15)*10, 19, 708.923, 5430.94, -21.2968), +((@GUID+16)*10, 1, 564.356, 5411.31, -14.3203), +((@GUID+16)*10, 2, 578.344, 5394.62, -20.8237), +((@GUID+16)*10, 3, 593.677, 5377.03, -25.4847), +((@GUID+16)*10, 4, 605.491, 5368.73, -26.5426), +((@GUID+16)*10, 5, 610.906, 5362.28, -28.6351), +((@GUID+16)*10, 6, 620.704, 5345.38, -29.1296), +((@GUID+16)*10, 7, 620.85, 5337.38, -25.8914), +((@GUID+16)*10, 8, 612.461, 5318.19, -27.3405), +((@GUID+16)*10, 9, 607.57, 5302.13, -23.8775), +((@GUID+16)*10, 10, 603.782, 5289.38, -26.7493), +((@GUID+16)*10, 11, 598.952, 5275.79, -26.305), +((@GUID+16)*10, 12, 582.714, 5271.05, -21.6578), +((@GUID+16)*10, 13, 563.736, 5257.9, -12.094), +((@GUID+16)*10, 14, 544.553, 5256.8, -7.54641), +((@GUID+16)*10, 15, 500.175, 5264.24, -3.47387), +((@GUID+16)*10, 16, 486.313, 5271.81, -2.31871), +((@GUID+16)*10, 17, 468.17, 5293.3, -2.4616), +((@GUID+16)*10, 18, 450.817, 5323.81, -2.41206), +((@GUID+16)*10, 19, 449.001, 5352.38, -0.759596), +((@GUID+16)*10, 20, 459.884, 5378.74, -1.50683), +((@GUID+16)*10, 21, 481.15, 5413.95, 0.42544), +((@GUID+16)*10, 22, 508.612, 5427.18, 0.325553), +((@GUID+16)*10, 23, 542.729, 5426.32, -6.46087), +((@GUID+17)*10, 1, 773.671, 5305.71, 0.419258), +((@GUID+17)*10, 2, 798.577, 5331.37, -0.347906), +((@GUID+17)*10, 3, 769.707, 5306.49, 0.083619), +((@GUID+17)*10, 4, 743.871, 5274.26, -0.228519), +((@GUID+17)*10, 5, 703.504, 5235.35, -0.15128), +((@GUID+17)*10, 6, 670.081, 5222.65, -1.50157), +((@GUID+17)*10, 7, 621.547, 5200.94, 2.5218), +((@GUID+17)*10, 8, 573.849, 5209.05, 2.65771), +((@GUID+17)*10, 9, 533.091, 5227.64, -1.24775), +((@GUID+17)*10, 10, 507.862, 5242.45, -0.90349), +((@GUID+17)*10, 11, 480.746, 5257.54, -0.389703), +((@GUID+17)*10, 12, 454.719, 5272.15, -0.644843), +((@GUID+17)*10, 13, 434.382, 5273, 3.70597), +((@GUID+17)*10, 14, 469.543, 5266.28, -1.98395), +((@GUID+17)*10, 15, 497.64, 5239.2, -1.17976), +((@GUID+17)*10, 16, 530.445, 5213.16, 0.645138), +((@GUID+17)*10, 17, 573.045, 5202.39, 3.55134), +((@GUID+17)*10, 18, 601.401, 5200.17, 3.88589), +((@GUID+17)*10, 19, 636.991, 5199.59, 3.54028), +((@GUID+17)*10, 20, 659.387, 5210.21, 0.274968), +((@GUID+17)*10, 21, 692.838, 5231.19, 0.304287), +((@GUID+17)*10, 22, 726.16, 5250, -0.691866), +((@GUID+17)*10, 23, 750.625, 5281.66, 0.144448), +((@GUID+18)*10, 1, 2248.62, 2373.09, 108.931), +((@GUID+18)*10, 2, 2256.21, 2362.26, 108.641), +((@GUID+18)*10, 3, 2270.17, 2360.91, 111.768), +((@GUID+18)*10, 4, 2282.09, 2344.62, 111.233), +((@GUID+18)*10, 5, 2278.73, 2329.91, 106.327), +((@GUID+18)*10, 6, 2263.77, 2317.36, 96.8579), +((@GUID+18)*10, 7, 2257.35, 2323, 95.8668), +((@GUID+18)*10, 8, 2250.43, 2306.36, 89.919), +((@GUID+18)*10, 9, 2228.19, 2297.27, 82.8528), +((@GUID+18)*10, 10, 2215.14, 2304.82, 84.3076), +((@GUID+18)*10, 11, 2207.11, 2306.06, 83.6429), +((@GUID+18)*10, 12, 2199.91, 2304.44, 82.3124), +((@GUID+18)*10, 13, 2188.96, 2318.99, 84.0324), +((@GUID+18)*10, 14, 2182.69, 2333.87, 85.9798), +((@GUID+18)*10, 15, 2182.85, 2353.83, 91.1461), +((@GUID+18)*10, 16, 2194.85, 2363.88, 94.4529), +((@GUID+18)*10, 17, 2199.32, 2369.37, 97.0657), +((@GUID+18)*10, 18, 2184.76, 2379.81, 97.831), +((@GUID+18)*10, 19, 2182.36, 2386.58, 98.563), +((@GUID+18)*10, 20, 2185.14, 2390.9, 100.262), +((@GUID+18)*10, 21, 2184.98, 2394.24, 101.088), +((@GUID+18)*10, 22, 2193.99, 2398.88, 104.066), +((@GUID+18)*10, 23, 2216.7, 2405.41, 110.54), +((@GUID+18)*10, 24, 2221.96, 2407.96, 110.561), +((@GUID+18)*10, 25, 2227.24, 2390.09, 108.562), +((@GUID+18)*10, 26, 2235.95, 2379.68, 108.361); From 3b5ceb43636abba590b13b43dae24f0d9b730cdd Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Sun, 25 Dec 2022 13:39:42 +0000 Subject: [PATCH 74/83] chore(DB): import pending files Referenced commit(s): a946e408cce80b354b6ae64f0c6f0eb284db4282 --- .../rev_1671313957796149100.sql => db_world/2022_12_25_03.sql} | 1 + .../rev_1671361010497519200.sql => db_world/2022_12_25_04.sql} | 1 + .../rev_1671668610731654600.sql => db_world/2022_12_25_05.sql} | 1 + .../rev_1671717341416145500.sql => db_world/2022_12_25_06.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1671313957796149100.sql => db_world/2022_12_25_03.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1671361010497519200.sql => db_world/2022_12_25_04.sql} (94%) rename data/sql/updates/{pending_db_world/rev_1671668610731654600.sql => db_world/2022_12_25_05.sql} (80%) rename data/sql/updates/{pending_db_world/rev_1671717341416145500.sql => db_world/2022_12_25_06.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1671313957796149100.sql b/data/sql/updates/db_world/2022_12_25_03.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1671313957796149100.sql rename to data/sql/updates/db_world/2022_12_25_03.sql index 69075767a..f4c0a98f7 100644 --- a/data/sql/updates/pending_db_world/rev_1671313957796149100.sql +++ b/data/sql/updates/db_world/2022_12_25_03.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_02 -> 2022_12_25_03 SET @GUID := 25068; -- Raging Fire-Soul (Mangos) diff --git a/data/sql/updates/pending_db_world/rev_1671361010497519200.sql b/data/sql/updates/db_world/2022_12_25_04.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1671361010497519200.sql rename to data/sql/updates/db_world/2022_12_25_04.sql index c71d90569..9c4f302a2 100644 --- a/data/sql/updates/pending_db_world/rev_1671361010497519200.sql +++ b/data/sql/updates/db_world/2022_12_25_04.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_03 -> 2022_12_25_04 -- DELETE FROM `event_scripts` WHERE `id` IN (10301,10302,16395,16396,16397,16398,16399,16400,16401,16402,16522,19030,19031,19032,19033,19123,19124); INSERT INTO `event_scripts` VALUES diff --git a/data/sql/updates/pending_db_world/rev_1671668610731654600.sql b/data/sql/updates/db_world/2022_12_25_05.sql similarity index 80% rename from data/sql/updates/pending_db_world/rev_1671668610731654600.sql rename to data/sql/updates/db_world/2022_12_25_05.sql index 3e8097e87..c20addfe0 100644 --- a/data/sql/updates/pending_db_world/rev_1671668610731654600.sql +++ b/data/sql/updates/db_world/2022_12_25_05.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_04 -> 2022_12_25_05 -- UPDATE `creature_loot_template` SET `Chance`=5 WHERE `Entry` IN (17881, 20912) AND `Item`=23572; UPDATE `creature_loot_template` SET `Chance`=2.5 WHERE `Entry`=18473 AND `Item`=23572; diff --git a/data/sql/updates/pending_db_world/rev_1671717341416145500.sql b/data/sql/updates/db_world/2022_12_25_06.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1671717341416145500.sql rename to data/sql/updates/db_world/2022_12_25_06.sql index 4ff60031a..d73a0a2fd 100644 --- a/data/sql/updates/pending_db_world/rev_1671717341416145500.sql +++ b/data/sql/updates/db_world/2022_12_25_06.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_05 -> 2022_12_25_06 -- DELETE FROM `creature` WHERE `id1` IN (16772, 16810, 18583, 18595, 21244, 21245) AND `map`=530; DELETE FROM `creature_addon` WHERE (`guid` IN (57784)); From 85711bcdac06a7e1b101b963fdf6182b5b92946c Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Mon, 26 Dec 2022 06:09:50 -0300 Subject: [PATCH 75/83] fix(Scripts/Zangarmarsh): Naturalist Bite shouldn't desummon after casting Mark of Bite (#14354) Update zone_zangarmarsh.cpp --- src/server/scripts/Outland/zone_zangarmarsh.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 1a28c1e34..d6f918620 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -65,7 +65,6 @@ public: { creature->CastSpell(player, SPELL_MARK_OF_BITE, true); player->KilledMonsterCredit(creature->GetEntry()); - creature->DespawnOrUnsummon(1000); } else { From c75f7da9433f50b7fe5bad8b794d2697ba26eab8 Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Mon, 26 Dec 2022 06:10:40 -0300 Subject: [PATCH 76/83] fix(DB/Loot): Blackwind Sabercat (#14328) --- .../pending_db_world/rev_1671666534424139900.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1671666534424139900.sql diff --git a/data/sql/updates/pending_db_world/rev_1671666534424139900.sql b/data/sql/updates/pending_db_world/rev_1671666534424139900.sql new file mode 100644 index 000000000..ed76f8159 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1671666534424139900.sql @@ -0,0 +1,10 @@ +-- +DELETE FROM `reference_loot_template` WHERE `Entry`=21887 AND `Item`=21887 AND `Comment`='Knothide Leather'; +INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Comment`) VALUES (21887, 21887, 'Knothide Leather'); + +UPDATE `creature_template` SET `skinloot` = 21723 WHERE (`entry` = 21723); +DELETE FROM `skinning_loot_template` WHERE (`Entry` = 21723); +INSERT INTO `skinning_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(21723, 21887, 0, 100, 0, 1, 0, 1, 1, 'Blackwind Sabercat - Knothide Leather'), +(21723, 35229, 0, 25, 1, 1, 0, 1, 1, 'Blackwind Sabercat - Nether Residue'), +(21723, 1, 21887, 10, 0, 1, 0, 1, 1, 'Blackwind Sabercat - Knothide Leather (Reference Table)'); From d7aa4f86bae2a6f07029992a53e785a389e9dee7 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Mon, 26 Dec 2022 09:12:43 +0000 Subject: [PATCH 77/83] chore(DB): import pending files Referenced commit(s): c75f7da9433f50b7fe5bad8b794d2697ba26eab8 --- .../rev_1671666534424139900.sql => db_world/2022_12_26_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1671666534424139900.sql => db_world/2022_12_26_00.sql} (94%) diff --git a/data/sql/updates/pending_db_world/rev_1671666534424139900.sql b/data/sql/updates/db_world/2022_12_26_00.sql similarity index 94% rename from data/sql/updates/pending_db_world/rev_1671666534424139900.sql rename to data/sql/updates/db_world/2022_12_26_00.sql index ed76f8159..56efb6e5f 100644 --- a/data/sql/updates/pending_db_world/rev_1671666534424139900.sql +++ b/data/sql/updates/db_world/2022_12_26_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_25_06 -> 2022_12_26_00 -- DELETE FROM `reference_loot_template` WHERE `Entry`=21887 AND `Item`=21887 AND `Comment`='Knothide Leather'; INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Comment`) VALUES (21887, 21887, 'Knothide Leather'); From a3a835edc4c19fd506bda12d3995670410fde28f Mon Sep 17 00:00:00 2001 From: Patrick Lewis Date: Mon, 26 Dec 2022 02:06:28 -0800 Subject: [PATCH 78/83] fix(CI/mac): python issue workaround (#14369) --- apps/installer/includes/os_configs/osx.sh | 24 ++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index bf09d9784..d94e62f14 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -1,3 +1,22 @@ +########################################## +## workaround for python upgrade issue https://github.com/actions/runner-images/issues/6817 +rm /usr/local/bin/2to3 || true +rm /usr/local/bin/2to3-3.10 || true +rm /usr/local/bin/2to3-3.11 || true +rm /usr/local/bin/idle3 || true +rm /usr/local/bin/idle3.10 || true +rm /usr/local/bin/idle3.11 || true +rm /usr/local/bin/pydoc3 || true +rm /usr/local/bin/pydoc3.10 || true +rm /usr/local/bin/pydoc3.11 || true +rm /usr/local/bin/python3 || true +rm /usr/local/bin/python3.10 || true +rm /usr/local/bin/python3.11 || true +rm /usr/local/bin/python3-config || true +rm /usr/local/bin/python3.10-config || true +rm /usr/local/bin/python3.11-config || true +########################################## + brew update ########################################## @@ -8,8 +27,3 @@ fi ########################################## brew install openssl@1.1 readline boost bash-completion curl unzip mysql ccache - -########################################## -## workaround to fix openssl in ci until https://github.com/actions/virtual-environments/pull/4206 is merged -ln -sf $(brew --cellar openssl@1.1)/1.1.1* /usr/local/opt/openssl -########################################## From ba796bee4363b045d9b62914e0d68cc0fad152d7 Mon Sep 17 00:00:00 2001 From: Charlton Lau Date: Tue, 27 Dec 2022 19:27:48 +0900 Subject: [PATCH 79/83] =?UTF-8?q?fix(Scripts/GO):=20Druid=E2=80=98s=20fly?= =?UTF-8?q?=20quest=20(#14085)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/scripts/World/go_scripts.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index f4261f2da..0371072b1 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1073,7 +1073,11 @@ public: //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false); if (Creature* creature = player->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0)) - creature->CastSpell(player, SPELL_BLACKJACK, false); + { + // no need casting spell blackjack, it's casted by script npc_rizzle_sprysprocket. + //creature->CastSpell(player, SPELL_BLACKJACK, false); + creature->AI()->AttackStart(player); + } return false; } From fd55bcca6a0b5504ef92d0ecc52c0953323c0c94 Mon Sep 17 00:00:00 2001 From: Grimgravy Date: Tue, 27 Dec 2022 07:28:22 -0300 Subject: [PATCH 80/83] fix(DB/Scripts): Npc Tonk Control Console (#13342) --- .../rev_1665237212810221500.sql | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1665237212810221500.sql diff --git a/data/sql/updates/pending_db_world/rev_1665237212810221500.sql b/data/sql/updates/pending_db_world/rev_1665237212810221500.sql new file mode 100644 index 000000000..d036b6482 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1665237212810221500.sql @@ -0,0 +1,40 @@ +-- +UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 180524; + +DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` = 180524); +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 +(180524, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 0, 11, 45257, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Tonk Control Console - On Gameobject State Changed - Cast \'Using Steam Tonk Controller\''); + +-- Darkmoon Faire (Terokkar Forest) +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43029; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43030; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43031; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43032; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43033; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43034; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43035; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43036; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43037; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43038; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43039; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43040; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43041; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43042; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43043; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=43044; + + -- Darkmoon Faire (Elwynn Forest) +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28620; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28621; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28622; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28623; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28624; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28625; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28626; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28627; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28628; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28629; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28630; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=28631; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=12680; +UPDATE `gameobject` SET `state`=1 WHERE `guid`=12737; From 68ad89e75e37edb86431a8dc9774d54885a159da Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 27 Dec 2022 10:30:43 +0000 Subject: [PATCH 81/83] chore(DB): import pending files Referenced commit(s): fd55bcca6a0b5504ef92d0ecc52c0953323c0c94 --- .../rev_1665237212810221500.sql => db_world/2022_12_27_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1665237212810221500.sql => db_world/2022_12_27_00.sql} (98%) diff --git a/data/sql/updates/pending_db_world/rev_1665237212810221500.sql b/data/sql/updates/db_world/2022_12_27_00.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1665237212810221500.sql rename to data/sql/updates/db_world/2022_12_27_00.sql index d036b6482..531e615e4 100644 --- a/data/sql/updates/pending_db_world/rev_1665237212810221500.sql +++ b/data/sql/updates/db_world/2022_12_27_00.sql @@ -1,3 +1,4 @@ +-- DB update 2022_12_26_00 -> 2022_12_27_00 -- UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 180524; From 233d284539a4711691169a5ae66a4575fe9814ec Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Tue, 27 Dec 2022 11:31:08 +0100 Subject: [PATCH 82/83] fix(Core/Formations): Implemented new creature formation flag: GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE. (#13509) Fixes #13394 --- .../rev_1668255481743871500.sql | 2 + .../game/Entities/Creature/CreatureGroups.cpp | 62 +++++++++++++++---- .../game/Entities/Creature/CreatureGroups.h | 28 +++++---- src/server/game/Entities/Unit/Unit.cpp | 10 +++ 4 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1668255481743871500.sql diff --git a/data/sql/updates/pending_db_world/rev_1668255481743871500.sql b/data/sql/updates/pending_db_world/rev_1668255481743871500.sql new file mode 100644 index 000000000..a8ccc8f23 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1668255481743871500.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_formations` SET `groupAI`=`groupAI`|0x020 WHERE `leaderGUID` IN (84634,84648); diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 871101b2b..7eca4ad92 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -200,30 +200,70 @@ void CreatureGroup::MemberEngagingTarget(Creature* member, Unit* target) return; } } - else if (!(groupAI & std::underlying_type_t(GroupAIFlags::GROUP_AI_FLAG_LEADER_ASSIST_MEMBER))) + + for (auto const& itr : m_members) { - return; + Creature* pMember = itr.first; + if (!pMember) + { + continue; + } + + if (pMember == member || !pMember->IsAlive() || pMember->GetVictim()) + { + continue; + } + + if (pMember == m_leader && !(groupAI & std::underlying_type_t(GroupAIFlags::GROUP_AI_FLAG_LEADER_ASSIST_MEMBER))) + { + continue; + } + + if (pMember->IsValidAttackTarget(target) && pMember->AI()) + { + pMember->AI()->AttackStart(target); + } + } +} + +Unit* CreatureGroup::GetNewTargetForMember(Creature* member) +{ + uint8 const groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()].groupAI; + if (!(groupAI & std::underlying_type_t(GroupAIFlags::GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE))) + { + return nullptr; + } + + if (member == m_leader && !(groupAI & std::underlying_type_t(GroupAIFlags::GROUP_AI_FLAG_LEADER_ASSIST_MEMBER))) + { + return nullptr; } for (auto const& itr : m_members) { Creature* pMember = itr.first; - if (m_leader) // avoid crash if leader was killed and reset. - LOG_DEBUG("entities.unit", "GROUP ATTACK: group instance id {} calls member instid {}", m_leader->GetInstanceId(), member->GetInstanceId()); - - //Skip one check - if (pMember == member) + if (!pMember) + { continue; + } - if (!pMember->IsAlive()) + if (pMember == member || !pMember->IsAlive() || !pMember->GetVictim()) + { continue; + } - if (pMember->GetVictim()) + if (pMember == m_leader && !(groupAI & std::underlying_type_t(GroupAIFlags::GROUP_AI_FLAG_MEMBER_ASSIST_LEADER))) + { continue; + } - if (pMember->IsValidAttackTarget(target) && pMember->AI()) - pMember->AI()->AttackStart(target); + if (member->IsValidAttackTarget(pMember->GetVictim())) + { + return pMember->GetVictim(); + } } + + return nullptr; } void CreatureGroup::MemberEvaded(Creature* member) diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index c3a9fc13a..b424b3503 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -28,22 +28,23 @@ class CreatureGroup; enum class GroupAIFlags : uint16 { - GROUP_AI_FLAG_MEMBER_ASSIST_LEADER = 0x001, - GROUP_AI_FLAG_LEADER_ASSIST_MEMBER = 0x002, - GROUP_AI_FLAG_EVADE_TOGETHER = 0x004, - GROUP_AI_FLAG_RESPAWN_ON_EVADE = 0x008, - GROUP_AI_FLAG_DONT_RESPAWN_LEADER_ON_EVADE = 0x010, - //GROUP_AI_FLAG_UNK3 = 0x010, - //GROUP_AI_FLAG_UNK4 = 0x020, - //GROUP_AI_FLAG_UNK5 = 0x040, - //GROUP_AI_FLAG_UNK6 = 0x080, - //GROUP_AI_FLAG_UNK7 = 0x100, - GROUP_AI_FLAG_FOLLOW_LEADER = 0x200, + GROUP_AI_FLAG_MEMBER_ASSIST_LEADER = 0x001, + GROUP_AI_FLAG_LEADER_ASSIST_MEMBER = 0x002, + GROUP_AI_FLAG_EVADE_TOGETHER = 0x004, + GROUP_AI_FLAG_RESPAWN_ON_EVADE = 0x008, + GROUP_AI_FLAG_DONT_RESPAWN_LEADER_ON_EVADE = 0x010, + GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE = 0x020, + //GROUP_AI_FLAG_UNK5 = 0x040, + //GROUP_AI_FLAG_UNK6 = 0x080, + //GROUP_AI_FLAG_UNK7 = 0x100, + GROUP_AI_FLAG_FOLLOW_LEADER = 0x200, - GROUP_AI_FLAG_EVADE_MASK = GROUP_AI_FLAG_EVADE_TOGETHER | GROUP_AI_FLAG_RESPAWN_ON_EVADE, + GROUP_AI_FLAG_ASSIST_MASK = GROUP_AI_FLAG_MEMBER_ASSIST_LEADER | GROUP_AI_FLAG_LEADER_ASSIST_MEMBER, + GROUP_AI_FLAG_EVADE_MASK = GROUP_AI_FLAG_EVADE_TOGETHER | GROUP_AI_FLAG_RESPAWN_ON_EVADE, // Used to verify valid and usable flags - GROUP_AI_FLAG_SUPPORTED = GROUP_AI_FLAG_MEMBER_ASSIST_LEADER | GROUP_AI_FLAG_LEADER_ASSIST_MEMBER | GROUP_AI_FLAG_EVADE_MASK | GROUP_AI_FLAG_FOLLOW_LEADER + GROUP_AI_FLAG_SUPPORTED = GROUP_AI_FLAG_ASSIST_MASK | GROUP_AI_FLAG_EVADE_MASK | GROUP_AI_FLAG_DONT_RESPAWN_LEADER_ON_EVADE | + GROUP_AI_FLAG_FOLLOW_LEADER | GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE }; struct FormationInfo @@ -108,6 +109,7 @@ public: void LeaderMoveTo(float x, float y, float z, bool run); void MemberEngagingTarget(Creature* member, Unit* target); + Unit* GetNewTargetForMember(Creature* member); void MemberEvaded(Creature* member); void RespawnFormation(bool force = false); [[nodiscard]] bool IsFormationInCombat(); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7227ec04d..28d8b1485 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14676,6 +14676,16 @@ Unit* Creature::SelectVictim() return nullptr; } + // Last chance: creature group + if (CreatureGroup* group = GetFormation()) + { + if (Unit* groupTarget = group->GetNewTargetForMember(this)) + { + SetInFront(groupTarget); + return groupTarget; + } + } + // enter in evade mode in other case AI()->EnterEvadeMode(); From 02140e18a59719f59fb18f6e97925ba82ae22629 Mon Sep 17 00:00:00 2001 From: AzerothCoreBot Date: Tue, 27 Dec 2022 10:33:11 +0000 Subject: [PATCH 83/83] chore(DB): import pending files Referenced commit(s): 233d284539a4711691169a5ae66a4575fe9814ec --- .../rev_1668255481743871500.sql => db_world/2022_12_27_01.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1668255481743871500.sql => db_world/2022_12_27_01.sql} (69%) diff --git a/data/sql/updates/pending_db_world/rev_1668255481743871500.sql b/data/sql/updates/db_world/2022_12_27_01.sql similarity index 69% rename from data/sql/updates/pending_db_world/rev_1668255481743871500.sql rename to data/sql/updates/db_world/2022_12_27_01.sql index a8ccc8f23..df71ecae4 100644 --- a/data/sql/updates/pending_db_world/rev_1668255481743871500.sql +++ b/data/sql/updates/db_world/2022_12_27_01.sql @@ -1,2 +1,3 @@ +-- DB update 2022_12_27_00 -> 2022_12_27_01 -- UPDATE `creature_formations` SET `groupAI`=`groupAI`|0x020 WHERE `leaderGUID` IN (84634,84648);