diff options
| author | QAston <qaston@gmail.com> | 2011-06-26 13:56:11 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-06-26 13:56:11 +0200 |
| commit | 557e06b1c1e09341f2dc429c4564b493019e2070 (patch) | |
| tree | 40970b28f631146c2644acd15d8877966e0846d9 /sql | |
| parent | ac88fa026f7996444a865dd15ea8955e22b90d99 (diff) | |
| parent | bcd62b8d298089313534de7b3280e34255c56742 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'sql')
5 files changed, 13 insertions, 4 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 9cf49eb561e..45c971dd970 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -2048,10 +2048,10 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES ( 72440, 'spell_deathbringer_blood_nova'), ( 72378, 'spell_deathbringer_blood_nova_targeting'), ( 73058, 'spell_deathbringer_blood_nova_targeting'), -( 72255, 'spell_deathbringer_mark_of_the_fallen_champion'), -( 72444, 'spell_deathbringer_mark_of_the_fallen_champion'), -( 72445, 'spell_deathbringer_mark_of_the_fallen_champion'), -( 72446, 'spell_deathbringer_mark_of_the_fallen_champion'), +( 72385, 'spell_deathbringer_boiling_blood'), +( 72441, 'spell_deathbringer_boiling_blood'), +( 72442, 'spell_deathbringer_boiling_blood'), +( 72443, 'spell_deathbringer_boiling_blood'), ( 72155, 'spell_icc_harvest_blight_specimen'), ( 72162, 'spell_icc_harvest_blight_specimen'), ( 71123, 'spell_stinky_precious_decimate'), diff --git a/sql/updates/world/2011_06_26_00_world_spell_script_names.sql b/sql/updates/world/2011_06_26_00_world_spell_script_names.sql new file mode 100644 index 00000000000..0a7323b14bd --- /dev/null +++ b/sql/updates/world/2011_06_26_00_world_spell_script_names.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_mark_of_the_fallen_champion'; diff --git a/sql/updates/world/2011_06_26_01_world_command.sql b/sql/updates/world/2011_06_26_01_world_command.sql new file mode 100644 index 00000000000..d5ac88cfc4c --- /dev/null +++ b/sql/updates/world/2011_06_26_01_world_command.sql @@ -0,0 +1 @@ +DELETE FROM `command` WHERE `name`='pet tp'; diff --git a/sql/updates/world/2011_06_26_02_world_spell_script_names.sql b/sql/updates/world/2011_06_26_02_world_spell_script_names.sql new file mode 100644 index 00000000000..cde210b091c --- /dev/null +++ b/sql/updates/world/2011_06_26_02_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_boiling_blood'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(72385,'spell_deathbringer_boiling_blood'), +(72441,'spell_deathbringer_boiling_blood'), +(72442,'spell_deathbringer_boiling_blood'), +(72443,'spell_deathbringer_boiling_blood'); diff --git a/sql/updates/world/2011_06_26_03_world_spell_dbc.sql b/sql/updates/world/2011_06_26_03_world_spell_dbc.sql new file mode 100644 index 00000000000..d618976707c --- /dev/null +++ b/sql/updates/world/2011_06_26_03_world_spell_dbc.sql @@ -0,0 +1 @@ +UPDATE `spell_dbc` SET `Effect1`=28, `EffectMiscValueB1`=64 WHERE `Id`=24308; |