From 091e7c101ecb7554b6f5d0454c511ee857c2735e Mon Sep 17 00:00:00 2001 From: WiZZy Date: Tue, 30 Jul 2019 14:19:43 +0300 Subject: [PATCH] fix(Core/DB/Quest): Let Them Eat Crow (#1680) --- .../rev_1554387633805928700.sql | 19 +++++++++++++++++++ src/server/game/Spells/SpellMgr.cpp | 9 ++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 data/sql/updates/pending_db_world/rev_1554387633805928700.sql diff --git a/data/sql/updates/pending_db_world/rev_1554387633805928700.sql b/data/sql/updates/pending_db_world/rev_1554387633805928700.sql new file mode 100644 index 000000000..a11841634 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1554387633805928700.sql @@ -0,0 +1,19 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1554387633805928700'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (13, 17) AND `SourceEntry` IN (42767, 42788); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 2, 42788, 0, 0, 31, 0, 3, 23943, 0, 0, 0, 0, '', 'Spell Feed Plaguehound targets NPC Hungry Plaguehound'), +(17, 0, 42788, 0, 0, 29, 0, 23943, 10, 0, 0, 0, 0, '', 'Spell Feed Plaguehound requires NPC Hungry Plaguehound within 10 yards'), +(13, 1, 42767, 0, 0, 31, 0, 3, 23945, 0, 0, 0, 0, '', 'Spell Sic\'em targets NPC Fjord Crow'); + +UPDATE `creature_template` SET `spell1`=42767 WHERE `entry`=23943; + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=23945; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23945 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23945, 0, 0, 0, 8, 0, 100, 0, 42767, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Fjord Crow - On Spellhit \'Sic\'em\' - Attack Invoker'); + +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 23938; +DELETE FROM `smart_scripts` WHERE `entryorguid`=23938 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23938, 0, 0, 0, 20, 0, 100, 0, 11227, 0, 0, 0, 41, 1500, 0, 0, 0, 0, 0, 9, 23943, 0, 10, 0, 0, 0, 0, 'Pontius - When player rewards quest 11227 - Creature Hungry Plaguehound (23943) in 0 - 10 yards: Despawn in 1500 ms '); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index dd2296736..31ef8a451 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3374,6 +3374,9 @@ void SpellMgr::LoadDbcDataCorrections() case 29809: // Desecration Arm - 36 instead of 37 - typo? :/ spellInfo->EffectRadiusIndex[0] = 37; break; + case 42767: // Sic'em + spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_NEARBY_ENTRY; + break; // Master Shapeshifter: missing stance data for forms other than bear - bear version has correct data // To prevent aura staying on target after talent unlearned case 48420: @@ -6323,7 +6326,11 @@ void SpellMgr::LoadDbcDataCorrections() properties->Type = SUMMON_TYPE_TOTEM; properties = const_cast(sSummonPropertiesStore.LookupEntry(647)); // 52893 properties->Type = SUMMON_TYPE_TOTEM; - + if ((properties = const_cast(sSummonPropertiesStore.LookupEntry(628)))) // Hungry Plaguehound + { + properties->Category = SUMMON_CATEGORY_PET; + properties->Type = SUMMON_TYPE_PET; + } // Correct Pet Size CreatureDisplayInfoEntry* displayEntry = const_cast(sCreatureDisplayInfoStore.LookupEntry(17028)); // Kurken