Script/Spells: Fix spell 64414 / Load into catapult

Also fix SQL file naming from this morning.

5 files changed, 15 insertions, 9 deletions

diff --git a/sql/updates/world/2011_08_15_01_world_vehicle_template_accessory.sql b/sql/updates/world/2011_08_18_00_world_vehicle_template_accessory.sql
index 2659570e464..2659570e464 100644
--- a/sql/updates/world/2011_08_15_01_world_vehicle_template_accessory.sql
+++ b/sql/updates/world/2011_08_18_00_world_vehicle_template_accessory.sql
diff --git a/sql/updates/world/2011_08_18_00_world_misc.sql b/sql/updates/world/2011_08_18_01_world_misc.sql
index 0a01fc87763..0a01fc87763 100644
--- a/sql/updates/world/2011_08_18_00_world_misc.sql
+++ b/sql/updates/world/2011_08_18_01_world_misc.sql
diff --git a/sql/updates/world/2011_08_18_02_world_achievement_criteria_data.sql b/sql/updates/world/2011_08_18_02_world_achievement_criteria_data.sql
index 91e9715006d..6c52e685054 100644
--- a/sql/updates/world/2011_08_18_02_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2011_08_18_02_world_achievement_criteria_data.sql
@@ -1,7 +1,6 @@
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12740,12741,12744,12993) AND `type`=12;
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12747,12748,12749) AND `type`=12;
 INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`)
 VALUES
-(12740,12,0,0,''),
-(12741,12,0,0,''),
-(12744,12,0,0,''),
-(12993,12,1,0,'');
+(12747,12,1,0,''),
+(12748,12,1,0,''),
+(12749,12,1,0,'');
diff --git a/sql/updates/world/2011_08_18_01_world_achievement_criteria_data.sql b/sql/updates/world/2011_08_18_03_world_achievement_criteria_data.sql
index 6c52e685054..91e9715006d 100644
--- a/sql/updates/world/2011_08_18_01_world_achievement_criteria_data.sql
+++ b/sql/updates/world/2011_08_18_03_world_achievement_criteria_data.sql
@@ -1,6 +1,7 @@
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12747,12748,12749) AND `type`=12;
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12740,12741,12744,12993) AND `type`=12;
 INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`)
 VALUES
-(12747,12,1,0,''),
-(12748,12,1,0,''),
-(12749,12,1,0,'');
+(12740,12,0,0,''),
+(12741,12,0,0,''),
+(12744,12,0,0,''),
+(12993,12,1,0,'');
diff --git a/sql/updates/world/2011_08_18_04_world_spell_script_names.sql b/sql/updates/world/2011_08_18_04_world_spell_script_names.sql
new file mode 100644
index 00000000000..a5ad44c5659
--- /dev/null
+++ b/sql/updates/world/2011_08_18_04_world_spell_script_names.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=64414;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(64414,'spell_load_into_catapult');
+
+-- Update a wrongly entered spell
+UPDATE `creature_template` SET `spell6`=64414 WHERE `entry`=33167;