diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-10 00:52:35 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-10 00:52:35 +0100 |
| commit | d6743c7c958cacb29e1948a31d1f5189a408fede (patch) | |
| tree | b64c7e5586c50afdf8599732f469aecee7232ded /sql | |
| parent | 5963d02750e7b5028af80b35b4f2052ccd198d83 (diff) | |
| parent | 7a8652c06f71e430c3cff9667edcbb0335be7cc0 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
Diffstat (limited to 'sql')
3 files changed, 14 insertions, 0 deletions
diff --git a/sql/updates/2012_09_09_02_world_spell_script_names_434.sql b/sql/updates/2012_09_09_02_world_spell_script_names_434.sql new file mode 100644 index 00000000000..a4304663d9c --- /dev/null +++ b/sql/updates/2012_09_09_02_world_spell_script_names_434.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_warl_banish','spell_warl_create_healthstone','spell_warl_ritual_of_doom_effect'); +INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES +(710,'spell_warl_banish'), +(6201,'spell_warl_create_healthstone'); diff --git a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql b/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql new file mode 100644 index 00000000000..a08c494da1b --- /dev/null +++ b/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql @@ -0,0 +1,9 @@ +DELETE FROM `spell_bonus_data` WHERE `entry` IN (28880,59542,59543,59544,59545,59547,59548); +INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES +(28880,0,0,0,0,'Warrior - Gift of the Naaru'), +(59542,0,0,0,0,'Paladin - Gift of the Naaru'), +(59543,0,0,0,0,'Hunter - Gift of the Naaru'), +(59544,0,0,0,0,'Priest - Gift of the Naaru'), +(59545,0,0,0,0,'Deathknight - Gift of the Naaru'), +(59547,0,0,0,0,'Shaman - Gift of the Naaru'), +(59548,0,0,0,0,'Mage - Gift of the Naaru'); diff --git a/sql/updates/world/2012_09_09_04_world_quest_template.sql b/sql/updates/world/2012_09_09_04_world_quest_template.sql new file mode 100644 index 00000000000..418c5badb36 --- /dev/null +++ b/sql/updates/world/2012_09_09_04_world_quest_template.sql @@ -0,0 +1 @@ +UPDATE `quest_template` SET `OfferRewardText`='Excellent, $N. You''ve saved me a lot of work!$b$bBut don''t think that I''m not grateful!' WHERE `Id`=6571; |