From 777a4361a0b51e3d098a23216f18d0d8e427bf75 Mon Sep 17 00:00:00 2001 From: teacher Date: Wed, 17 Feb 2010 18:34:22 +0100 Subject: Proper SQL standards. Added recently committed scriptnames to world_scripts_full.sql. --HG-- branch : trunk --- sql/FULL/world_scripts_full.sql | 2 ++ sql/updates/7349_world_spell_linked_spell.sql | 3 ++- sql/updates/7373_world_creature_template.sql | 2 -- sql/updates/7373_world_item_template.sql | 2 -- sql/updates/7373_world_scriptname.sql | 2 ++ 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 sql/updates/7373_world_creature_template.sql delete mode 100644 sql/updates/7373_world_item_template.sql create mode 100644 sql/updates/7373_world_scriptname.sql diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 40a4a20194a..8c5521b67cc 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -397,6 +397,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_imprisoned_beryl_sorcerer' WHER 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; +UPDATE `creature_template` SET `scriptname`='npc_trapped_mammoth_calf' WHERE `entry`=25850; +UPDATE `item_template` SET `scriptname`='item_dehta_trap_smasher' WHERE `entry`=35228; /* BURNING STEPPES */ UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563; diff --git a/sql/updates/7349_world_spell_linked_spell.sql b/sql/updates/7349_world_spell_linked_spell.sql index df64792e941..9afd55d4d50 100644 --- a/sql/updates/7349_world_spell_linked_spell.sql +++ b/sql/updates/7349_world_spell_linked_spell.sql @@ -1,2 +1,3 @@ -- Summon Water Elemental -INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (31687, 70907, 0,'Summon Water Elemental'); \ No newline at end of file +DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=31687 AND `spell_effect`=70907; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (31687, 70907, 0,'Summon Water Elemental'); diff --git a/sql/updates/7373_world_creature_template.sql b/sql/updates/7373_world_creature_template.sql deleted file mode 100644 index 86904783abe..00000000000 --- a/sql/updates/7373_world_creature_template.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `creature_template` SET `scriptname`='npc_trapped_mammoth_calf' WHERE `entry`=25850; - diff --git a/sql/updates/7373_world_item_template.sql b/sql/updates/7373_world_item_template.sql deleted file mode 100644 index e9c51195524..00000000000 --- a/sql/updates/7373_world_item_template.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `item_template` SET `scriptname`='item_dehta_trap_smasher' WHERE `entry`=35228; - diff --git a/sql/updates/7373_world_scriptname.sql b/sql/updates/7373_world_scriptname.sql new file mode 100644 index 00000000000..3588b9b3604 --- /dev/null +++ b/sql/updates/7373_world_scriptname.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `scriptname`='npc_trapped_mammoth_calf' WHERE `entry`=25850; +UPDATE `item_template` SET `scriptname`='item_dehta_trap_smasher' WHERE `entry`=35228; -- cgit v1.2.3