From 8c7a8eb9cd0fa0262252de4961ed88dfdf6edaaa Mon Sep 17 00:00:00 2001 From: teacher Date: Sun, 23 May 2010 11:10:31 +0200 Subject: More sql cleanup. Added missing data in fulls and renamed a wrongly named file (my fault). Also removed non TC-related data from sql update file. --HG-- branch : trunk --- sql/FULL/world_script_texts.sql | 2 +- sql/FULL/world_scripts_full.sql | 1 + sql/updates/8246_world_script_name.sql | 11 ----------- sql/updates/8246_world_scriptname.sql | 11 +++++++++++ sql/updates/8263_script_texts.sql | 13 ------------- sql/updates/8263_world_script_texts.sql | 13 +++++++++++++ sql/updates/8265_world_scriptname.sql | 1 - 7 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 sql/updates/8246_world_script_name.sql create mode 100644 sql/updates/8246_world_scriptname.sql delete mode 100644 sql/updates/8263_script_texts.sql create mode 100644 sql/updates/8263_world_script_texts.sql (limited to 'sql') diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index 5ad4c875dca..0b7b6531876 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -639,7 +639,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (10184,-1249001,'Learn your place mortal!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'onyxia SAY_KILL'), (10184,-1249002,'This meaningless exertion bores me. I''ll incinerate you all from above!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,254,'onyxia SAY_PHASE_2_TRANS'), (10184,-1249003,'It seems you''ll need another lesson, mortals!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,293,'onyxia SAY_PHASE_3_TRANS'), - (10184,-1249004,'takes in a deep breath...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'onyxia EMOTE_BREATH'), + (10184,-1249004,'%s takes in a deep breath...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'onyxia EMOTE_BREATH'), -- -1 269 000 OPENING OF THE DARK PORTAL (BLACK MORASS) (17880,-1269000,'Why do you persist? Surely you can see the futility of it all. It is not too late! You may still leave with your lives ...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10442,1,0,0,'temporus SAY_ENTER'), diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index e4299232a34..06e3265b0da 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -1026,6 +1026,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_acolyte_of_vesperon' WHERE `ent UPDATE `creature_template` SET `ScriptName`='npc_flame_tsunami' WHERE `entry`=30616; /* ONYXIA'S LAIR */ +UPDATE `instance_template` SET `script`='instance_onyxias_lair' WHERE `map`=249; UPDATE `creature_template` SET `ScriptName`='boss_onyxia' WHERE `entry`=10184; /* ORGRIMMAR */ diff --git a/sql/updates/8246_world_script_name.sql b/sql/updates/8246_world_script_name.sql deleted file mode 100644 index fc1f1825c83..00000000000 --- a/sql/updates/8246_world_script_name.sql +++ /dev/null @@ -1,11 +0,0 @@ -UPDATE `instance_template` SET `script`='instance_halls_of_reflection' WHERE `map`=668; -UPDATE `creature_template` SET `Scriptname`='boss_falric' WHERE `entry`=38112; -UPDATE `creature_template` SET `Scriptname`='boss_marwyn' WHERE `entry`=38113; -UPDATE `creature_template` SET `Scriptname`='npc_jaina_hor_part1' WHERE `entry`=37221; -UPDATE `creature_template` SET `Scriptname`='npc_sylvanas_hor_part1' WHERE `entry`=37223; -UPDATE `creature_template` SET `Scriptname`='npc_ghostly_priest' WHERE `entry`=38175; -UPDATE `creature_template` SET `Scriptname`='npc_phantom_mage' WHERE `entry`=38172; -UPDATE `creature_template` SET `Scriptname`='npc_phantom_hallucination' WHERE `entry`=38567; -UPDATE `creature_template` SET `Scriptname`='npc_shadowy_mercenary' WHERE `entry`=38177; -UPDATE `creature_template` SET `Scriptname`='npc_spectral_footman' WHERE `entry`=38173; -UPDATE `creature_template` SET `Scriptname`='npc_tortured_rifleman' WHERE `entry`=38176; diff --git a/sql/updates/8246_world_scriptname.sql b/sql/updates/8246_world_scriptname.sql new file mode 100644 index 00000000000..fc1f1825c83 --- /dev/null +++ b/sql/updates/8246_world_scriptname.sql @@ -0,0 +1,11 @@ +UPDATE `instance_template` SET `script`='instance_halls_of_reflection' WHERE `map`=668; +UPDATE `creature_template` SET `Scriptname`='boss_falric' WHERE `entry`=38112; +UPDATE `creature_template` SET `Scriptname`='boss_marwyn' WHERE `entry`=38113; +UPDATE `creature_template` SET `Scriptname`='npc_jaina_hor_part1' WHERE `entry`=37221; +UPDATE `creature_template` SET `Scriptname`='npc_sylvanas_hor_part1' WHERE `entry`=37223; +UPDATE `creature_template` SET `Scriptname`='npc_ghostly_priest' WHERE `entry`=38175; +UPDATE `creature_template` SET `Scriptname`='npc_phantom_mage' WHERE `entry`=38172; +UPDATE `creature_template` SET `Scriptname`='npc_phantom_hallucination' WHERE `entry`=38567; +UPDATE `creature_template` SET `Scriptname`='npc_shadowy_mercenary' WHERE `entry`=38177; +UPDATE `creature_template` SET `Scriptname`='npc_spectral_footman' WHERE `entry`=38173; +UPDATE `creature_template` SET `Scriptname`='npc_tortured_rifleman' WHERE `entry`=38176; diff --git a/sql/updates/8263_script_texts.sql b/sql/updates/8263_script_texts.sql deleted file mode 100644 index 3eb5328aff1..00000000000 --- a/sql/updates/8263_script_texts.sql +++ /dev/null @@ -1,13 +0,0 @@ --- King Ymiron voice by SnakeIce -DELETE FROM `script_texts` WHERE `npc_entry`=26861; -INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES -(26861,-1575028, 'You invade my home and then dare to challenge me? I will tear the hearts from your chests and offer them as gifts to the death god! Rualg nja gaborr!' ,13609,1,0,0, 'King Ymirom - SAY_AGGRO'), -(26861,-1575029, 'Your death is only the beginning!' ,13614,1,0,0, 'King Ymirom - SAY_SLAY_1'), -(26861,-1575030, 'You have failed your people!' ,13615,1,0,0, 'King Ymirom - SAY_SLAY_2'), -(26861,-1575031, 'There is a reason I am king!' ,13616,1,0,0, 'King Ymirom - SAY_SLAY_3'), -(26861,-1575032, 'Bleed no more!' ,13617,1,0,0, 'King Ymirom - SAY_SLAY_4'), -(26861,-1575033, 'What... awaits me... now?' ,13618,1,0,0, 'King Ymirom - SAY_DEATH'), -(26861,-1575034, 'Bjorn of the Black Storm! Honor me now with your presence!' ,13610,1,0,0, 'King Ymirom - SAY_SUMMON_BJORN'), -(26861,-1575035, 'Haldor of the Rocky Cliffs, grant me your strength!' ,13611,1,0,0, 'King Ymirom - SAY_SUMMON_HALDOR'), -(26861,-1575036, 'Ranulf of the Screaming Abyss, snuff these maggots with darkest night! ' ,13612,1,0,0, 'King Ymirom - SAY_SUMMON_RANULF'), -(26861,-1575037, 'Tor of the Brutal Siege! Bestow your might upon me!' ,13613,1,0,0, 'King Ymirom - SAY_SUMMON_TORGYN'); diff --git a/sql/updates/8263_world_script_texts.sql b/sql/updates/8263_world_script_texts.sql new file mode 100644 index 00000000000..3eb5328aff1 --- /dev/null +++ b/sql/updates/8263_world_script_texts.sql @@ -0,0 +1,13 @@ +-- King Ymiron voice by SnakeIce +DELETE FROM `script_texts` WHERE `npc_entry`=26861; +INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES +(26861,-1575028, 'You invade my home and then dare to challenge me? I will tear the hearts from your chests and offer them as gifts to the death god! Rualg nja gaborr!' ,13609,1,0,0, 'King Ymirom - SAY_AGGRO'), +(26861,-1575029, 'Your death is only the beginning!' ,13614,1,0,0, 'King Ymirom - SAY_SLAY_1'), +(26861,-1575030, 'You have failed your people!' ,13615,1,0,0, 'King Ymirom - SAY_SLAY_2'), +(26861,-1575031, 'There is a reason I am king!' ,13616,1,0,0, 'King Ymirom - SAY_SLAY_3'), +(26861,-1575032, 'Bleed no more!' ,13617,1,0,0, 'King Ymirom - SAY_SLAY_4'), +(26861,-1575033, 'What... awaits me... now?' ,13618,1,0,0, 'King Ymirom - SAY_DEATH'), +(26861,-1575034, 'Bjorn of the Black Storm! Honor me now with your presence!' ,13610,1,0,0, 'King Ymirom - SAY_SUMMON_BJORN'), +(26861,-1575035, 'Haldor of the Rocky Cliffs, grant me your strength!' ,13611,1,0,0, 'King Ymirom - SAY_SUMMON_HALDOR'), +(26861,-1575036, 'Ranulf of the Screaming Abyss, snuff these maggots with darkest night! ' ,13612,1,0,0, 'King Ymirom - SAY_SUMMON_RANULF'), +(26861,-1575037, 'Tor of the Brutal Siege! Bestow your might upon me!' ,13613,1,0,0, 'King Ymirom - SAY_SUMMON_TORGYN'); diff --git a/sql/updates/8265_world_scriptname.sql b/sql/updates/8265_world_scriptname.sql index dfb6557beb3..339365af1e7 100644 --- a/sql/updates/8265_world_scriptname.sql +++ b/sql/updates/8265_world_scriptname.sql @@ -1,2 +1 @@ UPDATE `instance_template` SET `script`='instance_onyxias_lair' WHERE `map`=249; -UPDATE `creature_template` SET `AIName`='EventAI' WHERE `entry`=36561; -- cgit v1.2.3