diff options
81 files changed, 251 insertions, 220 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index 894f1c56d1d..f33773743b2 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -1,4 +1,4 @@ --- Up to TC2 3515 +-- Up to TC2 4321 -- -- trinityscript_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts. -- valid entries for table are between -1000000 and -1999999 @@ -343,13 +343,10 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content (-1000425, 'Ah. I remember now! I gave the mysterious fossil to Hollee! Check with her.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'remtravel SAY_REM_REMEMBER'), (-1000426, '%s goes back to work, oblivious to everything around him.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 7, 0, 'remtravel EMOTE_REM_END'), (-1000427, 'Something tells me this $r wants the mysterious fossil too. Help!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'remtravel SAY_REM_AGGRO'), - (-1000428, 'Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_1'), (-1000429, 'Hey, look out with that kodo! You had better inspect that beast before i give you credit!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_2'), (-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'kodo round SAY_SMEED_HOME_3'); - - -- -1 033 000 SHADOWFANG KEEP INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1033000, 'Follow me and I''ll open the courtyard door for you.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 1, 'prisoner ashcrombe SAY_FREE_AS'), diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql index 6c73a8e9c90..1b073b8f33b 100644 --- a/sql/FULL/world_script_waypoints.sql +++ b/sql/FULL/world_script_waypoints.sql @@ -1,4 +1,4 @@ --- Up to TC2 3515 +-- Up to TC2 4321 -- This file contains all waypoints used by escortAI scripts DROP TABLE IF EXISTS script_waypoint; diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index d0caeba039f..ff54cbf4569 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -1,4 +1,4 @@ --- Up to TC2 4006 +-- Up to TC2 4321 /* WORLD BOSS */ UPDATE `creature_template` SET `ScriptName`='boss_ysondre' WHERE `entry`=14887; @@ -424,6 +424,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_alexstrasza_wr_gate' WHERE `ent /* DEADWIND PASS */ /* DESOLACE */ +UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627); /* DIRE MAUL */ @@ -488,7 +489,6 @@ UPDATE `creature_template` SET `ScriptName`='boss_krosh_firehand' WHERE `entry`= /* HELLFIRE CITADEL */ /* BLOOD FURNACE */ -/* The Maker,Broggok,Kelidan,Broggok's cloud */ UPDATE `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542; UPDATE `creature_template` SET `ScriptName`='boss_the_maker' WHERE `entry`=17381; UPDATE `creature_template` SET `ScriptName`='boss_broggok' WHERE `entry`=17380; @@ -683,6 +683,16 @@ UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry` UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415; UPDATE `creature_template` SET `ScriptName`='npc_commander_dawnforge' WHERE `entry`=19831; +/* THE NEXUS */ +UPDATE `instance_template` SET `script`='instance_nexus' WHERE `map`=576; +UPDATE `creature_template` SET `ScriptName`='boss_magus_telestra' WHERE `entry`=26731; +UPDATE `creature_template` SET `ScriptName`='boss_anomalus' WHERE `entry`=26763; +UPDATE `creature_template` SET `ScriptName`='mob_chaotic_rift' WHERE `entry`=26918 +UPDATE `creature_template` SET `ScriptName`='boss_ormorok' WHERE `entry`=26794; +UPDATE `creature_template` SET `ScriptName`='mob_crystal_spike' WHERE `entry`=27099; +UPDATE `creature_template` SET `ScriptName`='mob_crystalline_tangler' WHERE `entry`=32665; +UPDATE `creature_template` SET `ScriptName`='boss_keristrasza' WHERE `entry`=26723; + /* ONYXIA'S LAIR */ UPDATE `creature_template` SET `ScriptName`='boss_onyxia' WHERE `entry`=10184; @@ -1078,32 +1088,11 @@ UPDATE `creature_template` SET `ScriptName`='mob_batrider' WHERE `entry`=14965; UPDATE `creature_template` SET `ScriptName`='mob_shade_of_jindo' WHERE `entry`=14986; UPDATE `creature_template` SET `ScriptName`='mob_ohgan' WHERE `entry`=14988; - - --- Grand Magus Telestra -update `creature_template` set `ScriptName`='boss_magus_telestra' where `entry`=26731; - --- Anomalus -update `creature_template` set `ScriptName`='boss_anomalus' where `entry`=26763; -update `creature_template` set `ScriptName`='mob_chaotic_rift' where `entry`=26918; - --- Ormorok the Tree-Shaper -update `creature_template` set `ScriptName`='boss_ormorok' where `entry`=26794; -update `creature_template` set `ScriptName`='mob_crystal_spike' where `entry`=27099; -update `creature_template` set `ScriptName`='mob_crystalline_tangler' where `entry`=32665; - --- Keristrasza -update `creature_template` set `ScriptName`='boss_keristrasza' where `entry`=26723; - --- Instance script -update `instance_template` set `script`='instance_nexus' where `map`=576; - -- -------- -- EVENT AI -- -------- - -UPDATE creature_template set AIName = 'EventAI' where entry in (26796, 26798, 26929, 26928, 26930); -DELETE FROM `creature_ai_scripts` WHERE `creature_id` in (26796, 26798, 26929, 26928, 26930); +UPDATE `creature_template` SET `AIName` = 'EventAI' WHERE entry IN (26796, 26798, 26929, 26928, 26930); +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (26796, 26798, 26929, 26928, 26930); INSERT INTO `creature_ai_scripts` VALUES -- Commander Stoutbeard ( 2679600, 26796, 4, 0, 100, 4, 0, 0, 0, 0, 28, 0, 47543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Commander Stoutbeard - crystal prison remove'), @@ -1131,6 +1120,4 @@ INSERT INTO `creature_ai_scripts` VALUES ( 2693003, 26930, 0, 0, 100, 3, 9000, 9000, 15000, 16000, 11, 47727, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Magus Telestra frost - cast blizzard N'), ( 2693004, 26930, 0, 0, 100, 5, 9000, 9000, 15000, 16000, 11, 56936, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Magus Telestra frost - cast blizzard H'); - - -/* EOF */ +/* EOF */
\ No newline at end of file diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index f4ad2cbc48c..42fdce82132 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -1,4 +1,4 @@ --- Up to TC2 4018 +-- Up to TC2 4321 -- -------- -- LINKED @@ -493,6 +493,15 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (54744,1,0), (54746,1,0); +-- For quest The Denouncement and The Restless Dead +DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806); +INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES +('48714', '2', '27237'), +('48714', '2', '27235'), +('48714', '2', '27234'), +('48714', '2', '27236'), +('57806', '2', '31043'); + -- -------- -- POSITION -- -------- @@ -1512,7 +1521,9 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (48743, 1, 26125); -- Death pact -- Eye of Acherus -REPLACE into `spell_target_position` values (51852, 609, 2361.21, -5660.45, 503.828, 4.49); +DELETE FROM `spell_target_position` WHERE `id`=51852; +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(51852, 609, 2361.21, -5660.45, 503.828, 4.49); update creature_template set minlevel=50,maxlevel=52,minhealth=2215,maxhealth=2317,faction_A=2084,faction_H=2084,mindmg=50,maxdmg=50 where entry=28528; -- ghoul UPDATE `creature_template` SET spell1=52372,spell2=52373,spell3=52374,spell4=52375 WHERE `entry`=28406; @@ -1528,15 +1539,24 @@ UPDATE creature_template SET `VehicleId`=200 WHERE `entry` IN (28605,28606,28607 -- Vehicle and summon spell(summon npc 28788) for Acherus Deathcharger UPDATE creature_template SET `spell1`=52362, `VehicleId`=200 WHERE `entry`=28782; -replace into creature_questrelation (id,quest) VALUES (28377,12701); -replace into creature_involvedrelation (id,quest) VALUES (28377,12701); -replace into creature_involvedrelation (id,quest) VALUES (28914,12723); -replace into creature_questrelation (id,quest) VALUES (28914,12724); -replace into creature_involvedrelation (id,quest) VALUES (28914,12724); -replace into creature_questrelation (id,quest) VALUES (28913,12725); -replace into creature_involvedrelation (id,quest) VALUES (28912,12725); -replace into creature_questrelation (id,quest) VALUES (28912,12727); -replace into creature_involvedrelation (id,quest) VALUES (28913,12727); +DELETE FROM `creature_questrelation` WHERE `quest`=12701; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12701; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12723; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723); +DELETE FROM `creature_questrelation` WHERE `quest`=12724; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12724; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_questrelation` WHERE `quest`=12725; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12725; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725); +DELETE FROM `creature_questrelation` WHERE `quest`=12727; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12727; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727); DELETE FROM `npc_spellclick_spells` WHERE `spell_id` IN ( 54568, 54575, 52263, 52280, 52447); diff --git a/sql/updates/3649_world.sql b/sql/updates/3649_world.sql index a75ebe7b158..bc40d7f6438 100644 --- a/sql/updates/3649_world.sql +++ b/sql/updates/3649_world.sql @@ -2,5 +2,4 @@ UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entr UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_stasis' WHERE `entry` BETWEEN 185465 AND 185467; UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_stasis' WHERE `entry` = 184595; UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_stasis' WHERE `entry` BETWEEN 185461 AND 185464; - -UPDATE `creature_template` SET `ScriptName` = 'npc_engineering_tele_trinket' WHERE `entry` IN (14742, 14743, 21493, 21494); +UPDATE `creature_template` SET `ScriptName` = 'npc_engineering_tele_trinket' WHERE `entry` IN (14742, 14743, 21493, 21494);
\ No newline at end of file diff --git a/sql/updates/3689_TC1_1534_world.sql b/sql/updates/3689_TC1_1534_world.sql index cde0c50bf3b..774e0f7ec1b 100644 --- a/sql/updates/3689_TC1_1534_world.sql +++ b/sql/updates/3689_TC1_1534_world.sql @@ -1,2 +1,2 @@ UPDATE `creature_template` SET `ScriptName` = 'mob_ethereal_apprentice' WHERE `entry` = 18430; -DELETE FROM `creature` WHERE `id` = 18431; +DELETE FROM `creature` WHERE `id` = 18431;
\ No newline at end of file diff --git a/sql/updates/3691_TC1_919_world.sql b/sql/updates/3691_TC1_919_world.sql index 644daa2776a..02e35d5a423 100644 --- a/sql/updates/3691_TC1_919_world.sql +++ b/sql/updates/3691_TC1_919_world.sql @@ -1,2 +1,2 @@ ALTER TABLE version - ADD `core_revision` varchar(120) AFTER `core_version`; + ADD `core_revision` varchar(120) AFTER `core_version`;
\ No newline at end of file diff --git a/sql/updates/3715_mangos_7932_01_characters_character_pet.sql b/sql/updates/3715_mangos_7932_01_characters_character_pet.sql index f4ecf2b15ee..7f272c92004 100644 --- a/sql/updates/3715_mangos_7932_01_characters_character_pet.sql +++ b/sql/updates/3715_mangos_7932_01_characters_character_pet.sql @@ -5,4 +5,4 @@ UPDATE character_pet UPDATE character_pet SET abdata = SUBSTRING_INDEX(SUBSTRING_INDEX(abdata,' ',(10-3)*2),' ',-(10-3-3)*2) - WHERE length(SUBSTRING_INDEX(abdata, ' ', 20)) < length(abdata) and length(SUBSTRING_INDEX(abdata, ' ', 21)) >= length(abdata); + WHERE length(SUBSTRING_INDEX(abdata, ' ', 20)) < length(abdata) and length(SUBSTRING_INDEX(abdata, ' ', 21)) >= length(abdata);
\ No newline at end of file diff --git a/sql/updates/3724_world.sql b/sql/updates/3724_world.sql index 1269925e0ee..36c8a75c3d1 100644 --- a/sql/updates/3724_world.sql +++ b/sql/updates/3724_world.sql @@ -7,4 +7,4 @@ UPDATE creature_template SET `ScriptName`='npc_ros_dark_rider' WHERE `entry`=287 -- Spellclick spell to mount deathcharger DELETE FROM npc_spellclick_spells WHERE `npc_entry`=28782; INSERT INTO npc_spellclick_spells (`npc_entry`, `spell_id`, `quest_id`, `quest_status`, `cast_flags`) VALUES -(28782, 52280, 12687, 3, 1); +(28782, 52280, 12687, 3, 1);
\ No newline at end of file diff --git a/sql/updates/3729_mangos_7938_01_realmd_account.sql b/sql/updates/3729_mangos_7938_01_realmd_account.sql index 05fde4e7eb7..01c16d0b0bb 100644 --- a/sql/updates/3729_mangos_7938_01_realmd_account.sql +++ b/sql/updates/3729_mangos_7938_01_realmd_account.sql @@ -1,4 +1,4 @@ /*ALTER TABLE realmd_db_version CHANGE COLUMN required_7867_01_realmd_account required_7938_01_realmd_account bit;*/ ALTER TABLE account - CHANGE id id int(11) unsigned NOT NULL auto_increment COMMENT 'Identifier'; + CHANGE id id int(11) unsigned NOT NULL auto_increment COMMENT 'Identifier';
\ No newline at end of file diff --git a/sql/updates/3736_world_spell_dk.sql b/sql/updates/3736_world_spell_dk.sql index c4097fef37e..4aa0c6b557c 100644 --- a/sql/updates/3736_world_spell_dk.sql +++ b/sql/updates/3736_world_spell_dk.sql @@ -1,3 +1,3 @@ DELETE FROM spell_area WHERE spell = 52693; INSERT INTO spell_area (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES -(52693, 4298, 12687, 1, 12687, 0, 0, 0, 1); +(52693, 4298, 12687, 1, 12687, 0, 0, 0, 1);
\ No newline at end of file diff --git a/sql/updates/3747_mangos_7945_01_quest_template.sql b/sql/updates/3747_mangos_7945_01_quest_template.sql index ab28ccd50f3..8c32bceaf55 100644 --- a/sql/updates/3747_mangos_7945_01_quest_template.sql +++ b/sql/updates/3747_mangos_7945_01_quest_template.sql @@ -6,4 +6,4 @@ ALTER TABLE quest_template ADD COLUMN `OfferRewardEmoteDelay1` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmote4`, ADD COLUMN `OfferRewardEmoteDelay2` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay1`, ADD COLUMN `OfferRewardEmoteDelay3` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay2`, - ADD COLUMN `OfferRewardEmoteDelay4` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay3`; + ADD COLUMN `OfferRewardEmoteDelay4` int(11) unsigned NOT NULL default '0' AFTER `OfferRewardEmoteDelay3`;
\ No newline at end of file diff --git a/sql/updates/3791_characters_ahbot.sql b/sql/updates/3791_characters_ahbot.sql index 85c0b14bac4..91dffb1f8c0 100644 --- a/sql/updates/3791_characters_ahbot.sql +++ b/sql/updates/3791_characters_ahbot.sql @@ -1,3 +1,3 @@ ALTER TABLE `auctionhousebot` DROP COLUMN `minTime`, - DROP COLUMN `maxTime`; + DROP COLUMN `maxTime`;
\ No newline at end of file diff --git a/sql/updates/3801_world_spell.sql b/sql/updates/3801_world_spell.sql index 8fabcad1c58..5ca6a9ba95a 100644 --- a/sql/updates/3801_world_spell.sql +++ b/sql/updates/3801_world_spell.sql @@ -4,4 +4,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell DELETE FROM `spell_affect` WHERE `entry` IN (44544); INSERT INTO `spell_affect` (`entry`, `effectId`, `SpellClassMask0`, `SpellClassMask1`, `SpellClassMask2`) VALUES -(44544,0,685904631,1151048,0); -- Fingers of frost +(44544,0,685904631,1151048,0); -- Fingers of frost
\ No newline at end of file diff --git a/sql/updates/3808_world.sql b/sql/updates/3808_world.sql index 24ce276bd1e..78498da4599 100644 --- a/sql/updates/3808_world.sql +++ b/sql/updates/3808_world.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `ScriptName` = 'npc_salanar_the_horseman' WHERE `entry` = 28788; +UPDATE `creature_template` SET `ScriptName` = 'npc_salanar_the_horseman' WHERE `entry` = 28788;
\ No newline at end of file diff --git a/sql/updates/3810_world_spell_bonus_data.sql b/sql/updates/3810_world_spell_bonus_data.sql index 1803687d6a4..dd06d889e4f 100644 --- a/sql/updates/3810_world_spell_bonus_data.sql +++ b/sql/updates/3810_world_spell_bonus_data.sql @@ -91,4 +91,4 @@ INSERT INTO spell_bonus_data( entry, ap_bonus, comments ) VALUES ('50536', '0.013', 'DK - Unholy Blight (Rank1)'), ('51373', '0.013', 'DK - Unholy Blight (Rank2)'), ('51374', '0.013', 'DK - Unholy Blight (Rank3)'), -('51375', '0.013', 'DK - Unholy Blight (Rank4)'); +('51375', '0.013', 'DK - Unholy Blight (Rank4)');
\ No newline at end of file diff --git a/sql/updates/3813_world_spell_dk.sql b/sql/updates/3813_world_spell_dk.sql index ee12a70afd0..8b8afdccc12 100644 --- a/sql/updates/3813_world_spell_dk.sql +++ b/sql/updates/3813_world_spell_dk.sql @@ -1,10 +1,8 @@ +UPDATE `creature_template` SET maxhealth = 133525, minhealth = 133525, maxmana = 51360, minmana = 51360, spell1 = 53114, spell2 = 53112, spell3=53110, VehicleId = 156 where entry = 28670; UPDATE `creature_template` SET `ScriptName`='npc_dkc1_gothik' WHERE `entry`=28658; -- gift of harvester -DELETE FROM `spell_script_target` WHERE entry IN -(52479); +DELETE FROM `spell_script_target` WHERE entry IN (52479); INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (52479,1,28819), -(52479,1,28822); - -update creature_template set maxhealth = 133525, minhealth = 133525, maxmana = 51360, minmana = 51360, spell1 = 53114, spell2 = 53112, spell3=53110, VehicleId = 156 where entry = 28670; +(52479,1,28822);
\ No newline at end of file diff --git a/sql/updates/3851_characters_aura.sql b/sql/updates/3851_characters_aura.sql index 762f8b795b3..966665ac776 100644 --- a/sql/updates/3851_characters_aura.sql +++ b/sql/updates/3851_characters_aura.sql @@ -1 +1 @@ -DELETE FROM `character_aura` WHERE `spell` IN (48714,57806); +DELETE FROM `character_aura` WHERE `spell` IN (48714,57806);
\ No newline at end of file diff --git a/sql/updates/3851_world_spell.sql b/sql/updates/3851_world_spell.sql index ed10e84808c..4475c24f0e8 100644 --- a/sql/updates/3851_world_spell.sql +++ b/sql/updates/3851_world_spell.sql @@ -5,4 +5,4 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES ('48714', '2', '27235'), ('48714', '2', '27234'), ('48714', '2', '27236'), -('57806', '2', '31043'); +('57806', '2', '31043');
\ No newline at end of file diff --git a/sql/updates/3856_world_spell_naxx.sql b/sql/updates/3856_world_spell_naxx.sql index 3b3895b3c4d..725451fafd1 100644 --- a/sql/updates/3856_world_spell_naxx.sql +++ b/sql/updates/3856_world_spell_naxx.sql @@ -6,4 +6,4 @@ ON DUPLICATE KEY UPDATE baseattacktime = VALUES(baseattacktime), spell1 = VALUES(spell1), flags_extra = VALUES(flags_extra), -scriptname = VALUES(scriptname); +scriptname = VALUES(scriptname);
\ No newline at end of file diff --git a/sql/updates/3869_world_access_requirement.sql b/sql/updates/3869_world_access_requirement.sql index d6ccad3e197..4ead0543c48 100644 --- a/sql/updates/3869_world_access_requirement.sql +++ b/sql/updates/3869_world_access_requirement.sql @@ -1 +1 @@ -ALTER TABLE `access_requirement` ADD COLUMN `heroic_level_min` tinyint(3) unsigned NOT NULL default '0' AFTER `level_min`; +ALTER TABLE `access_requirement` ADD COLUMN `heroic_level_min` tinyint(3) unsigned NOT NULL default '0' AFTER `level_min`;
\ No newline at end of file diff --git a/sql/updates/3870_mangos_7980_01_world_item_required_target.sql b/sql/updates/3870_mangos_7980_01_world_item_required_target.sql index 7853e496a2d..b80f5f9eac6 100644 --- a/sql/updates/3870_mangos_7980_01_world_item_required_target.sql +++ b/sql/updates/3870_mangos_7980_01_world_item_required_target.sql @@ -6,4 +6,4 @@ CREATE TABLE `item_required_target` ( `type` tinyint(3) unsigned NOT NULL default '0', `targetEntry` mediumint(8) unsigned NOT NULL default '0', UNIQUE KEY `entry_type_target` (`entry`,`type`,`targetEntry`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
\ No newline at end of file diff --git a/sql/updates/3873_world_spell_dk.sql b/sql/updates/3873_world_spell_dk.sql index 09d130a4f6b..7c8b2abce78 100644 --- a/sql/updates/3873_world_spell_dk.sql +++ b/sql/updates/3873_world_spell_dk.sql @@ -1,25 +1,28 @@ - -replace into creature_questrelation (id,quest) VALUES (28377,12701); -replace into creature_involvedrelation (id,quest) VALUES (28377,12701); -replace into creature_involvedrelation (id,quest) VALUES (28914,12723); -replace into creature_questrelation (id,quest) VALUES (28914,12724); -replace into creature_involvedrelation (id,quest) VALUES (28914,12724); -replace into creature_questrelation (id,quest) VALUES (28913,12725); -replace into creature_involvedrelation (id,quest) VALUES (28912,12725); -replace into creature_questrelation (id,quest) VALUES (28912,12727); -replace into creature_involvedrelation (id,quest) VALUES (28913,12727); - - +DELETE FROM `creature_questrelation` WHERE `quest`=12701; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12701; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12723; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723); +DELETE FROM `creature_questrelation` WHERE `quest`=12724; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12724; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724); +DELETE FROM `creature_questrelation` WHERE `quest`=12725; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12725; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725); +DELETE FROM `creature_questrelation` WHERE `quest`=12727; +INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727); +DELETE FROM `creature_involvedrelation` WHERE `quest`=12727; +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727); DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (28833,28887); INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_id`, `quest_status`, `cast_flags`) VALUES (28833, 52447, 12701, 3, 3), (28887, 52447, 12701, 3, 3); - UPDATE creature_template SET spell1=52435,spell2=52576,spell5=52588,VehicleId=68,speed=0 WHERE entry IN (28833,28887); UPDATE creature_template SET spell1=52211 WHERE entry=28864; - -DELETE FROM `spell_script_target` WHERE entry IN -(52576); +DELETE FROM `spell_script_target` WHERE entry IN (52576); INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (52576,1,28834), -(52576,1,28886); +(52576,1,28886);
\ No newline at end of file diff --git a/sql/updates/3877_world_spell_script_target.sql b/sql/updates/3877_world_spell_script_target.sql index 57392c547d3..9778be52466 100644 --- a/sql/updates/3877_world_spell_script_target.sql +++ b/sql/updates/3877_world_spell_script_target.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_script_target` WHERE `entry` IN (48743); INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES -('48743', '1', '26125'); +('48743', '1', '26125');
\ No newline at end of file diff --git a/sql/updates/3886_world_script_nexus.sql b/sql/updates/3886_world_script_nexus.sql index e02e67a689a..031a314b8b6 100644 --- a/sql/updates/3886_world_script_nexus.sql +++ b/sql/updates/3886_world_script_nexus.sql @@ -1,23 +1,23 @@ -- Grand Magus Telestra -update `creature_template` set `ScriptName`='boss_magus_telestra' where `entry`=26731; +UPDATE `creature_template` SET `ScriptName`='boss_magus_telestra' WHERE `entry`=26731; -- Anomalus -update `creature_template` set `ScriptName`='boss_anomalus' where `entry`=26763; -update `creature_template` set `ScriptName`='mob_chaotic_rift' where `entry`=26918; +UPDATE `creature_template` SET `ScriptName`='boss_anomalus' WHERE `entry`=26763; +UPDATE `creature_template` SET `ScriptName`='mob_chaotic_rift' WHERE `entry`=26918; -- Ormorok the Tree-Shaper -update `creature_template` set `ScriptName`='boss_ormorok' where `entry`=26794; -update `creature_template` set `ScriptName`='mob_crystal_spike' where `entry`=27099; -update `creature_template` set `ScriptName`='mob_crystalline_tangler' where `entry`=32665; +UPDATE `creature_template` SET `ScriptName`='boss_ormorok' WHERE `entry`=26794; +UPDATE `creature_template` SET `ScriptName`='mob_crystal_spike' WHERE `entry`=27099; +UPDATE `creature_template` SET `ScriptName`='mob_crystalline_tangler' WHERE `entry`=32665; -- Keristrasza -update `creature_template` set `ScriptName`='boss_keristrasza' where `entry`=26723; +UPDATE `creature_template` SET `ScriptName`='boss_keristrasza' WHERE `entry`=26723; -- Instance script -update `instance_template` set `script`='instance_nexus' where `map`=576; +UPDATE `instance_template` SET `script`='instance_nexus' WHERE `map`=576; -UPDATE creature_template set AIName = 'EventAI' where entry in (26796, 26798, 26929, 26928, 26930); -DELETE FROM `creature_ai_scripts` WHERE `creature_id` in (26796, 26798, 26929, 26928, 26930); +UPDATE `creature_template` SET `AIName` = 'EventAI' WHERE entry IN (26796, 26798, 26929, 26928, 26930); +DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (26796, 26798, 26929, 26928, 26930); INSERT INTO `creature_ai_scripts` VALUES -- Commander Stoutbeard ( 2679600, 26796, 4, 0, 100, 4, 0, 0, 0, 0, 28, 0, 47543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Commander Stoutbeard - crystal prison remove'), @@ -46,7 +46,8 @@ INSERT INTO `creature_ai_scripts` VALUES ( 2693004, 26930, 0, 0, 100, 5, 9000, 9000, 15000, 16000, 11, 56936, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Magus Telestra frost - cast blizzard H'); -- Grand Magus Telestra -REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576005 AND -1576000; +INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1576000,'You know what they say about curiosity.',13319,1,0,0,'grand magus telestra SAY_AGGRO'), (-1576001,'Death becomes you!',13324,1,0,0,'grand magus telestra SAY_KILL'), (-1576002,'Damn the... luck.',13320,1,0,0,'grand magus telestra SAY_DEATH'), @@ -55,14 +56,16 @@ REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `langu (-1576005,'I\'ll give you more than you can handle.',13322,1,0,0,'grand magus telestra SAY_SPLIT_2'); -- Anomalus -REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576013 AND -1576010; +INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1576010,'Chaos beckons.',13186,1,0,0,'anomalus SAY_AGGRO'), (-1576011,'Of course.',13187,1,0,0,'anomalus SAY_DEATH'), (-1576012,'Reality... unwoven.',13188,1,0,0,'anomalus SAY_RIFT'), (-1576013,'Indestructible.',13189,1,0,0,'anomalus SAY_SHIELD'); -- Ormorok the Tree-Shaper -REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576024 AND -1576020; +INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1576020,'Noo!',13328,1,0,0,'ormorok SAY_AGGRO'), (-1576021,'Aaggh!',13330,1,0,0,'ormorok SAY_DEATH'), (-1576022,'Back!',13331,1,0,0,'ormorok SAY_REFLECT'), @@ -70,10 +73,10 @@ REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `langu (-1576024,'Aaggh! Kill!',13329,1,0,0,'ormorok SAY_KILL'); -- Keristrasza -REPLACE INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576044 AND -1576040; +INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1576040,'Preserve? Why? There\'s no truth in it. No no no... only in the taking! I see that now!',13450,1,0,0,'keristrasza SAY_AGGRO'), (-1576041,'Now we\'ve come to the truth!',13453,1,0,0,'keristrasza SAY_SLAY'), (-1576042,'Finish it! FINISH IT! Kill me, or I swear by the Dragonqueen you\'ll never see daylight again!',13452,1,0,0,'keristrasza SAY_ENRAGE'), (-1576043,'Dragonqueen... Life-Binder... preserve... me.',13454,1,0,0,'keristrasza SAY_DEATH'), -(-1576044,'Stay. Enjoy your final moments.',13451,1,0,0,'keristrasza SAY_CRYSTAL_NOVA'); - +(-1576044,'Stay. Enjoy your final moments.',13451,1,0,0,'keristrasza SAY_CRYSTAL_NOVA');
\ No newline at end of file diff --git a/sql/updates/3899_world_spell_proc_event.sql b/sql/updates/3899_world_spell_proc_event.sql index bc8b159bd9a..968c82ec29b 100644 --- a/sql/updates/3899_world_spell_proc_event.sql +++ b/sql/updates/3899_world_spell_proc_event.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (18096, 18073); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES (18096, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Pyroclasm (Rank 1) -(18073, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Pyroclasm (Rank 2) +(18073, 0x00, 5, 0x00000060, 0x00800080, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Pyroclasm (Rank 2)
\ No newline at end of file diff --git a/sql/updates/3901_world_spell_proc_event.sql b/sql/updates/3903_world_spell_proc_event.sql index ab534ece0a8..4f333311d2d 100644 --- a/sql/updates/3901_world_spell_proc_event.sql +++ b/sql/updates/3903_world_spell_proc_event.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (56249); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES -(56249, 0x00, 5, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0, 0, 0); -- Glyph of Felhunter +(56249, 0x00, 5, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0, 0, 0); -- Glyph of Felhunter
\ No newline at end of file diff --git a/sql/updates/3910_world.sql b/sql/updates/3910_world.sql index 2e0d54fc545..4ba20cb5f6e 100644 --- a/sql/updates/3910_world.sql +++ b/sql/updates/3910_world.sql @@ -69,4 +69,4 @@ INSERT INTO `script_waypoint` VALUES (2917, 41, 4671.924316, 599.752197, 16.01242, 5000, 'SAY_REM_REMEMBER'), (2917, 42, 4676.976074, 600.649780, 17.82566, 5000, 'EMOTE_REM_END'); -UPDATE `creature_template` SET `ScriptName` = 'npc_myranda_the_hag' WHERE `entry` = 11872; +UPDATE `creature_template` SET `ScriptName` = 'npc_myranda_the_hag' WHERE `entry` = 11872;
\ No newline at end of file diff --git a/sql/updates/3920_characters_309-313_converter.sql b/sql/updates/3920_characters_309-313_converter.sql index 812217daf8e..e9a19fed39f 100644 --- a/sql/updates/3920_characters_309-313_converter.sql +++ b/sql/updates/3920_characters_309-313_converter.sql @@ -1,4 +1,3 @@ - CREATE TABLE `character_equipmentsets` ( `guid` int(11) NOT NULL default '0', `setguid` bigint(20) NOT NULL auto_increment, @@ -28,10 +27,8 @@ CREATE TABLE `character_equipmentsets` ( UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - UPDATE characters SET data = REPLACE(data,' ',' '); UPDATE characters SET data = CONCAT(TRIM(data),' '); - UPDATE `characters` SET `data` = CONCAT( SUBSTRING_INDEX(`data`, ' ', 257 + 1), ' ', SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 1), ' ', -261 + 260 - 1), ' ', @@ -62,6 +59,5 @@ UPDATE `characters` SET `data` = CONCAT( SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1700 + 1), ' ', -1700 + 1699 - 1), ' ' ) WHERE length(SUBSTRING_INDEX(data, ' ', 1700)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1701)) >= length(data); - UPDATE characters SET data = REPLACE(data,' ',' '); -UPDATE characters SET data = CONCAT(TRIM(data),' '); +UPDATE characters SET data = CONCAT(TRIM(data),' ');
\ No newline at end of file diff --git a/sql/updates/3920_world_309-313_converter.sql b/sql/updates/3920_world_309-313_converter.sql index c0b23c83626..1d911e2c4b1 100644 --- a/sql/updates/3920_world_309-313_converter.sql +++ b/sql/updates/3920_world_309-313_converter.sql @@ -1,66 +1,66 @@ -alter table `item_template` - drop column `dmg_type3`, - drop column `dmg_max3`, - drop column `dmg_min3`, - drop column `dmg_type4`, - drop column `dmg_max4`, - drop column `dmg_min4`, - drop column `dmg_type5`, - drop column `dmg_max5`, - drop column `dmg_min5`; +ALTER TABLE `item_template` + DROP COLUMN `dmg_type3`, + DROP COLUMN `dmg_max3`, + DROP COLUMN `dmg_min3`, + DROP COLUMN `dmg_type4`, + DROP COLUMN `dmg_max4`, + DROP COLUMN `dmg_min4`, + DROP COLUMN `dmg_type5`, + DROP COLUMN `dmg_max5`, + DROP COLUMN `dmg_min5`; -alter table `creature_template` - add column `unk1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `heroic_entry`, - add column `unk2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `unk1`, - add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `RacialLeader`, - add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`, - add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`, - add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`, - add column `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem4`; +ALTER TABLE `creature_template` + ADD COLUMN `unk1` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `heroic_entry`, + ADD COLUMN `unk2` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `unk1`, + ADD COLUMN `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `RacialLeader`, + ADD COLUMN `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem1`, + ADD COLUMN `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem2`, + ADD COLUMN `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem3`, + ADD COLUMN `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem4`; -alter table `item_template` - add column `HolidayId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `ItemLimitCategory`; +ALTER TABLE `item_template` + ADD COLUMN `HolidayId` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `ItemLimitCategory`; -alter table `gameobject_template` - add column `unk1` varchar(100) NOT NULL default '' after `castBarCaption`, - add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `size`, - add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`, - add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`, - add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`; +ALTER TABLE `gameobject_template` + ADD COLUMN `unk1` varchar(100) NOT NULL default '' AFTER `castBarCaption`, + ADD COLUMN `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `size`, + ADD COLUMN `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem1`, + ADD COLUMN `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem2`, + ADD COLUMN `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `questItem3`; DELETE FROM `spell_bonus_data` WHERE `entry` IN (18265); /* Blackout removed */ -DELETE FROM spell_proc_event WHERE entry IN (15268, 15269, 15323, 15324, 15325, 15326); +DELETE FROM `spell_proc_event` WHERE `entry` IN (15268, 15269, 15323, 15324, 15325, 15326); /* Improved Wing Clip removed */ -DELETE FROM spell_proc_event WHERE entry IN (19228, 19232, 19233); +DELETE FROM `spell_proc_event` WHERE `entry` IN (19228, 19232, 19233); /* Shadow Mastery, not have charges now */ -DELETE FROM spell_proc_event WHERE entry IN (17794,17797,17798,17799,17800); +DELETE FROM `spell_proc_event` WHERE `entry` IN (17794,17797,17798,17799,17800); /* Lightning Overload have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (30680,30681); +DELETE FROM `spell_proc_event` WHERE `entry` IN (30680,30681); /* Unleashed Rage have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (30806,30807,30810,30811); +DELETE FROM `spell_proc_event` WHERE `entry` IN (30806,30807,30810,30811); /* Concussive Barrage have 2 ranks now, 1 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (35103); +DELETE FROM `spell_proc_event` WHERE `entry` IN (35103); /* Demonic Empathy, removed */ -DELETE FROM spell_proc_event WHERE entry IN (47232,47234,47235); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47232,47234,47235); /* Rapture have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (47538,47539); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47538,47539); /* Psychic Horror have 1 rank now, 1 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (47572); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47572); /* Sudden Doom have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (49531,49532); +DELETE FROM `spell_proc_event` WHERE `entry` IN (49531,49532); /* Hunting Party have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (53293,53294); +DELETE FROM `spell_proc_event` WHERE `entry` IN (53293,53294); /* Righteous Vengeance have 3 ranks now, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (53383,53384); +DELETE FROM `spell_proc_event` WHERE `entry` IN (53383,53384); /* Night of the Dead not have charges now */ -DELETE FROM spell_proc_event WHERE entry IN (55620,55623); +DELETE FROM `spell_proc_event` WHERE `entry` IN (55620,55623); /* Pandemic have 1 rank, 2 dropped */ -DELETE FROM spell_proc_event WHERE entry IN (58436,58437); +DELETE FROM `spell_proc_event` WHERE `entry` IN (58436,58437); /* Improved Holy Concentration, removed */ -DELETE FROM spell_proc_event WHERE entry IN (47549,47551,47552); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47549,47551,47552); /* Serendipity, replace by aanother spell ids */ -DELETE FROM spell_proc_event WHERE entry IN (47555,47556,47557); +DELETE FROM `spell_proc_event` WHERE `entry` IN (47555,47556,47557); /* T.N.T. non triggring now */ -DELETE FROM spell_proc_event WHERE entry IN (56333,56336,56337); +DELETE FROM `spell_proc_event` WHERE `entry` IN (56333,56336,56337);
\ No newline at end of file diff --git a/sql/updates/3927_world_spell_proc_event.sql b/sql/updates/3927_world_spell_proc_event.sql index 526afb8c48c..a3a6cf77083 100644 --- a/sql/updates/3927_world_spell_proc_event.sql +++ b/sql/updates/3927_world_spell_proc_event.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (59088, 59089, 58388, 56374); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES (59088, 0x00, 4, 0x00000000, 0x00000002, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Improved Spell Reflection (59089, 0x00, 4, 0x00000000, 0x00000002, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Improved Spell Reflection -(56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0); -- Glyph of icy veins +(56374, 0x00, 3, 0x00000000, 0x00004000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0); -- Glyph of icy veins
\ No newline at end of file diff --git a/sql/updates/3943_world_spell_proc_event.sql b/sql/updates/3943_world_spell_proc_event.sql index 7d4c96caefe..5776d411995 100644 --- a/sql/updates/3943_world_spell_proc_event.sql +++ b/sql/updates/3943_world_spell_proc_event.sql @@ -5,4 +5,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (52610, -52610); INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES ( 52610, 62071, 0, 'Savage Roar'), -( -52610, -62071, 0, 'Savage Roar'); +( -52610, -62071, 0, 'Savage Roar');
\ No newline at end of file diff --git a/sql/updates/3947_world_spell_proc_event.sql b/sql/updates/3947_world_spell_proc_event.sql index 6859fc95049..620e46603c5 100644 --- a/sql/updates/3947_world_spell_proc_event.sql +++ b/sql/updates/3947_world_spell_proc_event.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (53397); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES -(53397, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0); -- Invigoration +(53397, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0); -- Invigoration
\ No newline at end of file diff --git a/sql/updates/3951_world_spell_proc_event.sql b/sql/updates/3951_world_spell_proc_event.sql index ec0d9d960d7..d2f6a2c7993 100644 --- a/sql/updates/3951_world_spell_proc_event.sql +++ b/sql/updates/3951_world_spell_proc_event.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (53646); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES -(53646, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0); -- Demonic Pact +(53646, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0); -- Demonic Pact
\ No newline at end of file diff --git a/sql/updates/3952_world_spell_pet_auras.sql b/sql/updates/3952_world_spell_pet_auras.sql index ec9083db0a4..9dd0b2a800e 100644 --- a/sql/updates/3952_world_spell_pet_auras.sql +++ b/sql/updates/3952_world_spell_pet_auras.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_pet_auras` WHERE `spell` IN (18754, 18755, 18756); INSERT INTO `spell_pet_auras` VALUES (18754,65536,18754), (18755,65536,18755), -(18756,65536,18756); +(18756,65536,18756);
\ No newline at end of file diff --git a/sql/updates/3954_world_spell_bonus_data.sql b/sql/updates/3954_world_spell_bonus_data.sql index d4731936bff..7cf7f4bf032 100644 --- a/sql/updates/3954_world_spell_bonus_data.sql +++ b/sql/updates/3954_world_spell_bonus_data.sql @@ -1,4 +1,4 @@ -DELETE FROM `spell_bonus_data` where entry in (31893, 32221, 31898, 32220, 53719, 53718, 53726, 53725); +DELETE FROM `spell_bonus_data` WHERE entry IN (31893, 32221, 31898, 32220, 53719, 53718, 53726, 53725); INSERT INTO `spell_bonus_data` VALUES (31893, 0, 0, 0, "Paladin - Seal of Blood Proc Enemy"), (32221, 0, 0, 0, "Paladin - Seal of Blood Proc Self"), @@ -7,4 +7,4 @@ INSERT INTO `spell_bonus_data` VALUES (53719, 0, 0, 0, "Paladin - Seal of the Martyr Proc Enemy"), (53718, 0, 0, 0, "Paladin - Seal of the Martyr Proc Self"), (53726, 0.25, 0, 0.16, "Paladin - Judgement of the Martyr Enemy"), -(53725, 0.0833, 0, 0.0533, "Paladin - Judgement of the Martyr Self"); +(53725, 0.0833, 0, 0.0533, "Paladin - Judgement of the Martyr Self");
\ No newline at end of file diff --git a/sql/updates/3956_world_spell_proc_event.sql b/sql/updates/3956_world_spell_proc_event.sql index a7dcc25e025..93d7b212d62 100644 --- a/sql/updates/3956_world_spell_proc_event.sql +++ b/sql/updates/3956_world_spell_proc_event.sql @@ -1 +1 @@ -DELETE FROM `spell_proc_event` WHERE `entry` IN (49531,49532); +DELETE FROM `spell_proc_event` WHERE `entry` IN (49531,49532);
\ No newline at end of file diff --git a/sql/updates/3968_world_spell_proc_event.sql b/sql/updates/3969_world_spell_proc_event.sql index bca25a6ebe0..fcefd99dbd9 100644 --- a/sql/updates/3968_world_spell_proc_event.sql +++ b/sql/updates/3969_world_spell_proc_event.sql @@ -39,4 +39,4 @@ INSERT INTO `spell_proc_event`(`entry`, `SchoolMask`, `SpellFamilyName`, `SpellF (33297, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Quagmirrans Eye (38299, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 15), -- Fel Reavers Piston (59630, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Black Magic -(61356, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000002A8, 0x00000002, 0, 0, 90); -- Invigorating Earthsiege Diamond +(61356, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000002A8, 0x00000002, 0, 0, 90); -- Invigorating Earthsiege Diamond
\ No newline at end of file diff --git a/sql/updates/3991_world_spell_proc_event.sql b/sql/updates/3991_world_spell_proc_event.sql index 6998b68612e..2defb092d52 100644 --- a/sql/updates/3991_world_spell_proc_event.sql +++ b/sql/updates/3991_world_spell_proc_event.sql @@ -1,8 +1,4 @@ -DELETE FROM `spell_proc_event` WHERE `entry` IN - (28716, 31221, 31222, 31223, 31571, 31572, 31871, 31872, 44745, 61257, - 59089, 59088, 58426, 57352, 57318, 56374, 56372, 56337, 56336, - 56333, 54787, 53375, 53376, 47570, 47569, 47537, 47536, 47535, 63108); - +DELETE FROM `spell_proc_event` WHERE `entry` IN (28716, 31221, 31222, 31223, 31571, 31572, 31871, 31872, 44745, 61257, 59089, 59088, 58426, 57352, 57318, 56374, 56372, 56337, 56336, 56333, 54787, 53375, 53376, 47570, 47569, 47537, 47536, 47535, 63108); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES ( 28716, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00044000, 0x00000000, 0, 0, 0), -- Rejuvenation ( 31221, 0x00, 8, 0x00400000, 0x00000000, 0x00000000, 0x00000400, 0x00006001, 0, 0, 0), -- Master of Subtlety (Rank 1) @@ -27,4 +23,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 47535, 0x00, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000400, 0x00002000, 0, 0, 12), -- Rapture (Rank 1) ( 47536, 0x00, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000400, 0x00002000, 0, 0, 12), -- Rapture (Rank 2) ( 47537, 0x00, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000400, 0x00002000, 0, 0, 12), -- Rapture (Rank 3) -( 63108, 0x00, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Siphon Life +( 63108, 0x00, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Siphon Life
\ No newline at end of file diff --git a/sql/updates/3998_sd2.sql b/sql/updates/3998_sd2.sql index 20c9785464b..a0601ab86ef 100644 --- a/sql/updates/3998_sd2.sql +++ b/sql/updates/3998_sd2.sql @@ -4,4 +4,4 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen (-1000408, '%s eats his lunch.',0,2,0,0,'kyle EMOTE_EAT_LUNCH'), (-1000409, '%s thanks you with a special dance.',0,2,0,0,'kyle EMOTE_DANCE'); -UPDATE creature_template SET ScriptName='npc_kyle_frenzied' WHERE entry=23616; +UPDATE `creature_template` SET `ScriptName`='npc_kyle_frenzied' WHERE `entry`=23616;
\ No newline at end of file diff --git a/sql/updates/3999_sd2.sql b/sql/updates/3999_sd2.sql index aefda08bd2e..2e09a329e4a 100644 --- a/sql/updates/3999_sd2.sql +++ b/sql/updates/3999_sd2.sql @@ -2,4 +2,4 @@ DELETE FROM script_texts WHERE entry BETWEEN -1000342 AND -1000340; INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES (-1000340, 'We made it! Thanks, $N. I couldn''t have gotten without you.', 0, 0, 0, 0, 'npc_deathstalker_erland - SAY_THANKS'), (-1000341, 'It''s good to see you again, Erland. What is your report?', 0, 0, 0, 0, 'npc_deathstalker_erland - SAY_RANE'), -(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden''s Orchard is gone.', 0, 0, 0, 0, 'npc_deathstalker_erland - SAY_ANSWER'); +(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden''s Orchard is gone.', 0, 0, 0, 0, 'npc_deathstalker_erland - SAY_ANSWER');
\ No newline at end of file diff --git a/sql/updates/4000_world_spell_proc_event.sql b/sql/updates/4002_world_spell_proc_event.sql index d426dc437cb..cec219053e3 100644 --- a/sql/updates/4000_world_spell_proc_event.sql +++ b/sql/updates/4002_world_spell_proc_event.sql @@ -5,4 +5,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 50885, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Talons ( 50886, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Talons ( 50887, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Talons -( 55610, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Improved Icy Talons +( 55610, 0x00, 15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Improved Icy Talons
\ No newline at end of file diff --git a/sql/updates/4003_world_script_waypoint.sql b/sql/updates/4003_world_script_waypoint.sql index 603115f72c0..410c06d4190 100644 --- a/sql/updates/4003_world_script_waypoint.sql +++ b/sql/updates/4003_world_script_waypoint.sql @@ -25,4 +25,4 @@ INSERT INTO script_waypoint VALUES (17969, 22, -524.745483, 5443.945313, 20.977013, 0, ''), (17969, 23, -502.984985, 5446.283691, 22.149435, 0, ''), (17969, 24, -472.463959, 5449.546875, 22.561453, 0, ''), -(17969, 25, -454.533264, 5461.302246, 22.602837, 30000, 'quest complete'); +(17969, 25, -454.533264, 5461.302246, 22.602837, 30000, 'quest complete');
\ No newline at end of file diff --git a/sql/updates/4006_sd2.sql b/sql/updates/4006_sd2.sql index 8ac01de7acf..49d341ce377 100644 --- a/sql/updates/4006_sd2.sql +++ b/sql/updates/4006_sd2.sql @@ -1,10 +1,10 @@ UPDATE creature_template SET ScriptName='' WHERE entry=466; UPDATE script_texts SET content_default='UNUSED', language=0, comment='REUSE ME' WHERE entry=-1000005; -UPDATE creature_template SET ScriptName='npc_aged_dying_ancient_kodo' WHERE entry IN (4700, 4701, 4702, 11627); +UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627); DELETE FROM script_texts WHERE entry BETWEEN -1000430 AND -1000428; INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES (-1000428, 'Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me.',0,0,0,0,'kodo round SAY_SMEED_HOME_1'), (-1000429, 'Hey, look out with that kodo! You had better inspect that beast before i give you credit!',0,0,0,0,'kodo round SAY_SMEED_HOME_2'), -(-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.',0,0,0,0,'kodo round SAY_SMEED_HOME_3'); +(-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.',0,0,0,0,'kodo round SAY_SMEED_HOME_3');
\ No newline at end of file diff --git a/sql/updates/4016_world_spell_dk.sql b/sql/updates/4016_world_spell_dk.sql index 205b579baec..b478562f946 100644 --- a/sql/updates/4016_world_spell_dk.sql +++ b/sql/updates/4016_world_spell_dk.sql @@ -1,4 +1,3 @@ -DELETE FROM `spell_script_target` WHERE entry IN -(53110); +DELETE FROM `spell_script_target` WHERE entry IN(53110); INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES -(53110,1,28940); +(53110,1,28940);
\ No newline at end of file diff --git a/sql/updates/4023_world_spell_proc_event.sql b/sql/updates/4023_world_spell_proc_event.sql index 4a9c17edfdd..caa53b3c119 100644 --- a/sql/updates/4023_world_spell_proc_event.sql +++ b/sql/updates/4023_world_spell_proc_event.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (51521, 51522); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES ( 51521, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Improved Stormspike -( 51522, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Improved Stormspike +( 51522, 0x00, 11, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Improved Stormspike
\ No newline at end of file diff --git a/sql/updates/4030_world.sql b/sql/updates/4030_world.sql index 579bfa49d23..2e21be5c4c2 100644 --- a/sql/updates/4030_world.sql +++ b/sql/updates/4030_world.sql @@ -1 +1 @@ -UPDATE creature_template SET ScriptName='npc_nestlewood_owlkin' WHERE entry=16518; +UPDATE `creature_template` SET `ScriptName`='npc_nestlewood_owlkin' WHERE `entry`=16518;
\ No newline at end of file diff --git a/sql/updates/4031_world_spell_proc_event.sql b/sql/updates/4031_world_spell_proc_event.sql index f887ea24b9e..a68371bbaa5 100644 --- a/sql/updates/4031_world_spell_proc_event.sql +++ b/sql/updates/4031_world_spell_proc_event.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (51698, 51700, 51701); INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES ( 51698, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1), -- Honor Among Thieves ( 51700, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1), -- Honor Among Thieves -( 51701, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1); -- Honor Among Thieves +( 51701, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1); -- Honor Among Thieves
\ No newline at end of file diff --git a/sql/updates/4032_world_spell_proc_event.sql b/sql/updates/4032_world_spell_proc_event.sql index 25c0b56ccdb..238fd8d1ead 100644 --- a/sql/updates/4032_world_spell_proc_event.sql +++ b/sql/updates/4032_world_spell_proc_event.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (51209, 50334); INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (51209, 55095, 1, 'Hungering cold - frost fever'), -(50334, 58923, 2, 'Berserk - modify target number aura'); +(50334, 58923, 2, 'Berserk - modify target number aura');
\ No newline at end of file diff --git a/sql/updates/4043_world_npc_spellclick_spells.sql b/sql/updates/4043_world_npc_spellclick_spells.sql index 52b731f5817..eceee12bc91 100644 --- a/sql/updates/4043_world_npc_spellclick_spells.sql +++ b/sql/updates/4043_world_npc_spellclick_spells.sql @@ -9,8 +9,7 @@ UPDATE npc_spellclick_spells SET quest_end = quest_start, quest_start_active = 1 WHERE quest_start <> 0; -DELETE FROM `npc_spellclick_spells` WHERE `spell_id` IN ( -54568, 54575, 52263, 52280, 52447); +DELETE FROM `npc_spellclick_spells` WHERE `spell_id` IN (54568, 54575, 52263, 52280, 52447); INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES (29488, 54568, 12670, 1, 0, 3), -- Taxi to Death's Breath (29501, 54575, 12670, 1, 0, 3), @@ -23,6 +22,8 @@ INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `qu DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (29912); INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES -(29912, 55479, 0, 0, 0, 3); # Obedience Crystal - Force Obedience +(29912, 55479, 0, 0, 0, 3); -- Obedience Crystal - Force Obedience -REPLACE into `spell_target_position` values (51852, 609, 2361.21, -5660.45, 503.828, 4.49); +DELETE FROM `spell_target_position` WHERE `id`=51852; +INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES +(51852, 609, 2361.21, -5660.45, 503.828, 4.49);
\ No newline at end of file diff --git a/sql/updates/4045_world_spell_proc_event.sql b/sql/updates/4045_world_spell_proc_event.sql index fc1034ec746..6104f0d0782 100644 --- a/sql/updates/4045_world_spell_proc_event.sql +++ b/sql/updates/4045_world_spell_proc_event.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (51483,51485,51486); INSERT INTO `spell_proc_event` VALUES (51483, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0.000000, 0.000000, 0), (51485, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0.000000, 0.000000, 0), -(51486, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0.000000, 0.000000, 0); +(51486, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file diff --git a/sql/updates/4063_TC1_1569_world_scripts.sql b/sql/updates/4063_TC1_1569_world_scripts.sql index 5fc2287a851..afe0759e711 100644 --- a/sql/updates/4063_TC1_1569_world_scripts.sql +++ b/sql/updates/4063_TC1_1569_world_scripts.sql @@ -1,3 +1,3 @@ -- Razorfen Kraul UPDATE `instance_template` SET `script` = 'instance_razorfen_kraul' WHERE `map` = '47' LIMIT 1; -UPDATE `creature_template` SET `ScriptName` = 'npc_deaths_head_ward_keeper' WHERE `entry` = '4625' LIMIT 1; +UPDATE `creature_template` SET `ScriptName` = 'npc_deaths_head_ward_keeper' WHERE `entry` = '4625' LIMIT 1;
\ No newline at end of file diff --git a/sql/updates/4066_world_spell_proc_event.sql b/sql/updates/4066_world_spell_proc_event.sql index 08adad1a28e..00480d9d6d7 100644 --- a/sql/updates/4066_world_spell_proc_event.sql +++ b/sql/updates/4066_world_spell_proc_event.sql @@ -6,4 +6,4 @@ INSERT INTO `spell_proc_event` VALUES ( 64976, 0x00, 4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Juggernaut ( 64343, 0x00, 3, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Impact ( 63158, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation -( 63156, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Decimation +( 63156, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Decimation
\ No newline at end of file diff --git a/sql/updates/4081_world.sql b/sql/updates/4081_world.sql index 7f6528c6eb5..4eb5898681a 100644 --- a/sql/updates/4081_world.sql +++ b/sql/updates/4081_world.sql @@ -12,4 +12,4 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm (57482,57484,2,'Kindred Spirits'), (57453,57483,2,'Kindred Spirits'), (57457,57482,2,'Kindred Spirits'), -(57458,57475,2,'Kindred Spirits'); +(57458,57475,2,'Kindred Spirits');
\ No newline at end of file diff --git a/sql/updates/4105_8030_01_characters_character_spell.sql b/sql/updates/4105_8030_01_characters_character_spell.sql index 5d65fce8ff2..332d0e4d071 100644 --- a/sql/updates/4105_8030_01_characters_character_spell.sql +++ b/sql/updates/4105_8030_01_characters_character_spell.sql @@ -4,4 +4,4 @@ UPDATE IGNORE character_spell SET spell = 64901 WHERE spell = 64904; -DELETE FROM character_spell WHERE spell = 64904; +DELETE FROM character_spell WHERE spell = 64904;
\ No newline at end of file diff --git a/sql/updates/4105_8030_02_characters_character_action.sql b/sql/updates/4105_8030_02_characters_character_action.sql index 5588350efe0..c3bf50933ea 100644 --- a/sql/updates/4105_8030_02_characters_character_action.sql +++ b/sql/updates/4105_8030_02_characters_character_action.sql @@ -2,4 +2,4 @@ UPDATE character_action SET action = 64901 - WHERE action = 64904 AND type = '0'; + WHERE action = 64904 AND type = '0';
\ No newline at end of file diff --git a/sql/updates/4105_8030_03_mangos_npc_trainer.sql b/sql/updates/4105_8030_03_mangos_npc_trainer.sql index 2b6f04b25e7..d8c7cf383c7 100644 --- a/sql/updates/4105_8030_03_mangos_npc_trainer.sql +++ b/sql/updates/4105_8030_03_mangos_npc_trainer.sql @@ -1,3 +1,3 @@ -- ALTER TABLE db_version CHANGE COLUMN required_8021_01_mangos_spell_proc_event required_8030_03_mangos_npc_trainer bit; -DELETE FROM npc_trainer WHERE spell = 64904; +DELETE FROM npc_trainer WHERE spell = 64904;
\ No newline at end of file diff --git a/sql/updates/4115_world_sd2.sql b/sql/updates/4115_world_sd2.sql index ede0c591d57..f538963a7d6 100644 --- a/sql/updates/4115_world_sd2.sql +++ b/sql/updates/4115_world_sd2.sql @@ -3,4 +3,4 @@ UPDATE creature_template SET ScriptName='boss_leotheras_the_blind_demonform' WHE UPDATE script_texts SET content_default='Finally, my banishment ends!' WHERE entry=-1548009; UPDATE script_texts SET content_default='Be gone, trifling elf. I am in control now!' WHERE entry=-1548010; -UPDATE script_texts SET content_default='No... no! What have you done? I am the master! Do you hear me? I am... aaggh! Can\'t... contain him...' WHERE entry=-1548018; +UPDATE script_texts SET content_default='No... no! What have you done? I am the master! Do you hear me? I am... aaggh! Can\'t... contain him...' WHERE entry=-1548018;
\ No newline at end of file diff --git a/sql/updates/4154_world_script.sql b/sql/updates/4154_world_script.sql index 1372842790b..a87168e79ad 100644 --- a/sql/updates/4154_world_script.sql +++ b/sql/updates/4154_world_script.sql @@ -1 +1 @@ -UPDATE creature_template SET ScriptName='npc_air_force_bots' WHERE entry IN (2614, 2615, 21974, 21993, 21996, 21997, 21999, 22001, 22002, 22003, 22063, 22065, 22066, 22068, 22069, 22070, 22071, 22078, 22079, 22080, 22086, 22087, 22088, 22090, 22124, 22125, 22126); +UPDATE creature_template SET ScriptName='npc_air_force_bots' WHERE entry IN (2614, 2615, 21974, 21993, 21996, 21997, 21999, 22001, 22002, 22003, 22063, 22065, 22066, 22068, 22069, 22070, 22071, 22078, 22079, 22080, 22086, 22087, 22088, 22090, 22124, 22125, 22126);
\ No newline at end of file diff --git a/sql/updates/4159_world.sql b/sql/updates/4159_world.sql index 00778695c76..a52e64998f8 100644 --- a/sql/updates/4159_world.sql +++ b/sql/updates/4159_world.sql @@ -11,4 +11,4 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte DELETE FROM `command` WHERE `name` = 'lookup map'; INSERT INTO `command` (`name`, `security`, `help`) VALUES -('lookup map', 3, 'Syntax: .lookup map $namepart\r\n\r\nLooks up a map by $namepart, and returns all matches with their map ID''s.'); +('lookup map', 3, 'Syntax: .lookup map $namepart\r\n\r\nLooks up a map by $namepart, and returns all matches with their map ID''s.');
\ No newline at end of file diff --git a/sql/updates/4174_world_script.sql b/sql/updates/4174_world_script.sql index ed3f599dd7c..b4b52f2fae2 100644 --- a/sql/updates/4174_world_script.sql +++ b/sql/updates/4174_world_script.sql @@ -1 +1 @@ -UPDATE instance_template SET script='instance_blackfathom_deeps' WHERE map=48; +UPDATE `instance_template` SET `script`='instance_blackfathom_deeps' WHERE `map`=48;
\ No newline at end of file diff --git a/sql/updates/4176_world.sql b/sql/updates/4176_world.sql index 3ba9e7a8ae1..be7c68354bb 100644 --- a/sql/updates/4176_world.sql +++ b/sql/updates/4176_world.sql @@ -1,2 +1,2 @@ UPDATE `trinity_string` SET `content_default` = '[Raid reset time: %s]' WHERE `entry` = 5017; -UPDATE `trinity_string` SET `content_default` = '[Heroic reset time: %s]' WHERE `entry` = 5018; +UPDATE `trinity_string` SET `content_default` = '[Heroic reset time: %s]' WHERE `entry` = 5018;
\ No newline at end of file diff --git a/sql/updates/4209_characters_TDB.sql b/sql/updates/4209_characters_TDB.sql new file mode 100644 index 00000000000..323c5eb69ee --- /dev/null +++ b/sql/updates/4209_characters_TDB.sql @@ -0,0 +1 @@ +ALTER TABLE character_pet DROP COLUMN load_flags;
\ No newline at end of file diff --git a/sql/updates/4210_world_TDB.sql b/sql/updates/4209_world_TDB.sql index 6baca035d85..139655550f7 100644 --- a/sql/updates/4210_world_TDB.sql +++ b/sql/updates/4209_world_TDB.sql @@ -2,4 +2,4 @@ DELETE FROM trinity_string WHERE `entry` = 6616; DELETE FROM `command` WHERE `name` IN ('reset all','reset talents'); INSERT INTO `command` VALUES ('reset all',3,'Syntax: .reset all spells\r\n\r\nSyntax: .reset all talents\r\n\r\nRequest reset spells or talents (including talents for all character\'s pets if any) at next login each existed character.'), -('reset talents',3,'Syntax: .reset talents [Playername]\r\n Removes all talents of the targeted player or pet or named player. Playername can be name of offline character. With player talents also will be reset talents for all character\'s pets if any.'); +('reset talents',3,'Syntax: .reset talents [Playername]\r\n Removes all talents of the targeted player or pet or named player. Playername can be name of offline character. With player talents also will be reset talents for all character\'s pets if any.');
\ No newline at end of file diff --git a/sql/updates/4210_characters_TDB.sql b/sql/updates/4210_characters_TDB.sql deleted file mode 100644 index a380d2a9e8a..00000000000 --- a/sql/updates/4210_characters_TDB.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE character_pet DROP COLUMN load_flags; diff --git a/sql/updates/4212_world.sql b/sql/updates/4211_world.sql index ce4b8d56e86..67378358b0e 100644 --- a/sql/updates/4212_world.sql +++ b/sql/updates/4211_world.sql @@ -1,3 +1,2 @@ ALTER TABLE spell_pet_auras ADD effectId TINYINT( 3 ) UNSIGNED NOT NULL AFTER spell; -ALTER TABLE spell_pet_auras DROP PRIMARY KEY, ADD PRIMARY KEY(spell,effectId,pet); - +ALTER TABLE spell_pet_auras DROP PRIMARY KEY, ADD PRIMARY KEY(spell,effectId,pet);
\ No newline at end of file diff --git a/sql/updates/4215_world.sql b/sql/updates/4216_world.sql index 352596306a0..a3e7a29ca7c 100644 --- a/sql/updates/4215_world.sql +++ b/sql/updates/4216_world.sql @@ -1,4 +1,3 @@ DELETE FROM `command` WHERE `name` IN ('modify tp'); - INSERT INTO `command` VALUES -('modify tp',1,'Syntax: .modify tp #amount\r\n\r\nSte free talent pointes for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'); +('modify tp',1,'Syntax: .modify tp #amount\r\n\r\nSte free talent pointes for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.');
\ No newline at end of file diff --git a/sql/updates/4216_world_spell_proc_event.sql b/sql/updates/4217_world_spell_proc_event.sql index 00df39c15e2..5bc4733d8aa 100644 --- a/sql/updates/4216_world_spell_proc_event.sql +++ b/sql/updates/4217_world_spell_proc_event.sql @@ -1 +1 @@ -DELETE FROM `spell_proc_event` WHERE `entry` IN (13165 ,14318, 14319, 14320, 14321, 14322, 25296, 27044, 61846, 61847); +DELETE FROM `spell_proc_event` WHERE `entry` IN (13165 ,14318, 14319, 14320, 14321, 14322, 25296, 27044, 61846, 61847);
\ No newline at end of file diff --git a/sql/updates/4222_world.sql b/sql/updates/4222_world.sql index 88cba6a134b..430b549db0c 100644 --- a/sql/updates/4222_world.sql +++ b/sql/updates/4222_world.sql @@ -10,4 +10,4 @@ INSERT INTO spell_pet_auras VALUES (56317, 1, 0, 57482), (56318, 0, 0, 57458), (56318, 1, 0, 57475); -DELETE FROM spell_linked_spell where `spell_trigger` in (57447,57482,57453, 57457, 57458); +DELETE FROM spell_linked_spell where `spell_trigger` in (57447,57482,57453, 57457, 57458);
\ No newline at end of file diff --git a/sql/updates/4225_world.sql b/sql/updates/4225_world.sql index 39aa777c6a9..dba1204b585 100644 --- a/sql/updates/4225_world.sql +++ b/sql/updates/4225_world.sql @@ -6,4 +6,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-5229); INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES -( -5229, -51185, 0, 'King of the Jungle - remove with enrage'); +( -5229, -51185, 0, 'King of the Jungle - remove with enrage');
\ No newline at end of file diff --git a/sql/updates/4234_world_spell_bonus_data_TDB.sql b/sql/updates/4234_world_spell_bonus_data_TDB.sql index 96673ed3a7c..036691eb1b6 100644 --- a/sql/updates/4234_world_spell_bonus_data_TDB.sql +++ b/sql/updates/4234_world_spell_bonus_data_TDB.sql @@ -1,4 +1,3 @@ DELETE FROM `spell_bonus_data` WHERE `entry`='17962'; - INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES -('17962', '0', '0', '0', 'Warlock - Conflagrate'); +('17962', '0', '0', '0', 'Warlock - Conflagrate');
\ No newline at end of file diff --git a/sql/updates/4246_world_script.sql b/sql/updates/4246_world_script.sql index a9700b9baf4..50e9c4d3d13 100644 --- a/sql/updates/4246_world_script.sql +++ b/sql/updates/4246_world_script.sql @@ -15,4 +15,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content (-1609013, 'There is no hope for our future...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_6'), (-1609014, 'Sate your hunger on cold steel\, $R', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_7'), (-1609015, 'It ends here!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_8'), -(-1609016, 'Death is the only cure!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_9'); +(-1609016, 'Death is the only cure!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'unworthy_initiate SAY_EVENT_ATTACK_9');
\ No newline at end of file diff --git a/sql/updates/4258_world_TDB.sql b/sql/updates/4258_world_TDB.sql index d7ccaeaf6d6..b9466b68687 100644 --- a/sql/updates/4258_world_TDB.sql +++ b/sql/updates/4258_world_TDB.sql @@ -1,9 +1,8 @@ -# 1588 -DELETE FROM `trinity_string` WHERE `entry` IN(301, 300); +DELETE FROM `trinity_string` WHERE `entry` IN (300, 301); INSERT INTO `trinity_string` (`entry`, `content_default`)VALUES ('300', 'Your chat has been disabled for %u minutes. Reason: %s.'), ('301', 'You have disabled %s\'s chat for %u minutes. Reason: %s.'); DELETE FROM `command` WHERE `name` = 'mute'; INSERT INTO `command` (`name`, `security`, `help`) VALUES -('mute', 1 ,'Syntax: .mute [$playerName] $timeInMinutes [$reason]\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'); +('mute', 1 ,'Syntax: .mute [$playerName] $timeInMinutes [$reason]\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.');
\ No newline at end of file diff --git a/sql/updates/4276_world_TDB.sql b/sql/updates/4276_world_TDB.sql index ea9df1a069b..02afae2b74f 100644 --- a/sql/updates/4276_world_TDB.sql +++ b/sql/updates/4276_world_TDB.sql @@ -11,4 +11,4 @@ REPLACE INTO gameobject_template VALUES (180102,6,266,"Neutral Banner Aura",""," REPLACE INTO gameobject_template VALUES (180101,6,1311,"Horde Banner Aura","","","",0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); REPLACE INTO gameobject_template VALUES (180421,6,2232,"Alliance Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); REPLACE INTO gameobject_template VALUES (180423,6,266,"Neutral Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); -REPLACE INTO gameobject_template VALUES (180422,6,1311,"Horde Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,""); +REPLACE INTO gameobject_template VALUES (180422,6,1311,"Horde Banner Aura, Large","","","",0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"");
\ No newline at end of file diff --git a/sql/updates/4282_world_TDB.sql b/sql/updates/4283_world_TDB.sql index f17f0a489f8..38a832dce7c 100644 --- a/sql/updates/4282_world_TDB.sql +++ b/sql/updates/4283_world_TDB.sql @@ -79,4 +79,4 @@ INSERT INTO `pet_levelstats` (`creature_entry`, `level`, `hp`, `mana`, `armor`, ('26125','77','4380','2056','4342','172','92','89','96','84'), ('26125','78','4437','2082','4399','174','93','90','97','85'), ('26125','79','4494','2108','4456','176','94','91','98','86'), -('26125','80','4551','2134','4513','178','95','92','99','87'); +('26125','80','4551','2134','4513','178','95','92','99','87');
\ No newline at end of file diff --git a/sql/updates/4292_8072_01_characters_characters.sql b/sql/updates/4292_8072_01_characters_characters.sql index 663fc4840a3..ddb639a78b1 100644 --- a/sql/updates/4292_8072_01_characters_characters.sql +++ b/sql/updates/4292_8072_01_characters_characters.sql @@ -7,4 +7,4 @@ ADD xp INT UNSIGNED NOT NULL default '0' AFTER level, ADD money INT UNSIGNED NOT NULL default '0' AFTER xp, ADD playerBytes INT UNSIGNED NOT NULL default '0' AFTER money, ADD playerBytes2 INT UNSIGNED NOT NULL default '0' AFTER playerBytes, -ADD playerFlags INT UNSIGNED NOT NULL default '0' AFTER playerBytes2; +ADD playerFlags INT UNSIGNED NOT NULL default '0' AFTER playerBytes2;
\ No newline at end of file diff --git a/sql/updates/4292_8072_02_characters_characters.sql b/sql/updates/4292_8072_02_characters_characters.sql index 06fa04c6094..14768b92e32 100644 --- a/sql/updates/4292_8072_02_characters_characters.sql +++ b/sql/updates/4292_8072_02_characters_characters.sql @@ -8,4 +8,4 @@ money = CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(data, ' ', 1145), ' ', -1) AS UNSIG playerBytes = CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(data, ' ', 154), ' ', -1) AS UNSIGNED), playerBytes2 = CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(data, ' ', 155), ' ', -1) AS UNSIGNED), playerFlags = CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(data, ' ', 151), ' ', -1) AS UNSIGNED) -WHERE LENGTH(SUBSTRING_INDEX(data, ' ', 1294)) < LENGTH(data) && LENGTH(data) <= LENGTH(SUBSTRING_INDEX(data, ' ', 1295)); +WHERE LENGTH(SUBSTRING_INDEX(data, ' ', 1294)) < LENGTH(data) && LENGTH(data) <= LENGTH(SUBSTRING_INDEX(data, ' ', 1295));
\ No newline at end of file diff --git a/sql/updates/4307_world_TDB.sql b/sql/updates/4307_world_TDB.sql index 93850038a8b..24447c76ed7 100644 --- a/sql/updates/4307_world_TDB.sql +++ b/sql/updates/4307_world_TDB.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (16857); DELETE FROM `spell_bonus_data` WHERE `entry` IN (60089); INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES -(60089, 0, 0, 0.05, 'Faerie Fire (feral)'); +(60089, 0, 0, 0.05, 'Faerie Fire (feral)');
\ No newline at end of file diff --git a/sql/updates/4308_world_TDB.sql b/sql/updates/4308_world_TDB.sql index 32ba9b5bf61..b3da988dc64 100644 --- a/sql/updates/4308_world_TDB.sql +++ b/sql/updates/4308_world_TDB.sql @@ -1,3 +1,3 @@ DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187); INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES -(20187, 0.32, 0, 0.2, 'Judgement of Righteousness'); +(20187, 0.4, 0, 0.25, 'Judgement of Righteousness');
\ No newline at end of file diff --git a/sql/updates/4321_world.sql b/sql/updates/4321_world.sql new file mode 100644 index 00000000000..16c2fe33041 --- /dev/null +++ b/sql/updates/4321_world.sql @@ -0,0 +1,36 @@ +DELETE FROM `creature_questrelation` WHERE `quest`=12701;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12701;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12723;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723);
+DELETE FROM `creature_questrelation` WHERE `quest`=12724;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12724;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_questrelation` WHERE `quest`=12725;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12725;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725);
+DELETE FROM `creature_questrelation` WHERE `quest`=12727;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12727;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727);
+
+DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+('48714', '2', '27237'),
+('48714', '2', '27235'),
+('48714', '2', '27234'),
+('48714', '2', '27236'),
+('57806', '2', '31043');
+
+UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627);
+
+DELETE FROM `spell_target_position` WHERE `id`=51852;
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(51852, 609, 2361.21, -5660.45, 503.828, 4.49);
+
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187);
+INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES
+(20187, 0.4, 0, 0.25, 'Judgement of Righteousness');
\ No newline at end of file diff --git a/sql/world.sql b/sql/world.sql index 8c5dfb46eff..8f45d916ec1 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -470,7 +470,7 @@ INSERT INTO `command` VALUES ('modify tp',1,'Syntax: .modify tp #amount\r\n\r\nSet free talent pointes for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.'), ('modify',1,'Syntax: .modify $subcommand\nType .modify to see the list of possible subcommands or .help modify $subcommand to see info on subcommands'), ('movegens',3,'Syntax: .movegens\r\n Show movement generators stack for selected creature or player.'), -('mute',1,'Syntax: .mute [$playerName] $timeInMinutes\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'), +('mute',1,'Syntax: .mute [$playerName] $timeInMinutes [$reason]\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'), ('nameannounce',1,'Syntax: .nameannounce $announcement.\nSend an announcement to all online players, displaying the name of the sender.'), ('namego',1,'Syntax: .namego [$charactername]\r\n\r\nTeleport the given character to you. Character can be offline.'), ('neargrave',3,'Syntax: .neargrave [alliance|horde]\r\n\r\nFind nearest graveyard linked to zone (or only nearest from accepts alliance or horde faction ghosts).'), @@ -14917,8 +14917,8 @@ INSERT INTO `trinity_string` VALUES (297,'Spawn distance changed to: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (298,'Spawn time changed to: %i',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (299,'The honor of %s was set to %u!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(300,'Your chat has been disabled for %u minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(301,'You have disabled %s\'s chat for %u minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(300,'Your chat has been disabled for %u minutes. Reason: %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(301,'You have disabled %s''s chat for %u minutes. Reason: %s.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (302,'Player\'s chat is already enabled.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (303,'Your chat has been enabled.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (304,'You have enabled %s\'s chat.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), |