mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-24 14:16:31 +00:00
Merge branch 'azerothcore:master' into Playerbot
This commit is contained in:
ZhengPeiRu21
268
data/sql/updates/db_world/2022_09_02_00.sql
Normal file
268
data/sql/updates/db_world/2022_09_02_00.sql
Normal file
@@ -0,0 +1,268 @@
|
||||
-- DB update 2022_09_01_00 -> 2022_09_02_00
|
||||
-- Obsidian Eradicator (15262)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 22.5, `ArmorModifier` = 1.55 WHERE (`entry` = 15262);
|
||||
-- Anubisath Sentinel (15264)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 17, `ArmorModifier` = 1.15 WHERE (`entry` = 15264);
|
||||
-- The Prophet Skeram (15263) & Fankriss the Unyielding (15510)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 20.05, `ArmorModifier` = 1.3 WHERE `entry` IN (15263,15510);
|
||||
-- Qiraji Brainwasher (15247) & Vekniss Warrior (15230)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 12, `ArmorModifier` = 1.15 WHERE `entry` IN (15247,15230);
|
||||
-- Vekniss Guardian (15233)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 15, `ArmorModifier` = 1.35 WHERE (`entry` = 15233);
|
||||
-- Vem (15544)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 22.5, `ArmorModifier` = 1.3 WHERE (`entry` = 15544);
|
||||
-- Lord Kri (15511)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 31.25, `ArmorModifier` = 1.3 WHERE (`entry` = 15511);
|
||||
-- Princess Yauj (15543)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 20.05, `ArmorModifier` = 1.3 WHERE (`entry` = 15543);
|
||||
-- Yauj Brood (15621)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 3.3, `ArmorModifier` = 1.1 WHERE (`entry` = 15621);
|
||||
-- Battleguard Sartura (15516)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 18, `ArmorModifier` = 1.3 WHERE (`entry` = 15516);
|
||||
-- Sartura's Royal Guard (15984)
|
||||
UPDATE `creature_template` SET `speed_run` = 2.14286, `DamageModifier` = 14.4, `ArmorModifier` = 1.15 WHERE (`entry` = 15984);
|
||||
-- Vekniss Drone (15300)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2.05, `ArmorModifier` = 1.1 WHERE (`entry` = 15300);
|
||||
-- Vekniss Soldier (15229)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 8, `ArmorModifier` = 1.15 WHERE (`entry` = 15229);
|
||||
-- Spawn of Fankriss (15630)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 26.05, `ArmorModifier` = 1.3 WHERE (`entry` = 15630);
|
||||
-- Vekniss Hatchling (15962)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7.95, `ArmorModifier` = 1.1 WHERE (`entry` = 15962);
|
||||
-- Viscidus (15299)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 21.45, `ArmorModifier` = 1.3 WHERE (`entry` = 15299);
|
||||
-- Glob of Viscidus (15667)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4.65, `ArmorModifier` = 1.1 WHERE (`entry` = 15667);
|
||||
-- Vekniss Hive Crawler (15240)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 20, `ArmorModifier` = 1.2 WHERE (`entry` = 15240);
|
||||
-- Vekniss Stinger (15235)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 12, `ArmorModifier` = 1.2 WHERE (`entry` = 15235);
|
||||
-- Vekniss Wasp (15236)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 8, `ArmorModifier` = 1.1 WHERE (`entry` = 15236);
|
||||
-- Qiraji Lasher (15249)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14.4, `ArmorModifier` = 1.15 WHERE (`entry` = 15249);
|
||||
-- Princess Huhuran (15509)
|
||||
UPDATE `creature_template` SET `ArmorModifier` = 1.3 WHERE (`entry` = 15509);
|
||||
-- Anubisath Defender (15277)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 30.05, `ArmorModifier` = 1.2 WHERE (`entry` = 15277);
|
||||
-- Emperor Vek'nilash (15275)
|
||||
UPDATE `creature_template` SET `ArmorModifier` = 1.3 WHERE (`entry` = 15275);
|
||||
-- Emperor Vek'lor (15276)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 30.05, `ArmorModifier` = 1.6 WHERE (`entry` = 15276);
|
||||
-- Qiraji Champion (15252)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 25, `ArmorModifier` = 1.3 WHERE (`entry` = 15252);
|
||||
-- Qiraji Slayer (15250)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 20, `ArmorModifier` = 1.15 WHERE (`entry` = 15250);
|
||||
-- Obsidian Nullifier (15312)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 23.2, `ArmorModifier` = 1.45 WHERE (`entry` = 15312);
|
||||
-- Anubisath Warder (15311)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 28, `ArmorModifier` = 1.3 WHERE (`entry` = 15311);
|
||||
-- Ouro (15517)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 47.3, `ArmorModifier` = 1.3 WHERE (`entry` = 15517);
|
||||
-- Ouro Scarab (15718)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2.25, `ArmorModifier` = 0.7 WHERE (`entry` = 15718);
|
||||
-- C'Thun (15727)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 1.05, `ArmorModifier` = 1.3 WHERE (`entry` = 15727);
|
||||
-- Eye of C'Thun (15589)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14.85, `ArmorModifier` = 1.3 WHERE (`entry` = 15589);
|
||||
-- Giant Eye Tentacle (15334)
|
||||
UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 1, `DamageModifier` = 9.95, `ArmorModifier` = 1.35 WHERE (`entry` = 15334);
|
||||
-- Claw Tentacle (15725) Patch 7 - 5.4 DamMod
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2, `ArmorModifier` = 1.35 WHERE (`entry` = 15725);
|
||||
-- Eye Tentacle (15726)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2, `ArmorModifier` = 1.35 WHERE (`entry` = 15726);
|
||||
-- Giant Claw Tentacle (15728) Patch 7 - 74.45 DamMod
|
||||
UPDATE `creature_template` SET `DamageModifier` = 39.55, `ArmorModifier` = 1.35 WHERE (`entry` = 15728);
|
||||
-- Flesh Tentacle (15802)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 3.75, `ArmorModifier` = 1.35 WHERE (`entry` = 15802);
|
||||
-- Vekniss Borer (15622)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7.05, `ArmorModifier` = 1.1 WHERE (`entry` = 15622);
|
||||
|
||||
-- Resistances
|
||||
DELETE FROM `creature_template_resistance` WHERE `CreatureID` IN (15622,15802,15728,15726,15725,15334,15589,15727,15517,15311,15312,15250,15252,15276,15275,15277,15509,15249,15236,15235,15240,15299,15630,15510,15229,15300,15984,15516,15543,15511,15544,15230,15233,15247,15263,15264,15262);
|
||||
INSERT INTO `creature_template_resistance` (`CreatureID`, `School`, `Resistance`, `VerifiedBuild`) VALUES
|
||||
(15622, 2, 75, 0),
|
||||
(15622, 3, 75, 0),
|
||||
(15622, 4, 75, 0),
|
||||
(15622, 5, 75, 0),
|
||||
(15622, 6, 75, 0),
|
||||
(15802, 2, 75, 0),
|
||||
(15802, 3, 75, 0),
|
||||
(15802, 4, 75, 0),
|
||||
(15802, 5, 75, 0),
|
||||
(15802, 6, 75, 0),
|
||||
(15728, 2, 75, 0),
|
||||
(15728, 3, 75, 0),
|
||||
(15728, 4, 75, 0),
|
||||
(15728, 5, 75, 0),
|
||||
(15728, 6, 75, 0),
|
||||
(15726, 2, 75, 0),
|
||||
(15726, 3, 75, 0),
|
||||
(15726, 4, 75, 0),
|
||||
(15726, 5, 75, 0),
|
||||
(15726, 6, 75, 0),
|
||||
(15725, 2, 75, 0),
|
||||
(15725, 3, 75, 0),
|
||||
(15725, 4, 75, 0),
|
||||
(15725, 5, 75, 0),
|
||||
(15725, 6, 75, 0),
|
||||
(15334, 2, 75, 0),
|
||||
(15334, 3, 75, 0),
|
||||
(15334, 4, 75, 0),
|
||||
(15334, 5, 75, 0),
|
||||
(15334, 6, 75, 0),
|
||||
(15589, 2, 75, 0),
|
||||
(15589, 3, 75, 0),
|
||||
(15589, 4, 75, 0),
|
||||
(15589, 5, 75, 0),
|
||||
(15589, 6, 75, 0),
|
||||
(15727, 2, 75, 0),
|
||||
(15727, 3, 75, 0),
|
||||
(15727, 4, 75, 0),
|
||||
(15727, 5, 75, 0),
|
||||
(15727, 6, 75, 0),
|
||||
(15517, 2, 75, 0),
|
||||
(15517, 3, 75, 0),
|
||||
(15517, 4, 75, 0),
|
||||
(15517, 5, 75, 0),
|
||||
(15517, 6, 75, 0),
|
||||
(15311, 2, 75, 0),
|
||||
(15311, 3, 75, 0),
|
||||
(15311, 4, 75, 0),
|
||||
(15311, 5, 75, 0),
|
||||
(15311, 6, 75, 0),
|
||||
(15312, 2, 75, 0),
|
||||
(15312, 3, 75, 0),
|
||||
(15312, 4, 75, 0),
|
||||
(15312, 5, 75, 0),
|
||||
(15312, 6, 75, 0),
|
||||
(15250, 2, 75, 0),
|
||||
(15250, 3, 75, 0),
|
||||
(15250, 4, 75, 0),
|
||||
(15250, 5, 75, 0),
|
||||
(15250, 6, 75, 0),
|
||||
(15252, 2, 75, 0),
|
||||
(15252, 3, 75, 0),
|
||||
(15252, 4, 75, 0),
|
||||
(15252, 5, 75, 0),
|
||||
(15252, 6, 75, 0),
|
||||
(15276, 2, 75, 0),
|
||||
(15276, 3, 75, 0),
|
||||
(15276, 4, 75, 0),
|
||||
(15276, 5, 75, 0),
|
||||
(15276, 6, 75, 0),
|
||||
(15275, 2, 75, 0),
|
||||
(15275, 3, 75, 0),
|
||||
(15275, 4, 75, 0),
|
||||
(15275, 5, 75, 0),
|
||||
(15275, 6, 75, 0),
|
||||
(15277, 2, 75, 0),
|
||||
(15277, 3, 75, 0),
|
||||
(15277, 4, 75, 0),
|
||||
(15277, 5, 75, 0),
|
||||
(15277, 6, 75, 0),
|
||||
(15509, 2, 75, 0),
|
||||
(15509, 3, 75, 0),
|
||||
(15509, 4, 75, 0),
|
||||
(15509, 5, 75, 0),
|
||||
(15509, 6, 75, 0),
|
||||
(15249, 2, 75, 0),
|
||||
(15249, 3, 75, 0),
|
||||
(15249, 4, 75, 0),
|
||||
(15249, 5, 75, 0),
|
||||
(15249, 6, 75, 0),
|
||||
(15236, 2, 75, 0),
|
||||
(15236, 3, 75, 0),
|
||||
(15236, 4, 75, 0),
|
||||
(15236, 5, 75, 0),
|
||||
(15236, 6, 75, 0),
|
||||
(15235, 2, 75, 0),
|
||||
(15235, 3, 75, 0),
|
||||
(15235, 4, 75, 0),
|
||||
(15235, 5, 75, 0),
|
||||
(15235, 6, 75, 0),
|
||||
(15240, 2, 75, 0),
|
||||
(15240, 3, 75, 0),
|
||||
(15240, 4, 75, 0),
|
||||
(15240, 5, 75, 0),
|
||||
(15240, 6, 75, 0),
|
||||
(15299, 2, 75, 0),
|
||||
(15299, 3, 75, 0),
|
||||
(15299, 4, 75, 0),
|
||||
(15299, 5, 75, 0),
|
||||
(15299, 6, 75, 0),
|
||||
(15630, 2, 15, 0),
|
||||
(15630, 3, 15, 0),
|
||||
(15630, 4, 15, 0),
|
||||
(15630, 5, 15, 0),
|
||||
(15630, 6, 15, 0),
|
||||
(15510, 2, 75, 0),
|
||||
(15510, 3, 75, 0),
|
||||
(15510, 4, 75, 0),
|
||||
(15510, 5, 75, 0),
|
||||
(15510, 6, 75, 0),
|
||||
(15229, 2, 75, 0),
|
||||
(15229, 3, 75, 0),
|
||||
(15229, 4, 75, 0),
|
||||
(15229, 5, 75, 0),
|
||||
(15229, 6, 75, 0),
|
||||
(15300, 2, 75, 0),
|
||||
(15300, 3, 75, 0),
|
||||
(15300, 4, 75, 0),
|
||||
(15300, 5, 75, 0),
|
||||
(15300, 6, 75, 0),
|
||||
(15984, 2, 15, 0),
|
||||
(15984, 3, 15, 0),
|
||||
(15984, 4, 15, 0),
|
||||
(15984, 5, 15, 0),
|
||||
(15984, 6, 15, 0),
|
||||
(15516, 2, 75, 0),
|
||||
(15516, 3, 75, 0),
|
||||
(15516, 4, 75, 0),
|
||||
(15516, 5, 75, 0),
|
||||
(15516, 6, 75, 0),
|
||||
(15543, 2, 75, 0),
|
||||
(15543, 3, 75, 0),
|
||||
(15543, 4, 75, 0),
|
||||
(15543, 5, 75, 0),
|
||||
(15543, 6, 75, 0),
|
||||
(15511, 2, 75, 0),
|
||||
(15511, 3, 75, 0),
|
||||
(15511, 4, 75, 0),
|
||||
(15511, 5, 75, 0),
|
||||
(15511, 6, 75, 0),
|
||||
(15544, 2, 75, 0),
|
||||
(15544, 3, 75, 0),
|
||||
(15544, 4, 75, 0),
|
||||
(15544, 5, 75, 0),
|
||||
(15544, 6, 75, 0),
|
||||
(15230, 2, 75, 0),
|
||||
(15230, 3, 75, 0),
|
||||
(15230, 4, 75, 0),
|
||||
(15230, 5, 75, 0),
|
||||
(15230, 6, 75, 0),
|
||||
(15233, 2, 75, 0),
|
||||
(15233, 3, 75, 0),
|
||||
(15233, 4, 75, 0),
|
||||
(15233, 5, 75, 0),
|
||||
(15233, 6, 75, 0),
|
||||
(15247, 2, 75, 0),
|
||||
(15247, 3, 75, 0),
|
||||
(15247, 4, 75, 0),
|
||||
(15247, 5, 75, 0),
|
||||
(15247, 6, 75, 0),
|
||||
(15263, 2, 75, 0),
|
||||
(15263, 3, 75, 0),
|
||||
(15263, 4, 75, 0),
|
||||
(15263, 5, 75, 0),
|
||||
(15263, 6, 75, 0),
|
||||
(15264, 2, 75, 0),
|
||||
(15264, 3, 75, 0),
|
||||
(15264, 4, 75, 0),
|
||||
(15264, 5, 75, 0),
|
||||
(15264, 6, 75, 0),
|
||||
(15262, 2, 75, 0),
|
||||
(15262, 3, 75, 0),
|
||||
(15262, 4, 75, 0),
|
||||
(15262, 5, 75, 0),
|
||||
(15262, 6, 75, 0);
|
||||
3
data/sql/updates/db_world/2022_09_02_01.sql
Normal file
3
data/sql/updates/db_world/2022_09_02_01.sql
Normal file
@@ -0,0 +1,3 @@
|
||||
-- DB update 2022_09_02_00 -> 2022_09_02_01
|
||||
--
|
||||
DELETE FROM `spell_dbc` WHERE `ID` IN (46393);
|
||||
5
data/sql/updates/db_world/2022_09_02_02.sql
Normal file
5
data/sql/updates/db_world/2022_09_02_02.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
-- DB update 2022_09_02_01 -> 2022_09_02_02
|
||||
--
|
||||
DELETE FROM `command` WHERE `name` = 'go creature id';
|
||||
INSERT INTO `command` (`name`, `security`, `help`) VALUES
|
||||
('go creature id', 1, 'Syntax: .go creature id #creature_entry\nTeleports you to the given creature entry.');
|
||||
16
data/sql/updates/db_world/2022_09_02_03.sql
Normal file
16
data/sql/updates/db_world/2022_09_02_03.sql
Normal file
@@ -0,0 +1,16 @@
|
||||
-- DB update 2022_09_02_02 -> 2022_09_02_03
|
||||
-- Voodoo Spirit - Add aura 24051
|
||||
DELETE FROM `creature_template_addon` WHERE (`entry` = 15009);
|
||||
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
|
||||
(15009, 0, 0, 0, 0, 0, 0, '24051');
|
||||
|
||||
-- Add SAI to kill Voodoo Spirit after 10s (sniffed)
|
||||
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 15009;
|
||||
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 15009) AND (`source_type` = 0) AND (`id` IN (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`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(15009, 0, 0, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Voodoo Spirit - In Combat - Kill Self');
|
||||
|
||||
-- Update Hakkari Witch Doctor to summon Voodoo Spirit on Death
|
||||
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 11831) AND (`source_type` = 0) AND (`id` IN (4));
|
||||
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`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(11831, 0, 4, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 24052, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hakkari Witch Doctor - On Just Died - Cast \'Summon Voodoo Spirit\'');
|
||||
393
data/sql/updates/db_world/2022_09_02_04.sql
Normal file
393
data/sql/updates/db_world/2022_09_02_04.sql
Normal file
@@ -0,0 +1,393 @@
|
||||
-- DB update 2022_09_02_03 -> 2022_09_02_04
|
||||
-- Gurubashi Axe Thrower (11350) & Zulian Crocolisk (15043)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4.05, `ArmorModifier` = 1.1 WHERE `entry` IN (11350,15043);
|
||||
-- Hakkari Priest (11830)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 5.05, `ArmorModifier` = 1.1 WHERE (`entry` = 11830);
|
||||
-- Razzashi Serpent (11371)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4, `ArmorModifier` = 1.1 WHERE (`entry` = 11371);
|
||||
-- Razzashi Adder (11372)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4.2, `ArmorModifier` = 1.1 WHERE (`entry` = 11372);
|
||||
-- Hooktooth Frenzy (11374)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2.4, `ArmorModifier` = 1.1 WHERE (`entry` = 11374);
|
||||
-- Gurubashi Headhunter (11351)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 5, `ArmorModifier` = 1.1 WHERE (`entry` = 11351);
|
||||
-- Hakkari Witch Doctor (11831)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 6.05, `ArmorModifier` = 1.1 WHERE (`entry` = 11831);
|
||||
-- Bloodseeker Bat (11368)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 1.25, `ArmorModifier` = 1.1 WHERE (`entry` = 11368);
|
||||
-- Gurubashi Bat Rider (14750)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 10, `ArmorModifier` = 1.15 WHERE (`entry` = 14750);
|
||||
-- High Priestess Jeklik (14517)
|
||||
UPDATE `creature_template` SET `ArmorModifier` = 1.3 WHERE (`entry` = 14517);
|
||||
-- Gurubashi Berserker (11352)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14, `ArmorModifier` = 1.2 WHERE (`entry` = 11352);
|
||||
-- Sandfury Speaker (11387)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 9.05, `ArmorModifier` = 1.15 WHERE (`entry` = 11387);
|
||||
-- Razzashi Cobra (11373)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 9.4, `ArmorModifier` = 1.1 WHERE (`entry` = 11373);
|
||||
-- High Priest Venoxis (14507)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14.05, `ArmorModifier` = 1.3 WHERE (`entry` = 14507);
|
||||
-- Razzashi Skitterer (14880)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4.15 WHERE (`entry` = 14880);
|
||||
-- Razzashi Broodwidow (11370)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 10.25, `ArmorModifier` = 1.15 WHERE (`entry` = 11370);
|
||||
-- Hakkari Shadowcaster (11338)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 8, `ArmorModifier` = 1.15 WHERE (`entry` = 11338);
|
||||
-- Razzashi Venombrood (14532)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 10, `ArmorModifier` = 1.1 WHERE (`entry` = 14532);
|
||||
-- Witherbark Speaker (11388)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7.4, `ArmorModifier` = 1.55 WHERE (`entry` = 11388);
|
||||
-- High Priestess Mar'li (14510)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14.05, `ArmorModifier` = 1.3 WHERE (`entry` = 14510);
|
||||
-- Spawn of Mar'li (15041)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 4.85, `ArmorModifier` = 1.1 WHERE (`entry` = 15041);
|
||||
-- Gurubashi Blood Drinker (11353)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 9, `ArmorModifier` = 1.1 WHERE (`entry` = 11353);
|
||||
-- Razzashi Raptor (14821)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 8, `ArmorModifier` = 1.1 WHERE (`entry` = 14821);
|
||||
-- Gurubashi Champion (11356)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7, `ArmorModifier` = 1.15 WHERE (`entry` = 11356);
|
||||
-- Vilebranch Speaker (11391)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 9.05, `ArmorModifier` = 1.25 WHERE (`entry` = 11391);
|
||||
-- Bloodlord Mandokir (11382)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 21.25, `ArmorModifier` = 1.3 WHERE (`entry` = 11382);
|
||||
-- Ohgan (14988)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 13.6, `ArmorModifier` = 1.1 WHERE (`entry` = 14988);
|
||||
-- Zanza the Restless (15042)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2.55, `ArmorModifier` = 1.1 WHERE (`entry` = 15042);
|
||||
-- Mad Servant (15111)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7.45, `ArmorModifier` = 1.15 WHERE (`entry` = 15111);
|
||||
-- Mad Voidwalker (15146)
|
||||
UPDATE `creature_template` SET `dmgschool` = 5, `DamageModifier` = 5 WHERE (`entry` = 15146);
|
||||
-- Hakkari Blood Priest (11340)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 6, `ArmorModifier` = 1.15 WHERE (`entry` = 11340);
|
||||
-- Gri'lek (15082)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 22.5, `ArmorModifier` = 1.3 WHERE (`entry` = 15082);
|
||||
-- Wushoolay (15085)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 22.5, `ArmorModifier` = 1.3 WHERE (`entry` = 15085);
|
||||
-- Renataki (15084)
|
||||
UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 1.57143, `DamageModifier` = 15.05, `BaseAttackTime` = 1500, `ArmorModifier` = 1.3 WHERE (`entry` = 15084);
|
||||
-- Hazza'rah (15083)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 22.5, `ArmorModifier` = 1.3 WHERE (`entry` = 15083);
|
||||
-- Nightmare Illusion (15163)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 51.95, `ArmorModifier` = 1.1 WHERE (`entry` = 15163);
|
||||
-- Zulian Tiger (11361)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 8.85, `ArmorModifier` = 1.1 WHERE (`entry` = 11361);
|
||||
-- Zulian Cub (11360)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 3.1, `ArmorModifier` = 1.1 WHERE (`entry` = 11360);
|
||||
-- Zealot Zath (11348)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 12.2, `ArmorModifier` = 1.2 WHERE (`entry` = 11348);
|
||||
-- Zealot Lor'Khan (11347)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 14.2, `ArmorModifier` = 1.5 WHERE (`entry` = 11347);
|
||||
-- High Priest Thekal (14509)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 17.55, `ArmorModifier` = 1.3 WHERE (`entry` = 14509);
|
||||
-- Zulian Guardian (15068)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 3, `ArmorModifier` = 1.2 WHERE (`entry` = 15068);
|
||||
-- Gahz'ranka (15114)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 20.05, `ArmorModifier` = 1.3 WHERE (`entry` = 15114);
|
||||
-- Voodoo Spirit (15009)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 0.1, `ArmorModifier` = 1.1 WHERE (`entry` = 15009);
|
||||
-- Zulian Panther (11365)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 15.7, `ArmorModifier` = 1.1 WHERE (`entry` = 11365);
|
||||
-- Hakkari Shadow Hunter (11339)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 6, `ArmorModifier` = 1.15 WHERE (`entry` = 11339);
|
||||
-- Zulian Stalker (15067)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 6.2, `ArmorModifier` = 1.15 WHERE (`entry` = 15067);
|
||||
-- High Priestess Arlokk (14515)
|
||||
UPDATE `creature_template` SET `ArmorModifier` = 1.3 WHERE (`entry` = 14515);
|
||||
-- Zulian Prowler (15101)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 2.25, `ArmorModifier` = 1.1 WHERE (`entry` = 15101);
|
||||
-- Voodoo Slave (14883)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 10.3, `ArmorModifier` = 1.1 WHERE (`entry` = 14883);
|
||||
-- Withered Mistress (14825)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 11.7, `ArmorModifier` = 1.1 WHERE (`entry` = 14825);
|
||||
-- Atal'ai Mistress (14882)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 9.6, `ArmorModifier` = 1.1 WHERE (`entry` = 14882);
|
||||
-- Sacrificed Troll (14826)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 1.5, `ArmorModifier` = 1.05 WHERE (`entry` = 14826);
|
||||
-- Jin'do the Hexxer (11380)
|
||||
UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 2.14286, `DamageModifier` = 17.05, `ArmorModifier` = 1.3 WHERE (`entry` = 11380);
|
||||
-- Soulflayer (11359)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 12, `ArmorModifier` = 1.15 WHERE (`entry` = 11359);
|
||||
-- Son of Hakkar (11357)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 7.15, `ArmorModifier` = 1.65 WHERE (`entry` = 11357);
|
||||
-- Bloodscalp Speaker (11389)
|
||||
UPDATE `creature_template` SET `DamageModifier` = 5, `ArmorModifier` = 1.15 WHERE (`entry` = 11389);
|
||||
-- Skullsplitter Speaker (11390)
|
||||
UPDATE `creature_template` SET `gossip_menu_id` = 0, `DamageModifier` = 5, `ArmorModifier` = 1.15 WHERE (`entry` = 11390);
|
||||
-- Hakkar (14834)
|
||||
UPDATE `creature_template` SET `ArmorModifier` = 1.3 WHERE (`entry` = 14834);
|
||||
|
||||
-- Resistances
|
||||
DELETE FROM `creature_template_resistance` WHERE `CreatureID` IN (11370,14880,14507,11373,11387,11352,14517,14750,11368,11831,11351,11374,15043,11372,11371,11830,11350,14532,11338,11388,14510,11353,14821,11356,11391,11382,14988,15111,15146,11340,15085,15082,15084,15083,15163,11361,11360,11348,11347,14509,15114,11365,15067,14515,14883,14825,14882,11359,11357,11389,11390,14834,11339,11380);
|
||||
INSERT INTO `creature_template_resistance` (`CreatureID`, `School`, `Resistance`, `VerifiedBuild`) VALUES
|
||||
(11370, 2, 15, 0),
|
||||
(11370, 3, 15, 0),
|
||||
(11370, 4, 15, 0),
|
||||
(11370, 5, 15, 0),
|
||||
(11370, 6, 15, 0),
|
||||
(14880, 2, 15, 0),
|
||||
(14880, 3, 15, 0),
|
||||
(14880, 4, 15, 0),
|
||||
(14880, 5, 15, 0),
|
||||
(14880, 6, 15, 0),
|
||||
(14507, 2, 15, 0),
|
||||
(14507, 3, 15, 0),
|
||||
(14507, 4, 15, 0),
|
||||
(14507, 5, 15, 0),
|
||||
(14507, 6, 15, 0),
|
||||
(11373, 2, 15, 0),
|
||||
(11373, 3, 15, 0),
|
||||
(11373, 4, 15, 0),
|
||||
(11373, 5, 15, 0),
|
||||
(11373, 6, 15, 0),
|
||||
(11387, 2, 15, 0),
|
||||
(11387, 3, 15, 0),
|
||||
(11387, 4, 15, 0),
|
||||
(11387, 5, 15, 0),
|
||||
(11387, 6, 15, 0),
|
||||
(11352, 2, 15, 0),
|
||||
(11352, 3, 15, 0),
|
||||
(11352, 4, 15, 0),
|
||||
(11352, 5, 15, 0),
|
||||
(11352, 6, 15, 0),
|
||||
(14517, 2, 15, 0),
|
||||
(14517, 3, 15, 0),
|
||||
(14517, 4, 15, 0),
|
||||
(14517, 5, 15, 0),
|
||||
(14517, 6, 15, 0),
|
||||
(14750, 2, 15, 0),
|
||||
(14750, 3, 15, 0),
|
||||
(14750, 4, 15, 0),
|
||||
(14750, 5, 15, 0),
|
||||
(14750, 6, 15, 0),
|
||||
(11368, 2, 15, 0),
|
||||
(11368, 3, 15, 0),
|
||||
(11368, 4, 15, 0),
|
||||
(11368, 5, 15, 0),
|
||||
(11368, 6, 15, 0),
|
||||
(11831, 2, 15, 0),
|
||||
(11831, 3, 15, 0),
|
||||
(11831, 4, 15, 0),
|
||||
(11831, 5, 15, 0),
|
||||
(11831, 6, 15, 0),
|
||||
(11351, 2, 15, 0),
|
||||
(11351, 3, 15, 0),
|
||||
(11351, 4, 15, 0),
|
||||
(11351, 5, 15, 0),
|
||||
(11351, 6, 15, 0),
|
||||
(11374, 2, 15, 0),
|
||||
(11374, 3, 15, 0),
|
||||
(11374, 4, 15, 0),
|
||||
(11374, 5, 15, 0),
|
||||
(11374, 6, 15, 0),
|
||||
(15043, 2, 15, 0),
|
||||
(15043, 3, 15, 0),
|
||||
(15043, 4, 15, 0),
|
||||
(15043, 5, 15, 0),
|
||||
(15043, 6, 15, 0),
|
||||
(11372, 2, 15, 0),
|
||||
(11372, 3, 15, 0),
|
||||
(11372, 4, 15, 0),
|
||||
(11372, 5, 15, 0),
|
||||
(11372, 6, 15, 0),
|
||||
(11371, 2, 15, 0),
|
||||
(11371, 3, 15, 0),
|
||||
(11371, 4, 15, 0),
|
||||
(11371, 5, 15, 0),
|
||||
(11371, 6, 15, 0),
|
||||
(11830, 2, 15, 0),
|
||||
(11830, 3, 15, 0),
|
||||
(11830, 4, 15, 0),
|
||||
(11830, 5, 15, 0),
|
||||
(11830, 6, 15, 0),
|
||||
(11350, 2, 15, 0),
|
||||
(11350, 3, 15, 0),
|
||||
(11350, 4, 15, 0),
|
||||
(11350, 5, 15, 0),
|
||||
(11350, 6, 15, 0),
|
||||
(11338, 2, 15, 0),
|
||||
(11338, 3, 15, 0),
|
||||
(11338, 4, 15, 0),
|
||||
(11338, 5, 15, 0),
|
||||
(11338, 6, 15, 0),
|
||||
(14532, 2, 15, 0),
|
||||
(14532, 3, 15, 0),
|
||||
(14532, 4, 15, 0),
|
||||
(14532, 5, 15, 0),
|
||||
(14532, 6, 15, 0),
|
||||
(11388, 2, 15, 0),
|
||||
(11388, 3, 15, 0),
|
||||
(11388, 4, 15, 0),
|
||||
(11388, 5, 15, 0),
|
||||
(11388, 6, 15, 0),
|
||||
(14510, 2, 15, 0),
|
||||
(14510, 3, 15, 0),
|
||||
(14510, 4, 15, 0),
|
||||
(14510, 5, 15, 0),
|
||||
(14510, 6, 15, 0),
|
||||
(11353, 2, 15, 0),
|
||||
(11353, 3, 15, 0),
|
||||
(11353, 4, 15, 0),
|
||||
(11353, 5, 15, 0),
|
||||
(11353, 6, 15, 0),
|
||||
(14821, 2, 15, 0),
|
||||
(14821, 3, 15, 0),
|
||||
(14821, 4, 15, 0),
|
||||
(14821, 5, 15, 0),
|
||||
(14821, 6, 15, 0),
|
||||
(11356, 2, 15, 0),
|
||||
(11356, 3, 15, 0),
|
||||
(11356, 4, 15, 0),
|
||||
(11356, 5, 15, 0),
|
||||
(11356, 6, 15, 0),
|
||||
(11391, 2, 15, 0),
|
||||
(11391, 3, 15, 0),
|
||||
(11391, 4, 15, 0),
|
||||
(11391, 5, 15, 0),
|
||||
(11391, 6, 15, 0),
|
||||
(11382, 2, 15, 0),
|
||||
(11382, 3, 15, 0),
|
||||
(11382, 4, 15, 0),
|
||||
(11382, 5, 15, 0),
|
||||
(11382, 6, 15, 0),
|
||||
(14988, 2, 15, 0),
|
||||
(14988, 3, 15, 0),
|
||||
(14988, 4, 15, 0),
|
||||
(14988, 5, 15, 0),
|
||||
(14988, 6, 15, 0),
|
||||
(15111, 6, 15, 0),
|
||||
(15111, 2, 15, 0),
|
||||
(15111, 3, 15, 0),
|
||||
(15111, 4, 15, 0),
|
||||
(15111, 5, 15, 0),
|
||||
(15146, 2, 60, 0),
|
||||
(15146, 3, 60, 0),
|
||||
(15146, 4, 60, 0),
|
||||
(15146, 5, 60, 0),
|
||||
(15146, 6, 60, 0),
|
||||
(11340, 2, 15, 0),
|
||||
(11340, 3, 15, 0),
|
||||
(11340, 4, 15, 0),
|
||||
(11340, 5, 15, 0),
|
||||
(11340, 6, 15, 0),
|
||||
(15082, 2, 20, 0),
|
||||
(15082, 3, 20, 0),
|
||||
(15082, 4, 20, 0),
|
||||
(15082, 5, 20, 0),
|
||||
(15082, 6, 20, 0),
|
||||
(15085, 2, 20, 0),
|
||||
(15085, 3, 20, 0),
|
||||
(15085, 4, 20, 0),
|
||||
(15085, 5, 20, 0),
|
||||
(15085, 6, 20, 0),
|
||||
(15084, 2, 20, 0),
|
||||
(15084, 3, 20, 0),
|
||||
(15084, 4, 20, 0),
|
||||
(15084, 5, 20, 0),
|
||||
(15084, 6, 20, 0),
|
||||
(15083, 2, 15, 0),
|
||||
(15083, 3, 20, 0),
|
||||
(15083, 4, 20, 0),
|
||||
(15083, 5, 20, 0),
|
||||
(15083, 6, 20, 0),
|
||||
(15163, 2, 15, 0),
|
||||
(15163, 3, 15, 0),
|
||||
(15163, 4, 15, 0),
|
||||
(15163, 5, 15, 0),
|
||||
(15163, 6, 15, 0),
|
||||
(11361, 2, 15, 0),
|
||||
(11361, 3, 15, 0),
|
||||
(11361, 4, 15, 0),
|
||||
(11361, 5, 15, 0),
|
||||
(11361, 6, 15, 0),
|
||||
(11360, 2, 15, 0),
|
||||
(11360, 3, 15, 0),
|
||||
(11360, 4, 15, 0),
|
||||
(11360, 5, 15, 0),
|
||||
(11360, 6, 15, 0),
|
||||
(11348, 2, 15, 0),
|
||||
(11348, 3, 15, 0),
|
||||
(11348, 4, 15, 0),
|
||||
(11348, 5, 15, 0),
|
||||
(11348, 6, 15, 0),
|
||||
(11347, 2, 15, 0),
|
||||
(11347, 3, 15, 0),
|
||||
(11347, 4, 15, 0),
|
||||
(11347, 5, 15, 0),
|
||||
(11347, 6, 15, 0),
|
||||
(14509, 2, 15, 0),
|
||||
(14509, 3, 15, 0),
|
||||
(14509, 4, 15, 0),
|
||||
(14509, 5, 15, 0),
|
||||
(14509, 6, 15, 0),
|
||||
(15114, 2, 15, 0),
|
||||
(15114, 3, 15, 0),
|
||||
(15114, 4, 15, 0),
|
||||
(15114, 5, 15, 0),
|
||||
(15114, 6, 15, 0),
|
||||
(11365, 2, 15, 0),
|
||||
(11365, 3, 15, 0),
|
||||
(11365, 4, 15, 0),
|
||||
(11365, 5, 15, 0),
|
||||
(11365, 6, 15, 0),
|
||||
(11339, 2, 15, 0),
|
||||
(11339, 3, 15, 0),
|
||||
(11339, 4, 15, 0),
|
||||
(11339, 5, 15, 0),
|
||||
(11339, 6, 15, 0),
|
||||
(15067, 2, 15, 0),
|
||||
(15067, 3, 15, 0),
|
||||
(15067, 4, 15, 0),
|
||||
(15067, 5, 15, 0),
|
||||
(15067, 6, 15, 0),
|
||||
(14515, 2, 15, 0),
|
||||
(14515, 3, 15, 0),
|
||||
(14515, 4, 15, 0),
|
||||
(14515, 5, 15, 0),
|
||||
(14515, 6, 15, 0),
|
||||
(14883, 2, 15, 0),
|
||||
(14883, 3, 15, 0),
|
||||
(14883, 4, 15, 0),
|
||||
(14883, 5, 15, 0),
|
||||
(14883, 6, 15, 0),
|
||||
(14825, 2, 15, 0),
|
||||
(14825, 3, 15, 0),
|
||||
(14825, 4, 15, 0),
|
||||
(14825, 5, 15, 0),
|
||||
(14825, 6, 15, 0),
|
||||
(14882, 2, 15, 0),
|
||||
(14882, 3, 15, 0),
|
||||
(14882, 4, 15, 0),
|
||||
(14882, 5, 15, 0),
|
||||
(14882, 6, 15, 0),
|
||||
(11380, 2, 15, 0),
|
||||
(11380, 3, 15, 0),
|
||||
(11380, 4, 15, 0),
|
||||
(11380, 5, 15, 0),
|
||||
(11380, 6, 15, 0),
|
||||
(11359, 2, 15, 0),
|
||||
(11359, 3, 15, 0),
|
||||
(11359, 4, 15, 0),
|
||||
(11359, 5, 15, 0),
|
||||
(11359, 6, 15, 0),
|
||||
(11357, 2, 15, 0),
|
||||
(11357, 3, 15, 0),
|
||||
(11357, 4, 15, 0),
|
||||
(11357, 5, 15, 0),
|
||||
(11357, 6, 15, 0),
|
||||
(11389, 2, 15, 0),
|
||||
(11389, 3, 15, 0),
|
||||
(11389, 4, 15, 0),
|
||||
(11389, 5, 15, 0),
|
||||
(11389, 6, 15, 0),
|
||||
(11390, 2, 15, 0),
|
||||
(11390, 3, 15, 0),
|
||||
(11390, 4, 15, 0),
|
||||
(11390, 5, 15, 0),
|
||||
(11390, 6, 15, 0),
|
||||
(14834, 2, 15, 0),
|
||||
(14834, 3, 15, 0),
|
||||
(14834, 4, 15, 0),
|
||||
(14834, 5, 15, 0),
|
||||
(14834, 6, 15, 0);
|
||||
@@ -452,7 +452,9 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGU
|
||||
|
||||
uint8 playerLevel = _session->GetPlayer() ? _session->GetPlayer()->getLevel() : 0;
|
||||
data << uint32(quest->GetRewOrReqMoney(playerLevel));
|
||||
data << uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate());
|
||||
uint32 questXp = uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate());
|
||||
sScriptMgr->OnQuestComputeXP(_session->GetPlayer(), quest, questXp);
|
||||
data << questXp;
|
||||
}
|
||||
|
||||
// rewarded honor points. Multiply with 10 to satisfy client
|
||||
@@ -680,7 +682,9 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* quest, ObjectGuid npcGUI
|
||||
uint8 playerLevel = _session->GetPlayer() ? _session->GetPlayer()->getLevel() : 0;
|
||||
|
||||
data << uint32(quest->GetRewOrReqMoney(playerLevel));
|
||||
data << uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate());
|
||||
uint32 questXp = uint32(quest->XPValue(playerLevel) * _session->GetPlayer()->GetQuestRate());
|
||||
sScriptMgr->OnQuestComputeXP(_session->GetPlayer(), quest, questXp);
|
||||
data << questXp;
|
||||
|
||||
// rewarded honor points. Multiply with 10 to satisfy client
|
||||
data << uint32(10 * quest->CalculateHonorGain(_session->GetPlayer()->GetQuestLevel(quest)));
|
||||
|
||||
@@ -600,6 +600,11 @@ void Player::CompleteQuest(uint32 quest_id)
|
||||
return;
|
||||
}
|
||||
|
||||
if (!sScriptMgr->OnBeforePlayerQuestComplete(this, quest_id))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
|
||||
|
||||
auto log_slot = FindQuestSlot(quest_id);
|
||||
|
||||
@@ -1788,14 +1788,42 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta
|
||||
// Not allow disarm unarmed player
|
||||
if (Mechanic == MECHANIC_DISARM)
|
||||
{
|
||||
if (unitTarget->GetTypeId() == TYPEID_PLAYER)
|
||||
bool valid = false;
|
||||
for (uint8 i = BASE_ATTACK; i < MAX_ATTACK; ++i)
|
||||
{
|
||||
Player const* player = unitTarget->ToPlayer();
|
||||
if (!player->GetWeaponForAttack(BASE_ATTACK, true))
|
||||
return SPELL_FAILED_TARGET_NO_WEAPONS;
|
||||
AuraType disarmAuraType = SPELL_AURA_MOD_DISARM;
|
||||
switch (i)
|
||||
{
|
||||
case OFF_ATTACK:
|
||||
disarmAuraType = SPELL_AURA_MOD_DISARM_OFFHAND;
|
||||
break;
|
||||
case RANGED_ATTACK:
|
||||
disarmAuraType = SPELL_AURA_MOD_DISARM_RANGED;
|
||||
break;
|
||||
}
|
||||
|
||||
if (HasAura(disarmAuraType))
|
||||
{
|
||||
if (Player const* player = unitTarget->ToPlayer())
|
||||
{
|
||||
if (player->GetWeaponForAttack(WeaponAttackType(BASE_ATTACK + i), true))
|
||||
{
|
||||
valid = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (unitTarget->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i))
|
||||
{
|
||||
valid = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (!unitTarget->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID))
|
||||
|
||||
if (!valid)
|
||||
{
|
||||
return SPELL_FAILED_TARGET_NO_WEAPONS;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user