Scripted/ToC5: Add missing stuff in c0bf535e5bc978257952c9bd4e258eed238d1828

2 files changed, 13 insertions, 11 deletions

diff --git a/sql/updates/world/2013_08_11_00_world_spell_script_names.sql b/sql/updates/world/2013_08_11_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..00aee104022
--- /dev/null
+++ b/sql/updates/world/2013_08_11_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=66545;
+INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES
+(66545, 'spell_paletress_summon_memory');
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index 5a1bf00a3fc..0f8e9de89be 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -75,9 +75,9 @@ enum Spells
 
     // Merory of X (Summon)
     SPELL_MEMORY_ALGALON        = 66715,
-    SPELL_MEMORY_ARCHIMONDE     = 66715,
+    SPELL_MEMORY_ARCHIMONDE     = 66704,
     SPELL_MEMORY_CHROMAGGUS     = 66697,
-    SPELL_MEMORY_CYANIGOSA      = 66697,
+    SPELL_MEMORY_CYANIGOSA      = 66709,
     SPELL_MEMORY_DELRISSA       = 66706,
     SPELL_MEMORY_ECK            = 66710,
     SPELL_MEMORY_ENTROPIUS      = 66707,
@@ -623,15 +623,14 @@ uint32 const memorySpellId[25] =
 };
 
 // 66545 - Summon Memory
-class spell_summon_memory : public SpellScriptLoader
+class spell_paletress_summon_memory : public SpellScriptLoader
 {
     public:
-        spell_summon_memory() : SpellScriptLoader("spell_summon_memory") { }
+        spell_paletress_summon_memory() : SpellScriptLoader("spell_paletress_summon_memory") { }
 
-        class spell_summon_memory_SpellScript : public SpellScript
+        class spell_paletress_summon_memory_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_summon_memory_SpellScript);
-
+            PrepareSpellScript(spell_paletress_summon_memory_SpellScript);
 
             bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
             {
@@ -661,14 +660,14 @@ class spell_summon_memory : public SpellScriptLoader
 
             void Register() OVERRIDE
             {
-                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_summon_memory_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
-                OnEffectHitTarget += SpellEffectFn(spell_summon_memory_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paletress_summon_memory_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
+                OnEffectHitTarget += SpellEffectFn(spell_paletress_summon_memory_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
             }
         };
 
         SpellScript* GetSpellScript() const OVERRIDE
         {
-            return new spell_summon_memory_SpellScript();
+            return new spell_paletress_summon_memory_SpellScript();
         }
 };
 
@@ -679,5 +678,5 @@ void AddSC_boss_argent_challenge()
     new boss_paletress();
     new npc_memory();
     new npc_argent_soldier();
-    new spell_summon_memory();
+    new spell_paletress_summon_memory();
 }