From d07a0769971c8b5d5d695ed31b973bafc2b9688d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:10:13 +0200 Subject: [PATCH 1/8] DB/Gossip: Ambassador Dawnsinger's gossip text closes #29888 by Jonne733 --- sql/updates/world/3.3.5/2024_04_04_00_world.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_00_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_00_world.sql b/sql/updates/world/3.3.5/2024_04_04_00_world.sql new file mode 100644 index 0000000000..601a5b656a --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_00_world.sql @@ -0,0 +1,10 @@ +-- Ambassador Dawnsinger's gossip text should be different if player is blood elf. +-- Gossip Menu +DELETE FROM `gossip_menu` WHERE `MenuID`=7359 AND `TextID`=8791; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(7359,8791,0); + +-- Condition +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7359; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,7359,8791,0,0,16,0,512,0,0,0,0,0,"","Show gossip text 8791 if player is a blood elf"); From 84555b2ff5eb1db892d24cf68f8400c8612902b8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:12:19 +0200 Subject: [PATCH 2/8] DB/Quest: "Rogues of the Shattered Hand" should be breadcrumb closes #29889 by Jonne733 --- sql/updates/world/3.3.5/2024_04_04_01_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_01_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_01_world.sql b/sql/updates/world/3.3.5/2024_04_04_01_world.sql new file mode 100644 index 0000000000..263263e455 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_01_world.sql @@ -0,0 +1,2 @@ +-- Breadcrumb quest Fix +UPDATE `quest_template_addon` SET `BreadcrumbForQuestId`=2460 WHERE `ID`=10794; From bcf5147a44f637568305954fe92cb9c5a84144b0 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:13:37 +0200 Subject: [PATCH 3/8] DB/QUEST: Durotar, corrected quest text closes #29890 by Jonne733 --- .../world/3.3.5/2024_04_04_02_world.sql | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_02_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_02_world.sql b/sql/updates/world/3.3.5/2024_04_04_02_world.sql new file mode 100644 index 0000000000..336e012958 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_02_world.sql @@ -0,0 +1,29 @@ +-- Sting of the Scorpid (Wrong use of "$c") +UPDATE `quest_request_items` SET `CompletionText`="The carapace of a scorpid isn't so thick that the strength of a determined warrior will be deterred. Strike strongly and without doubt, and the scorpids should prove easy prey." WHERE `ID`=789; + +-- A Peon's Burden (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Ah, this is the food Ukor brought to the Valley of Trials. Did they not need it? Well, I guess they like to starve you heroes in training. Builds spirit, they say!$b$bThank you for returning the food. I'll stick it back on the shelves... but here, let me offer you some refreshment first!$b$bAnd don't forget to rest here in the inn. You may be a brave $c ready to take on the world, but if your energy is sapped you won't be doing yourself, or the Horde, much good." WHERE `ID`=2161; + +-- Vanquish the Betrayers (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Word of your bravery travels fast, $c. Tales of your victory at Tiragarde Keep will be heralded in Orgrimmar." WHERE `ID`=784; + +-- The Admiral's Orders (Upper case "$c") +UPDATE `quest_request_items` SET `CompletionText`="There is a look of concern on your face, $c. What have you there?" WHERE `ID`=830; + +-- Carry Your Weight (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Most excellent, $N. Any good $c will surely find a use for this bag on the battlefield.$b$bI salute your vigor and willingness to die in the name of the Horde!" WHERE `ID`=791; + +-- From The Wreckage.... (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Your recovery mission was a success, $c. I will see to it that these tools get to Orgrimmar with the next caravan.$b$bNicely done." WHERE `ID`=825; + +-- Margoz (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Welcome, $N. Word reached me of your coming, and of your exploits in Durotar.$b$bYou are a $c of growing skill and renown.$b$bStay on the pure path, and your future will be great indeed." WHERE `ID`=828; + +-- Hidden Enemies (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="What is it?! Oh, you, $c... my apologies. My anger rivals that of a rabid kodo bull... but perhaps it is my own fault. In sending travelers into Ragefire Chasm, I should have seen the possibility that some harm would come from it. It seems both Bazzalan and Jergosh were taken unaware and slain by some of Thrall's do-gooders. A most inopportune time, but there is nothing that can be done about it now." WHERE `ID`=5729; + +-- Neeru Fireblade (Upper case "$c" and upper case "$r") +UPDATE `quest_request_items` SET `CompletionText`="My most humble greetings, $c. How might I help my $r $gbrother:sister; today?" WHERE `ID`=829; + +-- The Admiral's Orders (Upper case "$c") +UPDATE `quest_offer_reward` SET `RewardText`="Countless times I urged the Warchief not to trust the humans, but personal pride is not what is at stake here.$b$bYou have served the Horde honorably, young $c.$b$bNow excuse me, I must counsel Thrall on these matters at once...." WHERE `ID`=831; From 896460e05971ee52a535f3f9ac53f719c5dc0ea1 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:16:56 +0200 Subject: [PATCH 4/8] DB/Quest: "The Shattered Salute" missing Completion Text closes #29892 by Jonne733 --- sql/updates/world/3.3.5/2024_04_04_03_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_03_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_03_world.sql b/sql/updates/world/3.3.5/2024_04_04_03_world.sql new file mode 100644 index 0000000000..1c5312c0e4 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_03_world.sql @@ -0,0 +1,2 @@ +-- Missing request text +UPDATE `quest_request_items` SET `CompletionText`="Practice!" WHERE `ID`=2460; From 942a99d6dd8c65ef50d12907c49612361c91b55e Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:18:53 +0200 Subject: [PATCH 5/8] DB/Gossip: Gest's gossip text closes #29893 by Jonne733 --- sql/updates/world/3.3.5/2024_04_04_04_world.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_04_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_04_world.sql b/sql/updates/world/3.3.5/2024_04_04_04_world.sql new file mode 100644 index 0000000000..bcea48003c --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_04_world.sql @@ -0,0 +1,6 @@ +-- Gest, correct gossip text when "Elegant Letter" is available +-- Gossip Menu +DELETE FROM `gossip_menu` WHERE `MenuID`=4513 AND `TextID` IN (5993,5996); +INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES (4513,5993); +-- Condition +UPDATE `conditions` SET `SourceEntry`=5993 WHERE `SourceGroup`=4513 AND `SourceEntry`=5996; From fdaad6604c9be60c3950a4ec476f980b700a1dc2 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 4 Apr 2024 19:21:47 +0200 Subject: [PATCH 6/8] DB/Quest: The quest "Lazy Peons" is missing reward next quest closes #29894 by Jonne733 --- sql/updates/world/3.3.5/2024_04_04_05_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_05_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_05_world.sql b/sql/updates/world/3.3.5/2024_04_04_05_world.sql new file mode 100644 index 0000000000..88c4bb97c3 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_05_world.sql @@ -0,0 +1,2 @@ +-- Quest is missing reward next quest +UPDATE `quest_template` SET `RewardNextQuest`=6394 WHERE `Id`=5441; From 2a7efcc818af9dae89cd9e4e541c621958c2b9c4 Mon Sep 17 00:00:00 2001 From: CraftedRO <24683355+CraftedRO@users.noreply.github.com> Date: Thu, 4 Apr 2024 22:48:05 +0300 Subject: [PATCH 7/8] Core/Spells: Allow Spells with SPELL_EFFECT_KNOCK_BACK to knockback stunned targets (#29883) Closes #18180 --- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f5edb7324e..b4cf72a7ac 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4305,8 +4305,8 @@ void Spell::EffectKnockBack() if (creatureTarget->isWorldBoss() || creatureTarget->IsDungeonBoss()) return; - // Spells with SPELL_EFFECT_KNOCK_BACK (like Thunderstorm) can't knockback target if target has ROOT/STUN - if (unitTarget->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED)) + // Spells with SPELL_EFFECT_KNOCK_BACK (like Thunderstorm) can't knockback target if target has ROOT + if (unitTarget->HasUnitState(UNIT_STATE_ROOT)) return; // Instantly interrupt non melee spells being cast From 4d690f65c116d1e9eb31e9938407161a6d71f40f Mon Sep 17 00:00:00 2001 From: Meji Date: Thu, 4 Apr 2024 21:51:48 +0200 Subject: [PATCH 8/8] DB/DunMorogh: Add missing spawn groups for Operation: Gnomeregan --- .../world/3.3.5/2024_04_04_06_world.sql | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sql/updates/world/3.3.5/2024_04_04_06_world.sql diff --git a/sql/updates/world/3.3.5/2024_04_04_06_world.sql b/sql/updates/world/3.3.5/2024_04_04_06_world.sql new file mode 100644 index 0000000000..278de04890 --- /dev/null +++ b/sql/updates/world/3.3.5/2024_04_04_06_world.sql @@ -0,0 +1,27 @@ +SET @CGUID := 208509; + +DELETE FROM `spawn_group` WHERE `spawnType`=0 AND `spawnId` BETWEEN 207174 AND 207209; +DELETE FROM `spawn_group` WHERE `spawnType`=0 AND `spawnId` IN (130847, 130848, 130849, 130853, 130855, 130906, 130907, 130908, 130971); +DELETE FROM `spawn_group` WHERE `spawnType`=0 AND `spawnId` BETWEEN @CGUID+0 AND @CGUID+54; +INSERT INTO `spawn_group` (`groupId`, `spawnType`, `spawnId`) VALUES +(2, 0, @CGUID+34), +(2, 0, @CGUID+35), +(2, 0, @CGUID+36), +(2, 0, @CGUID+37), +(2, 0, @CGUID+38), +(2, 0, @CGUID+39), +(2, 0, @CGUID+40), +(2, 0, @CGUID+41), +(2, 0, @CGUID+42), +(2, 0, @CGUID+43), +(2, 0, @CGUID+44), +(2, 0, @CGUID+45), +(2, 0, @CGUID+46), +(2, 0, @CGUID+47), +(2, 0, @CGUID+48), +(2, 0, @CGUID+49), +(2, 0, @CGUID+50), +(2, 0, @CGUID+51), +(2, 0, @CGUID+52), +(2, 0, @CGUID+53), +(2, 0, @CGUID+54);