SQL: Any content SQL should be able to be re-imported without errors; Fix an import error in world_scripts_full;

P.S Full DB will be available soon
Closes #586

9 files changed, 14 insertions, 18 deletions

diff --git a/sql/old/3.3.5a/09551_world_spell_bonus_data.sql b/sql/old/3.3.5a/09551_world_spell_bonus_data.sql
index ae040a7e03c..95af16980d2 100644
--- a/sql/old/3.3.5a/09551_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/09551_world_spell_bonus_data.sql
@@ -1 +1,2 @@
+DELETE FROM `spell_bonus_data` WHERE `entry`=70809;
 INSERT INTO `spell_bonus_data` VALUES (70809, 0, 0, 0, 0, 'Item - Shaman T10 Restoration 4P Bonus');
diff --git a/sql/old/3.3.5a/09700_world_spell_script_names.sql b/sql/old/3.3.5a/09700_world_spell_script_names.sql
index 24e3a8a3e89..fa0bcb81e60 100644
--- a/sql/old/3.3.5a/09700_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/09700_world_spell_script_names.sql
@@ -1,4 +1,4 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=73032 AND `ScriptName`='spell_stinky_precious_decimate';
+DELETE FROM `spell_script_names` WHERE `spell_id`=71123 AND `ScriptName`='spell_stinky_precious_decimate';
 DELETE FROM `spell_script_names` WHERE `spell_id` IN (73032,73031,71219,69195) AND `ScriptName`='spell_festergut_pungent_blight';
 DELETE FROM `spell_script_names` WHERE `spell_id` IN (72219,72551,72552,72553) AND `ScriptName`='spell_festergut_gastric_bloat';
 DELETE FROM `spell_script_names` WHERE `spell_id` IN (69290,71222,73033,73034) AND `ScriptName`='spell_festergut_blighted_spores';
diff --git a/sql/old/3.3.5a/10284_world_spell_script_names.sql b/sql/old/3.3.5a/10284_world_spell_script_names.sql
index 571fb59d3a5..71d7696396b 100644
--- a/sql/old/3.3.5a/10284_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/10284_world_spell_script_names.sql
@@ -2,7 +2,7 @@ DELETE FROM `spell_script_names` WHERE `spell_id`=71598 AND `ScriptName`='spell_
 DELETE FROM `spell_script_names` WHERE `spell_id`=71806 AND `ScriptName`='spell_taldaram_glittering_sparks';
 DELETE FROM `spell_script_names` WHERE `spell_id` IN (71718,72040) AND `ScriptName`='spell_taldaram_summon_flame_ball';
 DELETE FROM `spell_script_names` WHERE `spell_id` IN (55891,55947) AND `ScriptName`='spell_taldaram_flame_ball_visual';
-DELETE FROM `spell_script_names` WHERE `spell_id` IN (71756,72782,72783,72783) AND `ScriptName`='spell_taldaram_ball_of_inferno_flame';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (71756,72782,72783,72784) AND `ScriptName`='spell_taldaram_ball_of_inferno_flame';
 DELETE FROM `spell_script_names` WHERE `spell_id`=72080 AND `ScriptName`='spell_valanar_kinetic_bomb';
 DELETE FROM `spell_script_names` WHERE `spell_id`=72087 AND `ScriptName`='spell_valanar_kinetic_bomb_knockback';
 DELETE FROM `spell_script_names` WHERE `spell_id`=73001 AND `ScriptName`='spell_blood_council_shadow_prison';
@@ -21,4 +21,4 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 (72080,'spell_valanar_kinetic_bomb'),
 (72087,'spell_valanar_kinetic_bomb_knockback'),
 (73001,'spell_blood_council_shadow_prison'),
