diff options
| -rw-r--r-- | sql/updates/world/2012_01_08_16_world_misc.sql (renamed from sql/updates/world/2011_01_08_16_world_misc.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2012_01_09_01_world_achievement_criteria_data.sql (renamed from sql/updates/world/2012_01_09_00_world_achievement_criteria_data.sql) | 4 | ||||
| -rw-r--r-- | sql/updates/world/2012_01_09_01_world_creature_text.sql | 5 | ||||
| -rw-r--r-- | sql/updates/world/2012_01_09_01_world_smart_scripts.sql | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 13 |
5 files changed, 13 insertions, 11 deletions
diff --git a/sql/updates/world/2011_01_08_16_world_misc.sql b/sql/updates/world/2012_01_08_16_world_misc.sql index 63cd81ff869..63cd81ff869 100644 --- a/sql/updates/world/2011_01_08_16_world_misc.sql +++ b/sql/updates/world/2012_01_08_16_world_misc.sql diff --git a/sql/updates/world/2012_01_09_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_01_09_01_world_achievement_criteria_data.sql index 6c2bcc86d03..ae3c2ec960a 100644 --- a/sql/updates/world/2012_01_09_00_world_achievement_criteria_data.sql +++ b/sql/updates/world/2012_01_09_01_world_achievement_criteria_data.sql @@ -2,4 +2,6 @@ DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (7612,7613); DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (7612,7613); INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES (7612,11,0,0, 'achievement_spore_loser'), -(7613,11,0,0, 'achievement_spore_loser'); +(7612,12,0,0,''), +(7613,11,0,0, 'achievement_spore_loser'), +(7613,12,1,0,''); diff --git a/sql/updates/world/2012_01_09_01_world_creature_text.sql b/sql/updates/world/2012_01_09_01_world_creature_text.sql new file mode 100644 index 00000000000..d1ec26bd7f4 --- /dev/null +++ b/sql/updates/world/2012_01_09_01_world_creature_text.sql @@ -0,0 +1,5 @@ +-- Missing Image of Arthas say text +DELETE FROM `creature_text` WHERE `entry`=29280; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(29280,0,0, 'Your sacrifice is a testament to your obedience. Indeed you are worthy of this charge. Arise, and forever be known as Svala Sorrowgrave!',14,0,0,0,0,14732, 'Image of Arthas SAY_DIALOG_OF_ARTHAS_1'), +(29280,1,0, 'Your first test awaits you. Destroy our uninvited guests.',14,0,0,0,0,14733, 'Image of Arthas SAY_DIALOG_OF_ARTHAS_2'); diff --git a/sql/updates/world/2012_01_09_01_world_smart_scripts.sql b/sql/updates/world/2012_01_09_01_world_smart_scripts.sql new file mode 100644 index 00000000000..a7304fa6e6a --- /dev/null +++ b/sql/updates/world/2012_01_09_01_world_smart_scripts.sql @@ -0,0 +1,2 @@ +-- Fix spamming of spell Ball of Flame (48246) +UPDATE `smart_scripts` SET `event_type`=54, `event_param1`=0, `event_param2`=0, `event_param3`=0, `event_param4`=0 WHERE `entryorguid`=27273; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 7280c3d5b82..9cab1de197c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -102,14 +102,7 @@ static const float spectatorWP[2][3] = {297.69f,-275.81f,86.36f} }; -static Position RitualChannelerPos[]= -{ - {296.42f, -355.01f, 90.94f, 1.58f}, - {302.36f, -352.01f, 90.54f, 2.20f}, - {291.39f, -352.01f, 90.54f, 0.91f} -}; static Position ArthasPos = { 295.81f, -366.16f, 92.57f, 1.58f }; -static Position SvalaPos = { 296.632f, -346.075f, 90.6307f, 1.58f }; class boss_svala : public CreatureScript { @@ -527,9 +520,9 @@ public: struct npc_ritual_channelerAI : public Scripted_NoMovementAI { - npc_ritual_channelerAI(Creature* c) :Scripted_NoMovementAI(c) + npc_ritual_channelerAI(Creature* creature) :Scripted_NoMovementAI(creature) { - instance = c->GetInstanceScript(); + instance = creature->GetInstanceScript(); } InstanceScript* instance; @@ -574,7 +567,7 @@ public: struct npc_spectatorAI : public ScriptedAI { - npc_spectatorAI(Creature* c) : ScriptedAI(c) { } + npc_spectatorAI(Creature* creature) : ScriptedAI(creature) { } void Reset() { } |