josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mmaps

Browse Source 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
Nay
2012-09-10 00:54:29 +01:00
parent 8966347a41 7a8652c06f
commit 4896a1775e
16 changed files with 150 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
+10
View File
@@ -0,0 +1,10 @@
-- Gift of the Naaru
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_gift_of_naaru';
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(28880,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_WARRIOR
(59542,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_PALADIN
(59543,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_HUNTER
(59544,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_PRIEST
(59545,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_DEATHKNIGHT
(59547,'spell_gen_gift_of_naaru'), -- SPELLFAMILY_SHAMAN
(59548,'spell_gen_gift_of_naaru'); -- SPELLFAMILY_MAGE
sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql
+9
View File
@@ -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');
sql/updates/world/2012_09_09_04_world_quest_template.sql
+1
View File
@@ -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;