-(72999,'spell_blood_council_shadow_prison_damage');
+(72999,'spell_blood_council_shadow_prison_damage');
\ No newline at end of file
diff --git a/sql/old/3.3.5a/2011_01_31_0_spell_bonus_data.sql b/sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql
index a908e227a1d..a908e227a1d 100644
--- a/sql/old/3.3.5a/2011_01_31_0_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2011_01_31_0_world_spell_bonus_data.sql
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index fbb834f4ee9..b1cea599a86 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -1,4 +1,4 @@
--- Up to TC2 5408
+-- Up to TC 11181
 --
 -- trinityscript_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts.
 -- valid entries for table are between -1000000 and -1999999
diff --git a/sql/scripts/world_script_waypoints.sql b/sql/scripts/world_script_waypoints.sql
index cf5c16c8dff..da727e4056e 100644
--- a/sql/scripts/world_script_waypoints.sql
+++ b/sql/scripts/world_script_waypoints.sql
@@ -1,4 +1,4 @@
--- Up to TC2 5408
+-- Up to TC 11181
 
 -- This file contains all waypoints used by escortAI scripts
 /*
@@ -15,12 +15,6 @@ CREATE TABLE `script_waypoint` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
 */
 
---
--- Not sure why we don't just run
--- DELETE FROM `script_waypoint`;
--- I mean seriously, who has custom waypoint creatures?
---
-
 DELETE FROM `script_waypoint` WHERE `entry`=26170;
 INSERT INTO `script_waypoint` VALUES
    (26170,1,3700.08,3574.54,473.322,0, ''),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index a32a5d1461c..5aac3170c27 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1,4 +1,4 @@
--- Up to TC2 6928
+-- Up to TC 11181
 
 -- Cleanup first
 UPDATE `battleground_template` SET `ScriptName`='';
@@ -1824,7 +1824,6 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 46394, 'spell_gen_burn_brutallus'),
 ( 57685, 'spell_creature_permanent_feign_death'),
 ( 58601, 'spell_gen_remove_flight_auras'),
-( 66118, 'spell_gen_leeching_swarm'),
 ( 58951, 'spell_creature_permanent_feign_death'),
 ( 70592, 'spell_creature_permanent_feign_death'),
 ( 70628, 'spell_creature_permanent_feign_death'),
diff --git a/sql/updates/world/2011_02_03_3_world_spell_dbc.sql b/sql/updates/world/2011_02_03_3_world_spell_dbc.sql
index 223c4760d0b..0d26399cf42 100644
--- a/sql/updates/world/2011_02_03_3_world_spell_dbc.sql
+++ b/sql/updates/world/2011_02_03_3_world_spell_dbc.sql
@@ -1,3 +1,4 @@
+DELETE FROM `spell_dbc` WHERE `Id` IN (58630,68572,68574,59046,68184,59450,65195,64899,64985,65074);
 INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,
 `MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,
 `EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,
diff --git a/sql/updates/world/2011_02_07_1_world_creature_questrelation.sql b/sql/updates/world/2011_02_07_1_world_creature_questrelation.sql
index c0f93b24ced..4aeb7a70775 100644
--- a/sql/updates/world/2011_02_07_1_world_creature_questrelation.sql
+++ b/sql/updates/world/2011_02_07_1_world_creature_questrelation.sql
@@ -1,11 +1,12 @@
 -- Missing relation for quest You've Been Served
-INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES
-(38208,14488);
-INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES
-(36296,14488);
+DELETE FROM `creature_questrelation` WHERE `id`=38208 AND `quest`=14488;
+DELETE FROM `creature_involvedrelation` WHERE `id`=36296 AND `quest`=14488;
+INSERT INTO `creature_questrelation`(`id`,`quest`) VALUES (38208,14488);
+INSERT INTO `creature_involvedrelation`(`id`,`quest`) VALUES (36296,14488);
 
 -- Missing loot form Standard Apothecary Serving Kit request for quest You've Been Served
- INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
+DELETE FROM `item_loot_template` WHERE `entry`=49631 AND `item` IN (49352,49351,49635);
+INSERT INTO `item_loot_template`(`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES 
 (49631,49352,100,1,0,1,1),
 (49631,49351,100,1,0,1,1),
 (49631,49635,100,1,0,1,1);