Skip to content

Commit 9f9adb1

Browse files
author
Rochet2
committed
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
2 parents d6a67f0 + b5ef0d2 commit 9f9adb1

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- Add Malister's Frost Wand spell target condition
2+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=40969;
3+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES
4+
(17, 0, 40969, 0, 0, 31, 1, 3, 23689, 0, 0, "Malister's Frost Wand only hits Proto-Drake");
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- Duggan Wildhammer faction
2+
UPDATE `creature_template` SET `faction`=1055 WHERE `entry`=10817;
3+
4+
-- Duggan Wildhammer equipment
5+
UPDATE `creature_equip_template` SET `ItemID1`=12951, `VerifiedBuild`=0 WHERE `CreatureID`=10817 AND `ID`=1;
6+
7+
-- Remove again event
8+
DELETE FROM `smart_scripts` WHERE `entryorguid`=10817 AND `source_type`=0 AND `id` > 2;
9+
DELETE FROM `creature_text` WHERE `CreatureID`=10817;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--
2+
UPDATE `gameobject` SET `position_x`=-8747.79, `position_y`=-2256.47, `position_z`=153.350, `orientation`=0.855903 WHERE `guid`=18679 AND `id`=1731;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--
2+
UPDATE `creature_template_movement` SET `Ground` = 1, `Flight` = 0 WHERE `CreatureId` = 2830;

0 commit comments

Comments
 (0)