aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKillyana <morphone1@gmail.com>2020-04-28 02:04:53 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-01 21:49:09 +0100
commit6300b096ac271e8331108b64d49074dcbaf1b40a (patch)
tree55dc84fc1b6168ef520ff197a8d8dcb48ced4121
parentf4f56c105fabf33398d332c09c8e331bc4025192 (diff)
DB/Pet: Lil' K.T
Ref #1364 (cherry picked from commit ee5eace3c6d1fa489572c052daef4834e9c7f12c)
-rw-r--r--sql/updates/world/master/2022_01_01_38_world_2020_04_28_00_world.sql22
-rw-r--r--src/server/game/Spells/SpellMgr.cpp9
2 files changed, 31 insertions, 0 deletions
diff --git a/sql/updates/world/master/2022_01_01_38_world_2020_04_28_00_world.sql b/sql/updates/world/master/2022_01_01_38_world_2020_04_28_00_world.sql
new file mode 100644
index 00000000000..a0d17b66fff
--- /dev/null
+++ b/sql/updates/world/master/2022_01_01_38_world_2020_04_28_00_world.sql
@@ -0,0 +1,22 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 17 AND `SourceEntry` IN (69683);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 69683, 0, 24, 1, 8, 0, 0, 0, '', "Mini K. T. (passif) Find Target hits only critters");
+
+DELETE FROM `creature_template_addon` WHERE `entry` = 36979;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(36979, 0, 0, 0, 0, 0, '69683 70050');
+
+DELETE FROM `spell_scripts` WHERE `id` IN (69682,69731);
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(69682 ,0,0,15,69681,0,0,0,0,0,0),
+(69682 ,0,3,1,451,0,0,0,0,0,0),
+(69682 ,0,3,16,16493,0,0,0,0,0,0),
+(69731 ,0,0,1,402,0,0,0,0,0,0);
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 70049;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(70049, 69731, 0, 'Lich Pet emote');
+
+-- To do: when the pet is summoned the player get the aura 69732 (the aura is added and removed by "Lich Pet Aura Remove"=69736 and "Lich Pet OnSummon"=69735)
+-- The spell 69732 has the proc flag= 2 (0x2) - "Kill that yields experience or honor" when it procs it must trigger a cast of 69731 on/from the pet
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 1f51ede1d02..7c69542359c 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3439,6 +3439,15 @@ void SpellMgr::LoadSpellInfoCorrections()
spellEffectInfo->ApplyAuraName = SPELL_AURA_PERIODIC_TRIGGER_SPELL;
});
});
+
+ // Lich Pet
+ ApplySpellFix({ 70050 }, [](SpellInfo* spellInfo)
+ {
+ ApplySpellEffectFix(spellInfo, EFFECT_0, [](SpellEffectInfo* spellEffectInfo)
+ {
+ spellEffectInfo->TriggerSpell = 70049;
+ });
+ });
}
// Allows those to crit