DB/NPCs: Remove save to instance flag from Hellfire Channeler;

SQL: Fix naming and style in previous sql;
Scripts/Naxx: Fix a logic fail in KT adds summon;
DB/Spells: Add a few missing spells to spell_dbc table

5 files changed, 16 insertions, 6 deletions

diff --git a/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql b/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql
deleted file mode 100644
index 7a0dd8200b4..00000000000
--- a/sql/updates/world/2011_11_06_01_world_areatrigger_teleport.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Correct AQ40's areatrigger_teleport orientation
-UPDATE `areatrigger_teleport` SET `target_position_z`='129.330612', `target_orientation`='0.929912' WHERE `id`=4010;
-UPDATE `areatrigger_teleport` SET `target_orientation`='4.030663' WHERE `id`=4012;
diff --git a/sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql b/sql/updates/world/2011_11_07_00_world_player_factionchange_items.sql
index 54a36473fb3..54a36473fb3 100644
--- a/sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql
+++ b/sql/updates/world/2011_11_07_00_world_player_factionchange_items.sql
diff --git a/sql/updates/world/2011_11_07_01_world_areatrigger_teleport.sql b/sql/updates/world/2011_11_07_01_world_areatrigger_teleport.sql
new file mode 100644
index 00000000000..2164d24ef5f
--- /dev/null
+++ b/sql/updates/world/2011_11_07_01_world_areatrigger_teleport.sql
@@ -0,0 +1,3 @@
+-- Correct AQ40's areatrigger_teleport orientation
+UPDATE `areatrigger_teleport` SET `target_position_z`=129.330612, `target_orientation`=0.929912 WHERE `id`=4010;
+UPDATE `areatrigger_teleport` SET `target_orientation`=4.030663 WHERE `id`=4012;
diff --git a/sql/updates/world/2011_11_07_02_world_misc.sql b/sql/updates/world/2011_11_07_02_world_misc.sql
new file mode 100644
index 00000000000..b4750688aa1
--- /dev/null
+++ b/sql/updates/world/2011_11_07_02_world_misc.sql
@@ -0,0 +1,10 @@
+-- by Aok
+-- Removes save to instance flag from Hellfire Channeler
+UPDATE `creature_template` SET `flags_extra`=`flags_extra` &~ 0 WHERE `entry`=17256;
+
+-- by Nay
+DELETE FROM `spell_dbc` WHERE `Id` IN (12507,31982,33134);
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `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`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+(12507, 0, 0, 464, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 21, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12504, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 'Atal''ai Skeleton Totem'),
+(31982, 0, 0, 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 29, 29, 21, 1, 0, -1, -1, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31983, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 'Tainted Earthgrab Totem'),
+(33134, 0, 0, 65920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 20, 20, 85, 1, 0, -1, -1, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 18000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 'Tainted Nova Totem');
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 9c3c9156d63..96c061f4c98 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -683,7 +683,7 @@ public:
 
             // Note: summon must be done by trigger and not by KT.
             // Otherwise, they attack immediately as KT is in combat.
-            for (uint8 i = 0; i <= MAX_ABOMINATIONS; ++i)
+            for (uint8 i = 0; i < MAX_ABOMINATIONS; ++i)
             {
                 if (Creature* sum = trigger->SummonCreature(NPC_ABOMINATION, PosAbominations[i]))
                 {
@@ -692,7 +692,7 @@ public:
                     sum->SetReactState(REACT_DEFENSIVE);
                 }
             }
-            for (uint8 i = 0; i <= MAX_WASTES; ++i)
+            for (uint8 i = 0; i < MAX_WASTES; ++i)
             {
                 if (Creature* sum = trigger->SummonCreature(NPC_WASTE, PosWastes[i]))
                 {
@@ -701,7 +701,7 @@ public:
                     sum->SetReactState(REACT_DEFENSIVE);
                 }
             }
-            for (uint8 i = 0; i <= MAX_WEAVERS; ++i)
+            for (uint8 i = 0; i < MAX_WEAVERS; ++i)
             {
                 if (Creature* sum = trigger->SummonCreature(NPC_WEAVER, PosWeavers[i]))
                 {