*Add SWP to world_scripts_full.sql from TrinityCore2.

*Rename kalocegos_teleporter to kalecgos_teleporter by Thraxx. Thank you.
*Rename boss_kalecgosKj to boss_kalecgos_kj.

--HG--
branch : trunk

3 files changed, 40 insertions, 20 deletions

diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index 9facb578021..fb416caea22 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -819,14 +819,34 @@ UPDATE `creature_template` SET `ScriptName`='mob_freed_soul' WHERE `entry`=11136
 /* SUNKEN TEMPLE */
 
 /* SUNWELL PLATEAU */
-update `instance_template` set `script` = 'instance_sunwell_plateau' where map = 580;
-UPDATE `creature_template` SET `ScriptName` = 'boss_brutallus' WHERE entry = 24882;
-UPDATE `creature_template` SET `ScriptName` = 'boss_felmyst' WHERE `entry` = 25038;
-UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_vapor' WHERE `entry` = 25265;
-UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_trail' WHERE `entry` = 25267;
-update `creature_template` set `ScriptName` = 'boss_sacrolash' where entry = 25165;
-update `creature_template` set `ScriptName` = 'boss_alythess' where entry = 25166;
-update `creature_template` set `ScriptName` = 'mob_shadow_image' where entry = 25214;
+UPDATE `instance_template` SET `script`='instance_sunwell_plateau' WHERE `map`=580;
+UPDATE `creature_template` SET `ScriptName`='boss_brutallus' WHERE `entry`=24882;
+UPDATE `creature_template` SET `ScriptName`='boss_felmyst' WHERE `entry`=25038;
+UPDATE `creature_template` SET `ScriptName`='mob_felmyst_vapor' WHERE `entry`=25265;
+UPDATE `creature_template` SET `ScriptName`='mob_felmyst_trail' WHERE `entry`=25267;
+UPDATE `creature_template` SET `ScriptName`='boss_sacrolash' WHERE `entry`=25165;
+UPDATE `creature_template` SET `ScriptName`='boss_alythess' WHERE `entry`=25166;
+UPDATE `creature_template` SET `ScriptName`='mob_shadow_image' WHERE `entry`=25214;
+UPDATE `creature_template` SET `ScriptName`='boss_kiljaeden' WHERE `entry`=25315;
+UPDATE `creature_template` SET `ScriptName`='boss_kalecgos_kj' WHERE `entry`=25319;
+UPDATE `creature_template` SET `ScriptName`='mob_kiljaeden_controller' WHERE `entry`=25608;
+UPDATE `creature_template` SET `ScriptName`='mob_hand_of_the_deceiver' WHERE `entry`=25588;
+UPDATE `creature_template` SET `ScriptName`='mob_felfire_portal' WHERE `entry`=25603;
+UPDATE `creature_template` SET `ScriptName`='mob_volatile_felfire_fiend' WHERE `entry`=25598;
+UPDATE `creature_template` SET `ScriptName`='mob_armageddon' WHERE `entry`=25735;
+UPDATE `creature_template` SET `ScriptName`='mob_shield_orb' WHERE `entry`=25502;
+UPDATE `creature_template` SET `ScriptName`='mob_sinster_reflection' WHERE `entry`=25708;
+UPDATE `gameobject_template` SET `ScriptName`='go_orb_of_the_blue_flight' WHERE `entry`=188415;
+UPDATE `creature_template` SET `ScriptName`='npc_void_sentinel' WHERE `entry`=25772;
+UPDATE `creature_template` SET `ScriptName`='npc_dark_fiend' WHERE `entry`=25744;
+UPDATE `creature_template` SET `ScriptName`='boss_muru' WHERE `entry`=25741;
+UPDATE `creature_template` SET `ScriptName`='boss_entropius' WHERE `entry`=25840;
+UPDATE `creature_template` SET `ScriptName`='npc_muru_portal' WHERE `entry`=25770;
+UPDATE `creature_template` SET `ScriptName`='boss_kalecgos' WHERE `entry`=24850;
+UPDATE `creature_template` SET `ScriptName`='boss_sathrovarr' WHERE `entry`=24892;
+UPDATE `creature_template` SET `ScriptName`='boss_kalec' WHERE `entry`=24891;
+UPDATE gameobject_template SET scriptname = 'kalecgos_teleporter' WHERE entry = 187055;
+UPDATE `creature_template` SET `ScriptName`='npc_blackhole' WHERE `entry`=25855;
 
 /* SWAMP OF SORROWS */
 
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
index fca9b0c19e3..56d389b30ef 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
@@ -644,7 +644,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
     }
 }
 
