diff options
Diffstat (limited to 'sql')
20 files changed, 25 insertions, 15 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index b2fa876567d..61cc29c2bd3 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -1,7 +1,11 @@ -- Up to TC2 6928 -- Cleanup first +UPDATE `instance_template` SET `Script`=''; +UPDATE `item_template` SET `ScriptName`=''; UPDATE `creature_template` SET `ScriptName`=''; +UPDATE `gameobject_template` SET `ScriptName`=''; + /* WORLD BOSS */ UPDATE `creature_template` SET `ScriptName`='boss_ysondre' WHERE `entry`=14887; @@ -389,6 +393,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_beryl_sorcerer' WHERE `entry`=2 UPDATE `creature_template` SET `ScriptName`='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478; UPDATE `creature_template` SET `ScriptName`='npc_mootoo_the_younger' WHERE `entry`= 25504; UPDATE `creature_template` SET `ScriptName`='npc_bonker_togglevolt' WHERE `entry`= 25589; +UPDATE `creature_template` SET `ScriptName`='npc_fezzix_geartwist' WHERE `entry`=25849; /* BURNING STEPPES */ UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563; @@ -1214,7 +1219,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_toc5_mage' WHERE entry IN (3470 UPDATE `creature_template` SET `ScriptName`='mob_toc5_shaman' WHERE entry IN (34701, 35571); UPDATE `creature_template` SET `ScriptName`='mob_toc5_hunter' WHERE entry IN (34657, 35570); UPDATE `creature_template` SET `ScriptName`='mob_toc5_rogue' WHERE entry IN (34703, 35617); -UPDATE `creature_template` SET `ScriptName`='mob_toc5_risen_ghoul' WHERE entry IN (35545, 35564); UPDATE `creature_template` SET `ScriptName`='npc_risen_ghoul' WHERE `entry` IN (35545,35564); UPDATE `creature_template` SET `ScriptName`='boss_black_knight' WHERE `entry`=35451; UPDATE `creature_template` SET `ScriptName`='boss_eadric' WHERE `entry`=35119; diff --git a/sql/updates/6771_world_scriptnames.sql b/sql/updates/6771_world_scriptnames.sql index 5f617ed3738..07490c90d7a 100644 --- a/sql/updates/6771_world_scriptnames.sql +++ b/sql/updates/6771_world_scriptnames.sql @@ -6,9 +6,9 @@ UPDATE `creature_template` SET `ScriptName`='mob_toc5_mage' WHERE entry IN (3470 UPDATE `creature_template` SET `ScriptName`='mob_toc5_shaman' WHERE entry IN (34701, 35571); UPDATE `creature_template` SET `ScriptName`='mob_toc5_hunter' WHERE entry IN (34657, 35570); UPDATE `creature_template` SET `ScriptName`='mob_toc5_rogue' WHERE entry IN (34703, 35617); -UPDATE `creature_template` SET `ScriptName`='mob_toc5_risen_ghoul' WHERE entry IN (35545, 35564); UPDATE `creature_template` SET `ScriptName`='npc_risen_ghoul' WHERE `entry` IN (35545,35564); UPDATE `creature_template` SET `ScriptName`='boss_black_knight' WHERE `entry`=35451; UPDATE `creature_template` SET `ScriptName`='boss_eadric' WHERE `entry`=35119; UPDATE `creature_template` SET `ScriptName`='boss_paletress' WHERE `entry`=34928; UPDATE `creature_template` SET `ScriptName`='npc_memory' WHERE `entry` IN (35052,35041,35033,35046,35043,35047,35044,35039, 35034, 35049, 35030, 34942, 35050, 35042, 35045, 35037, 35031, 35038, 35029,35048,35032,35028,35040,35036,35051); + diff --git a/sql/updates/6782_world_scriptnames.sql b/sql/updates/6782_world_scriptnames.sql index 81791ab24cd..4b35a3b59b9 100644 --- a/sql/updates/6782_world_scriptnames.sql +++ b/sql/updates/6782_world_scriptnames.sql @@ -1,2 +1 @@ UPDATE `creature_template` SET `ScriptName`='npc_risen_ghoul' WHERE `entry` IN (35545, 35564); - diff --git a/sql/updates/6792_world_spell_proc_event.sql b/sql/updates/6792_world_spell_proc_event.sql index feb0aac514b..b4c82e0f6ae 100644 --- a/sql/updates/6792_world_spell_proc_event.sql +++ b/sql/updates/6792_world_spell_proc_event.sql @@ -1 +1 @@ -UPDATE spell_proc_event SET SpellFamilyMask0 = 0x04000000, SpellFamilyMask1 = 0x10000000 WHERE entry IN (49208, 56834, 56835);
\ No newline at end of file +UPDATE spell_proc_event SET SpellFamilyMask0 = 0x04000000, SpellFamilyMask1 = 0x10000000 WHERE entry IN (49208, 56834, 56835); diff --git a/sql/updates/6795_world_creature_template.sql b/sql/updates/6795_world_creature_template.sql index f8b302a7e7d..f25af34eb68 100644 --- a/sql/updates/6795_world_creature_template.sql +++ b/sql/updates/6795_world_creature_template.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `mindmg` = '97', `maxdmg` = '195', `attackpower` = '35', `minrangedmg` = '72', `maxrangedmg` = '157' WHERE `entry` = 28017;
\ No newline at end of file +UPDATE `creature_template` SET `mindmg` = '97', `maxdmg` = '195', `attackpower` = '35', `minrangedmg` = '72', `maxrangedmg` = '157' WHERE `entry` = 28017; diff --git a/sql/updates/6799_world_spell_proc_event.sql b/sql/updates/6799_world_spell_proc_event.sql index ba127dbf22b..487099eb68b 100644 --- a/sql/updates/6799_world_spell_proc_event.sql +++ b/sql/updates/6799_world_spell_proc_event.sql @@ -1 +1 @@ -UPDATE spell_proc_event SET SchoolMask = 4, spellFamilyMask1 = 200776, spellFamilyMask0 = 146800663 WHERE entry = 11129;
\ No newline at end of file +UPDATE spell_proc_event SET SchoolMask = 4, spellFamilyMask1 = 200776, spellFamilyMask0 = 146800663 WHERE entry = 11129; diff --git a/sql/updates/6840_world_spell_proc_event.sql b/sql/updates/6840_world_spell_proc_event.sql index 7711683545f..76f8cfc0efd 100644 --- a/sql/updates/6840_world_spell_proc_event.sql +++ b/sql/updates/6840_world_spell_proc_event.sql @@ -2,4 +2,4 @@ -- Change max procs per minute (ppm) to be read from the dbc UPDATE spell_proc_event SET ppmRate = 0 -WHERE entry = 20375;
\ No newline at end of file +WHERE entry = 20375; diff --git a/sql/updates/6857_world_scriptnames.sql b/sql/updates/6857_world_scriptnames.sql index c24c640367d..23eaf24b35c 100644 --- a/sql/updates/6857_world_scriptnames.sql +++ b/sql/updates/6857_world_scriptnames.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `ScriptName` = 'valiant_challenge' WHERE `entry` = 33518;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName` = 'valiant_challenge' WHERE `entry` = 33518; diff --git a/sql/updates/6877_world_script_waypoints.sql b/sql/updates/6877_world_script_waypoints.sql index 3e86967627d..428a5312f68 100644 --- a/sql/updates/6877_world_script_waypoints.sql +++ b/sql/updates/6877_world_script_waypoints.sql @@ -115,4 +115,3 @@ INSERT INTO `script_waypoint` VALUES (349,113,-9264.73,-2292.92,70.0089,0,''), (349,114,-9272.24,-2293.79,68.6096,0,''), (349,115,-9277.03,-2295.98,68.1135,10000,''); - diff --git a/sql/updates/6877_world_scriptnames.sql b/sql/updates/6877_world_scriptnames.sql index 6b665d35a57..8c57960b4b7 100644 --- a/sql/updates/6877_world_scriptnames.sql +++ b/sql/updates/6877_world_scriptnames.sql @@ -1,2 +1 @@ UPDATE `creature_template` SET `ScriptName`='npc_corporal_keeshan' WHERE `entry`=349; - diff --git a/sql/updates/6881_world_spell_proc_event.sql b/sql/updates/6881_world_spell_proc_event.sql index b31464804e0..f78a9735e9e 100644 --- a/sql/updates/6881_world_spell_proc_event.sql +++ b/sql/updates/6881_world_spell_proc_event.sql @@ -1 +1 @@ -UPDATE `spell_proc_event` SET procFlags=procFlags|4 WHERE `entry` in (53486,53488); -- Fix Art of War to only proc from Critical Hits
\ No newline at end of file +UPDATE `spell_proc_event` SET procFlags=procFlags|4 WHERE `entry` in (53486,53488); -- Fix Art of War to only proc from Critical Hits diff --git a/sql/updates/6898_world_spell_proc_event.sql b/sql/updates/6898_world_spell_proc_event.sql index 4751b9d29b4..bad7690badc 100644 --- a/sql/updates/6898_world_spell_proc_event.sql +++ b/sql/updates/6898_world_spell_proc_event.sql @@ -1,2 +1,2 @@ DELETE FROM spell_proc_event WHERE entry = 58387; -INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor
\ No newline at end of file +INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor diff --git a/sql/updates/6901_world_spell_proc_event.sql b/sql/updates/6901_world_spell_proc_event.sql index fab8748d36a..6d03c08ebf7 100644 --- a/sql/updates/6901_world_spell_proc_event.sql +++ b/sql/updates/6901_world_spell_proc_event.sql @@ -1,2 +1,2 @@ DELETE FROM spell_proc_event WHERE entry = 58375; -INSERT INTO spell_proc_event VALUES(58375, 0, 4, 0, 0x200, 0, 0x10, 0, 0, 0, 0); -- Glyph of Blocking
\ No newline at end of file +INSERT INTO spell_proc_event VALUES(58375, 0, 4, 0, 0x200, 0, 0x10, 0, 0, 0, 0); -- Glyph of Blocking diff --git a/sql/updates/6903_world_spell_proc_event.sql b/sql/updates/6903_world_spell_proc_event.sql index d405bfbb2bf..b15e41ead7d 100644 --- a/sql/updates/6903_world_spell_proc_event.sql +++ b/sql/updates/6903_world_spell_proc_event.sql @@ -1 +1 @@ -UPDATE spell_proc_event SET customChance = 100 WHERE entry = 33757;
\ No newline at end of file +UPDATE spell_proc_event SET customChance = 100 WHERE entry = 33757; diff --git a/sql/updates/6915_world_spell_proc_event.sql b/sql/updates/6915_world_spell_proc_event.sql index 5ef9121cc44..ed974e92fb2 100644 --- a/sql/updates/6915_world_spell_proc_event.sql +++ b/sql/updates/6915_world_spell_proc_event.sql @@ -1 +1 @@ -UPDATE spell_proc_event SET spellFamilyMask0 = spellFamilyMask0 | 0x100, customChance = 100 WHERE entry IN (16198, 16180, 16196);
\ No newline at end of file +UPDATE spell_proc_event SET spellFamilyMask0 = spellFamilyMask0 | 0x100, customChance = 100 WHERE entry IN (16198, 16180, 16196); diff --git a/sql/updates/6945_world_scriptnames.sql b/sql/updates/6945_world_scriptnames.sql new file mode 100644 index 00000000000..1de4fa2218e --- /dev/null +++ b/sql/updates/6945_world_scriptnames.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='npc_fezzix_geartwist' WHERE `entry`=25849; diff --git a/sql/updates/6953_world_trinity_string.sql b/sql/updates/6953_world_trinity_string.sql new file mode 100644 index 00000000000..aa6dede9ec5 --- /dev/null +++ b/sql/updates/6953_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=5021; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES (5021, 'Armor: %u'); + diff --git a/sql/updates/6959_characters_character_aura.sql b/sql/updates/6959_characters_character_aura.sql new file mode 100644 index 00000000000..533adfb27c4 --- /dev/null +++ b/sql/updates/6959_characters_character_aura.sql @@ -0,0 +1,2 @@ +DELETE FROM `character_aura` WHERE `spell` IN (61248, 58105, 61265); +
\ No newline at end of file diff --git a/sql/updates/6959_characters_pet_aura.sql b/sql/updates/6959_characters_pet_aura.sql new file mode 100644 index 00000000000..e3ef6f3ffde --- /dev/null +++ b/sql/updates/6959_characters_pet_aura.sql @@ -0,0 +1,2 @@ +DELETE FROM `pet_aura` WHERE `spell` IN (61248, 58105, 61265); +
\ No newline at end of file diff --git a/sql/world.sql b/sql/world.sql index 1c99fd11847..ab5ef584578 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -7657,6 +7657,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (5018, '[Heroic reset time: %s]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (5019, '[Mountable]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (5020, 'Phasemask: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(5021, 'Armor: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), |