Scripts/Icecrown Citadel

* Fixed Gas Spore resistance debuff
* Removed obsolete scripts since aura stacking changes

Closes #2285

4 files changed, 6 insertions, 106 deletions

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 4304dee41bf..67ac157a736 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -2078,18 +2078,6 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 71222, 'spell_festergut_blighted_spores'),
 ( 73033, 'spell_festergut_blighted_spores'),
 ( 73034, 'spell_festergut_blighted_spores'),
-( 69159, 'spell_festergut_gaseous_blight'),
-( 70135, 'spell_festergut_gaseous_blight'),
-( 70136, 'spell_festergut_gaseous_blight'),
-( 70137, 'spell_festergut_gaseous_blight'),
-( 69161, 'spell_festergut_gaseous_blight'),
-( 70138, 'spell_festergut_gaseous_blight'),
-( 70139, 'spell_festergut_gaseous_blight'),
-( 70140, 'spell_festergut_gaseous_blight'),
-( 69163, 'spell_festergut_gaseous_blight'),
-( 70468, 'spell_festergut_gaseous_blight'),
-( 70469, 'spell_festergut_gaseous_blight'),
-( 70470, 'spell_festergut_gaseous_blight'),
 ( 69782, 'spell_rotface_ooze_flood'),
 ( 69796, 'spell_rotface_ooze_flood'),
 ( 69798, 'spell_rotface_ooze_flood'),
@@ -2100,10 +2088,6 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 69839, 'spell_rotface_unstable_ooze_explosion_init'),
 ( 69832, 'spell_rotface_unstable_ooze_explosion'),
 ( 71441, 'spell_rotface_unstable_ooze_explosion_suicide'),
-( 69507, 'spell_rotface_slime_spray'),
-( 71213, 'spell_rotface_slime_spray'),
-( 73189, 'spell_rotface_slime_spray'),
-( 73190, 'spell_rotface_slime_spray'),
 ( 70701, 'spell_putricide_expunged_gas'),
 ( 70343, 'spell_putricide_slime_puddle'),
 ( 70351, 'spell_putricide_unstable_experiment'),
diff --git a/sql/updates/world/2011_07_15_01_world_spell_script_names.sql b/sql/updates/world/2011_07_15_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..c6b334c179c
--- /dev/null
+++ b/sql/updates/world/2011_07_15_01_world_spell_script_names.sql
@@ -0,0 +1,2 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_festergut_gaseous_blight';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rotface_slime_spray';
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 72421d23a36..dc36c6c72ab 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -432,24 +432,12 @@ class spell_festergut_blighted_spores : public SpellScriptLoader
                 return true;
             }
 
-            bool Load()
-            {
-                return GetCaster()->GetTypeId() == TYPEID_UNIT;
-            }
-
             void ExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
-                if (Unit* caster = GetCaster())
-                {
-                    uint32 inoculatedId = sSpellMgr->GetSpellIdForDifficulty(SPELL_INOCULATED, caster);
-                    uint32 currStack = 0;
-                    if (Aura const* inoculate = GetTarget()->GetAura(inoculatedId))
-                        currStack = inoculate->GetStackAmount();
-
-                    GetTarget()->CastSpell(GetTarget(), SPELL_INOCULATED, true);
-                    ++currStack;
-                    caster->ToCreature()->AI()->SetData(DATA_INOCULATED_STACK, currStack);
-                }
+                GetTarget()->CastSpell(GetTarget(), SPELL_INOCULATED, true);
+                if (InstanceScript* instance = GetTarget()->GetInstanceScript())
+                    if (Creature* festergut = ObjectAccessor::GetCreature(*GetTarget(), instance->GetData64(DATA_FESTERGUT)))
+                        festergut->AI()->SetData(DATA_INOCULATED_STACK, GetStackAmount());
             }
 
             void Register()
@@ -464,42 +452,6 @@ class spell_festergut_blighted_spores : public SpellScriptLoader
         }
 };
 
-class spell_festergut_gaseous_blight : public SpellScriptLoader
-{
-    public:
-        spell_festergut_gaseous_blight() : SpellScriptLoader("spell_festergut_gaseous_blight") { }
-
-        class spell_festergut_gaseous_blight_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_festergut_gaseous_blight_SpellScript);
-
-            bool Validate(SpellEntry const* /*spell*/)
-            {
-                if (!sSpellStore.LookupEntry(SPELL_ORANGE_BLIGHT_RESIDUE))
-                    return false;
-                return true;
-            }
-
-            void ExtraEffect()
-            {
-                if (GetHitUnit()->HasAura(SPELL_ORANGE_BLIGHT_RESIDUE))
-                    return;
-
-                GetHitUnit()->CastSpell(GetHitUnit(), SPELL_ORANGE_BLIGHT_RESIDUE, true);
-            }
-
-            void Register()
-            {
-                AfterHit += SpellHitFn(spell_festergut_gaseous_blight_SpellScript::ExtraEffect);
-            }
-        };
-
-        SpellScript* GetSpellScript() const
-        {
-            return new spell_festergut_gaseous_blight_SpellScript();
-        }
-};
-
 class achievement_flu_shot_shortage : public AchievementCriteriaScript
 {
     public:
@@ -521,6 +473,5 @@ void AddSC_boss_festergut()
     new spell_festergut_pungent_blight();
     new spell_festergut_gastric_bloat();
     new spell_festergut_blighted_spores();
-    new spell_festergut_gaseous_blight();
     new achievement_flu_shot_shortage();
 }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index b20e7817bfe..33f52773ade 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -698,42 +698,6 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader
         }
 };
 
-class spell_rotface_slime_spray : public SpellScriptLoader
-{
-    public:
-        spell_rotface_slime_spray() : SpellScriptLoader("spell_rotface_slime_spray") { }
-
-        class spell_rotface_slime_spray_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_rotface_slime_spray_SpellScript);
-
-            bool Validate(SpellEntry const* /*spell*/)
-            {
-                if (!sSpellStore.LookupEntry(SPELL_GREEN_BLIGHT_RESIDUE))
-                    return false;
-                return true;
-            }
-
-            void ExtraEffect()
-            {
-                if (GetHitUnit()->HasAura(SPELL_GREEN_BLIGHT_RESIDUE))
-                    return;
-
-                GetHitUnit()->CastSpell(GetHitUnit(), SPELL_GREEN_BLIGHT_RESIDUE, true);
-            }
-
-            void Register()
-            {
-                AfterHit += SpellHitFn(spell_rotface_slime_spray_SpellScript::ExtraEffect);
-            }
-        };
-
-        SpellScript* GetSpellScript() const
-        {
-            return new spell_rotface_slime_spray_SpellScript();
-        }
-};
-
 void AddSC_boss_rotface()
 {
     new boss_rotface();
@@ -747,5 +711,4 @@ void AddSC_boss_rotface()
     new spell_rotface_unstable_ooze_explosion_init();
     new spell_rotface_unstable_ooze_explosion();
     new spell_rotface_unstable_ooze_explosion_suicide();
-    new spell_rotface_slime_spray();
 }