Quest/Scripts: Remove some hacks from "Trolls Is Gone Crazy!"

2 files changed, 19 insertions, 10 deletions

diff --git a/sql/updates/world/3.3.5/2020_01_09_04_world.sql b/sql/updates/world/3.3.5/2020_01_09_04_world.sql
new file mode 100644
index 00000000000..a27cb4548af
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_01_09_04_world.sql
@@ -0,0 +1,13 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry` IN (59951, 59952) AND `SourceTypeOrReferenceId`=13 AND `ConditionValue2`=29686;
+DELETE FROM `creature_template_addon` WHERE `entry` IN (29686);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(29686, 0, 0, 8, 1, 0, ''); -- 29686
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=54990;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition` ,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,3,54990,0,0,31,0,3,29700,0,0,0,'','Chains of the Scourge');
+
+DELETE FROM `spell_scripts` WHERE `id`=54990;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(54990,1,0,15,55009,3,0,0,0,0,0);
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 8e3a2edb44f..68e64773f33 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -38,8 +38,8 @@ enum DrakuruShackles
 {
     NPC_RAGECLAW                             = 29686,
     QUEST_TROLLS_IS_GONE_CRAZY               = 12861,
-    SPELL_LEFT_CHAIN                         = 59951,
-    SPELL_RIGHT_CHAIN                        = 59952,
+    SPELL_CHAIN_OF_THE_SCURGE_RIGHT          = 54990,
+    SPELL_CHAIN_OF_THE_SCURGE_LEFT           = 55009,
     SPELL_UNLOCK_SHACKLE                     = 55083,
     SPELL_FREE_RAGECLAW                      = 55223
 };
@@ -73,9 +73,6 @@ public:
             // pointer check not needed
             me->SetFacingToObject(rageclaw);
             rageclaw->SetFacingToObject(me);
-
-            DoCast(rageclaw, SPELL_LEFT_CHAIN, true);
-            DoCast(rageclaw, SPELL_RIGHT_CHAIN, true);
         }
 
         void UnlockRageclaw(Unit* who, Creature* rageclaw)
@@ -99,6 +96,7 @@ public:
                     {
                         UnlockRageclaw(caster, rageclaw);
                         caster->ToPlayer()->KilledMonster(rageclaw->GetCreatureTemplate(), _rageclawGUID);
+                        me->RemoveAurasDueToSpell(SPELL_CHAIN_OF_THE_SCURGE_RIGHT);
                         me->DespawnOrUnsummon();
                     }
                     else
@@ -124,7 +122,6 @@ public:
 enum Rageclaw
 {
     SPELL_UNSHACKLED                         = 55085,
-    SPELL_KNEEL                              = 39656,
     SAY_RAGECLAW                             = 0
 };
 
@@ -140,7 +137,7 @@ public:
         void Reset() override
         {
             me->SetFaction(FACTION_FRIENDLY);
-            DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P
+            DoCast(me, SPELL_CHAIN_OF_THE_SCURGE_RIGHT, true);
         }
 
         void MoveInLineOfSight(Unit* /*who*/) override { }
@@ -149,9 +146,8 @@ public:
         {
             if (spell->Id == SPELL_FREE_RAGECLAW)
             {
-                me->RemoveAurasDueToSpell(SPELL_LEFT_CHAIN);
-                me->RemoveAurasDueToSpell(SPELL_RIGHT_CHAIN);
-                me->RemoveAurasDueToSpell(SPELL_KNEEL);
+                me->RemoveAurasDueToSpell(SPELL_CHAIN_OF_THE_SCURGE_LEFT);
+                me->SetStandState(UNIT_STAND_STATE_STAND);
                 me->SetFaction(me->GetCreatureTemplate()->faction);
                 DoCast(me, SPELL_UNSHACKLED, true);
                 Talk(SAY_RAGECLAW);