-bool GOkalocegos_teleporter(Player *player, GameObject* _GO)
+bool GOkalecgos_teleporter(Player *player, GameObject* _GO)
 {
     if(player->HasAura(AURA_SPECTRAL_EXHAUSTION, 0))
         player->GetSession()->SendNotification(GO_FAILED);
@@ -687,7 +687,7 @@ void AddSC_boss_kalecgos()
     newscript->RegisterSelf();
 
     newscript = new Script;
-    newscript->Name="kalocegos_teleporter";
-    newscript->pGOHello = &GOkalocegos_teleporter;
+    newscript->Name="kalecgos_teleporter";
+    newscript->pGOHello = &GOkalecgos_teleporter;
     newscript->RegisterSelf();
 }
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
index 29248b5e786..746aece5fd5 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
@@ -293,9 +293,9 @@ bool GOHello_go_orb_of_the_blue_flight(Player *plr, GameObject* go)
 }
 
 //AI for Kalecgos
-struct TRINITY_DLL_DECL boss_kalecgosKJAI : public ScriptedAI
+struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
 {
-    boss_kalecgosKJAI(Creature* c) : ScriptedAI(c){
+    boss_kalecgos_kjAI(Creature* c) : ScriptedAI(c){
         pInstance = ((ScriptedInstance*)c->GetInstanceData());
     }
 
@@ -402,9 +402,9 @@ struct TRINITY_DLL_DECL boss_kalecgosKJAI : public ScriptedAI
     }
 };
 
-CreatureAI* GetAI_boss_kalecgosKJ(Creature *_Creature)
+CreatureAI* GetAI_boss_kalecgos_kj(Creature *_Creature)
 {
-    return new boss_kalecgosKJAI (_Creature);
+    return new boss_kalecgos_kjAI (_Creature);
 }
 
 //AI for Kil'jaeden
@@ -649,8 +649,8 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         break;
                     case TIMER_ORBS_EMPOWER: //Phase 3
                         if(Phase == PHASE_SACRIFICE){
-                            if(Kalec)((boss_kalecgosKJAI*)Kalec->AI())->EmpowerOrb(true);
-                        }else if(Kalec)((boss_kalecgosKJAI*)Kalec->AI())->EmpowerOrb(false);
+                            if(Kalec)((boss_kalecgos_kjAI*)Kalec->AI())->EmpowerOrb(true);
+                        }else if(Kalec)((boss_kalecgos_kjAI*)Kalec->AI())->EmpowerOrb(false);
                         Timer[TIMER_ORBS_EMPOWER]= (Phase == PHASE_SACRIFICE) ? 45000 : 35000;
                         OrbActivated = true;
                         TimerIsDeactiveted[TIMER_ORBS_EMPOWER] = true;
@@ -749,7 +749,7 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA
 
     void Reset(){
         Phase = PHASE_DECEIVERS;
-        if(KalecKJ)((boss_kalecgosKJAI*)KalecKJ->AI())->ResetOrbs();
+        if(KalecKJ)((boss_kalecgos_kjAI*)KalecKJ->AI())->ResetOrbs();
         DeceiverDeathCount = 0;
         SummonedDeceivers = false;
         KiljaedenDeath = false;
@@ -1270,8 +1270,8 @@ void AddSC_boss_kiljaeden()
     newscript->RegisterSelf();
 
     newscript = new Script;
-    newscript->GetAI = &GetAI_boss_kalecgosKJ;
-    newscript->Name = "boss_kalecgosKJ";
+    newscript->GetAI = &GetAI_boss_kalecgos_kj;
+    newscript->Name = "boss_kalecgos_kj";
     newscript->RegisterSelf();
 
     newscript = new Script;