From 8e966a6835ae3d7668c2548da6cd73b53c2d4fa8 Mon Sep 17 00:00:00 2001 From: Grz3s Date: Tue, 1 Oct 2024 12:10:56 +0200 Subject: [PATCH] Northrend: Script for quest 12813 moved to DB corrected --- sql/scriptdev2/scriptdev2.sql | 2 +- .../scripts/world/spell_scripts.cpp | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/sql/scriptdev2/scriptdev2.sql b/sql/scriptdev2/scriptdev2.sql index 03aa60a4288..b128870572b 100644 --- a/sql/scriptdev2/scriptdev2.sql +++ b/sql/scriptdev2/scriptdev2.sql @@ -218,7 +218,7 @@ UPDATE creature_template SET ScriptName='spell_dummy_npc' WHERE entry IN ( -- outland 16880,16518,16847,17157,17326,17654,18879,21729,24918,24922,25084,25085, -- northrend -23678,25752,25753,25758,25792,25793,26268,26270,26421,26616,26643,26841,27122,27808,28053,28054,28068,28093,28465,28600,29319,29327,29329,29330,29338,30146,30169,32149); +23678,25752,25753,25758,25792,25793,26268,26270,26421,26616,26643,26841,27122,27808,28053,28054,28068,28093,28465,28600,29319,29327,30146,30169,32149); UPDATE gameobject_template SET ScriptName='spell_dummy_go' WHERE entry IN (181616,186949); diff --git a/src/game/AI/ScriptDevAI/scripts/world/spell_scripts.cpp b/src/game/AI/ScriptDevAI/scripts/world/spell_scripts.cpp index 91414429487..1dd7e98de83 100644 --- a/src/game/AI/ScriptDevAI/scripts/world/spell_scripts.cpp +++ b/src/game/AI/ScriptDevAI/scripts/world/spell_scripts.cpp @@ -239,11 +239,6 @@ enum SAY_BLESS_4 = -1000597, SAY_BLESS_5 = -1000598, - // quest 12813, by item 40587 - SPELL_DARKMENDER_TINCTURE = 52741, - SPELL_SUMMON_CORRUPTED_SCARLET = 54415, - NPC_CORPSES_RISE_CREDIT_BUNNY = 29398, - // quest 12659, item 38731 SPELL_AHUNAES_KNIFE = 52090, NPC_SCALPS_KILL_CREDIT_BUNNY = 28622, @@ -507,24 +502,6 @@ bool EffectDummyCreature_spell_dummy_npc(Unit* pCaster, uint32 uiSpellId, SpellE } return true; } - case SPELL_DARKMENDER_TINCTURE: - { - if (uiEffIndex == EFFECT_INDEX_0) - { - if (pCaster->GetTypeId() != TYPEID_PLAYER) - return true; - - // TODO: find/fix visual for effect, no related spells found doing this - - pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_CORRUPTED_SCARLET, TRIGGERED_OLD_TRIGGERED); - - ((Player*)pCaster)->KilledMonsterCredit(NPC_CORPSES_RISE_CREDIT_BUNNY); - - pCreatureTarget->ForcedDespawn(); - return true; - } - return true; - } case SPELL_DISCIPLINING_ROD: { if (uiEffIndex == EFFECT_INDEX_0)