diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-06 12:01:51 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-12-06 12:01:51 +0100 |
| commit | fe69bd654a424f560f37774d5c3e763fd6589607 (patch) | |
| tree | 0f4a8ef0e26a0aabfea98d5800076003ee11ce3e /sql | |
| parent | b0d106944b155babf22dd1837da2017180589b0c (diff) | |
| parent | 15c24a4e971e2808976d9844a60767442b51ae5e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
Diffstat (limited to 'sql')
3 files changed, 11 insertions, 0 deletions
diff --git a/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql b/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..9fea807a97c --- /dev/null +++ b/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql @@ -0,0 +1,3 @@ +DELETE FROM achievement_criteria_data WHERE criteria_id = 3693; +INSERT INTO achievement_criteria_data VALUES +(3693, 11, 0, 0, 'achievement_bg_control_all_nodes'); diff --git a/sql/updates/world/2011_11_29_00_world_spell_script.sql b/sql/updates/world/2011_11_29_00_world_spell_script.sql new file mode 100644 index 00000000000..ff87ebff788 --- /dev/null +++ b/sql/updates/world/2011_11_29_00_world_spell_script.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_damage_reduction_aura' AND `spell_id`=50720; +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_vigilance'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(50720,'spell_warr_vigilance'); -- Vigilance diff --git a/sql/updates/world/2011_12_03_00_world_gameobject.sql b/sql/updates/world/2011_12_03_00_world_gameobject.sql new file mode 100644 index 00000000000..5707ee28d12 --- /dev/null +++ b/sql/updates/world/2011_12_03_00_world_gameobject.sql @@ -0,0 +1,4 @@ +DELETE FROM `gameobject` WHERE `guid` IN (207,215) AND `id`=300245; -- TEMP Forgemaster''s Anvil +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(207, 300245, 658, 3, 1, 637.954, -209.544, 533.269, 3.53903, 0, 0, 0.980321, -0.197413, 300, 0, 1), +(215, 300245, 658, 3, 1, 726.268, -237.654, 534.13, 5.5732, 0, 0, 0.347582, -0.93765, 300, 0, 1); |