diff options
author | Nay <dnpd.dd@gmail.com> | 2013-07-16 23:51:11 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2013-07-16 23:51:11 +0100 |
commit | ff3524fabc52e3986fd63a00804be45c442b6738 (patch) | |
tree | 708836a6a6c22ab76eee2a2f2ffd671606ef0680 /sql | |
parent | 187878f9c4da4fcc9fc373e72c7aa6c55d40c0e2 (diff) | |
parent | 0e4816771a6e8ba6dcf4d81386d96841ff3c02a2 (diff) |
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'sql')
-rw-r--r-- | sql/updates/world/2013_07_16_00_world_misc.sql | 4 | ||||
-rw-r--r-- | sql/updates/world/2013_07_16_01_world_gameobject.sql | 1 | ||||
-rw-r--r-- | sql/updates/world/2013_07_16_02_world_conditions.sql | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sql/updates/world/2013_07_16_00_world_misc.sql b/sql/updates/world/2013_07_16_00_world_misc.sql index 1b9624c5e0b..449919e44e2 100644 --- a/sql/updates/world/2013_07_16_00_world_misc.sql +++ b/sql/updates/world/2013_07_16_00_world_misc.sql @@ -9,8 +9,8 @@ INSERT INTO `game_graveyard_zone` (`id`, `ghost_zone`, `faction`) VALUES DELETE FROM `gameobject` WHERE `guid` IN (5216, 5222); INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES -(5216, 202277, 533, 15, 1, 3495.97, -5357.84, 144.9645, 0.5410506, 0, 0, 0, 1, 7200, 255, 1), -- Orb of Naxxramas -(5222, 202278, 533, 15, 1, 2997.675, -3437.799, 304.1996, 1.151916, 0, 0, 0, 1, 7200, 255, 1); -- Orb of Naxxramas +(5216, 202277, 533, 3, 1, 3495.97, -5357.84, 144.9645, 0.5410506, 0, 0, 0, 1, 7200, 255, 1), -- Orb of Naxxramas +(5222, 202278, 533, 3, 1, 2997.675, -3437.799, 304.1996, 1.151916, 0, 0, 0, 1, 7200, 255, 1); -- Orb of Naxxramas -- Teleportation positions for Orbs from sniff - TODO: add db coords for spell 72613 DELETE FROM `spell_target_position` WHERE `id` IN (28444, 72617); diff --git a/sql/updates/world/2013_07_16_01_world_gameobject.sql b/sql/updates/world/2013_07_16_01_world_gameobject.sql new file mode 100644 index 00000000000..ef5624ee090 --- /dev/null +++ b/sql/updates/world/2013_07_16_01_world_gameobject.sql @@ -0,0 +1 @@ +UPDATE `gameobject` SET `spawnMask`=3 WHERE `guid` IN (5216,5222); diff --git a/sql/updates/world/2013_07_16_02_world_conditions.sql b/sql/updates/world/2013_07_16_02_world_conditions.sql new file mode 100644 index 00000000000..5b89e1b93d3 --- /dev/null +++ b/sql/updates/world/2013_07_16_02_world_conditions.sql @@ -0,0 +1 @@ +UPDATE `conditions` SET `ConditionValue2`=1 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1443 AND `ConditionTypeOrReference`=7 AND `ConditionValue1` IN (171,185); |