diff options
35 files changed, 92 insertions, 94 deletions
diff --git a/sql/updates/833_world_scripts.sql b/sql/updates/833_world_scripts.sql index ad68e7a1da0..12ed9ecced5 100644 --- a/sql/updates/833_world_scripts.sql +++ b/sql/updates/833_world_scripts.sql @@ -1,2 +1,2 @@ -update creature_template set scriptname='npc_dirty_larry', unit_flags=0, flags_extra=0 where entry=19720; -update creature_template set unit_flags=0, flags_extra=0 where entry in (19726, 19725);
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_dirty_larry', `unit_flags`=0, `flags_extra`=0 WHERE `entry`=19720; +UPDATE `creature_template` SET `unit_flags`=0, `flags_extra`=0 WHERE `entry` IN (19726, 19725);
\ No newline at end of file diff --git a/sql/updates/837_world_scripts.sql b/sql/updates/837_world_scripts.sql index 9146566cf18..5fc2abfc4df 100644 --- a/sql/updates/837_world_scripts.sql +++ b/sql/updates/837_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname='npc_khadgar' where entry=18166;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_khadgar' WHERE `entry`=18166;
\ No newline at end of file diff --git a/sql/updates/838_world_scripts.sql b/sql/updates/838_world_scripts.sql index bb7f56c059d..790ae75aa64 100644 --- a/sql/updates/838_world_scripts.sql +++ b/sql/updates/838_world_scripts.sql @@ -1,4 +1,4 @@ -delete from spell_script_target where entry=42222; -insert into `spell_script_target` values -('42222','1','23616'); -update `creature_template` set `scriptname`='npc_kyle_frenzied' where `entry`='23616'; +UPDATE `creature_template` SET `ScriptName`='npc_kyle_frenzied' WHERE `entry`='23616'; +DELETE FROM `spell_script_target` WHERE `entry`=42222; +INSERT INTO `spell_script_target` values +('42222','1','23616');
\ No newline at end of file diff --git a/sql/updates/839_world_scripts.sql b/sql/updates/839_world_scripts.sql index 722737ea3b0..7b4ef66ba92 100644 --- a/sql/updates/839_world_scripts.sql +++ b/sql/updates/839_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname='npc_wizzlecrank_shredder' where entry=3439;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_wizzlecrank_shredder' WHERE `entry`=3439;
\ No newline at end of file diff --git a/sql/updates/840_world_scripts.sql b/sql/updates/840_world_scripts.sql index 8b0140b6dbb..cfa3d492b9a 100644 --- a/sql/updates/840_world_scripts.sql +++ b/sql/updates/840_world_scripts.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `spell1` = 0, `flags_extra` = 0, `ScriptName` = 'npc_volcano' WHERE `entry` = 23085;
\ No newline at end of file +UPDATE `creature_template` SET `spell1`=0, `flags_extra`=0, `ScriptName`='npc_volcano' WHERE `entry`=23085;
\ No newline at end of file diff --git a/sql/updates/841_world_scripts.sql b/sql/updates/841_world_scripts.sql index f23cb8f8cc8..86d73ba2019 100644 --- a/sql/updates/841_world_scripts.sql +++ b/sql/updates/841_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname='npc_greengill_slave' where entry=25084;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_greengill_slave' WHERE `entry`=25084;
\ No newline at end of file diff --git a/sql/updates/842_world.sql b/sql/updates/842_world.sql index 953dff584a0..cf017877b5e 100644 --- a/sql/updates/842_world.sql +++ b/sql/updates/842_world.sql @@ -2,4 +2,4 @@ ALTER TABLE `areatrigger_teleport` ADD `heroic_required_quest_done` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0 AFTER `heroic_key2`, ADD `heroic_required_failed_quest_text` TEXT NULL DEFAULT NULL AFTER `heroic_required_quest_done`; -UPDATE `areatrigger_teleport` SET `heroic_required_quest_done` = 11492, `heroic_required_failed_quest_text` = 'Heroic Difficulty requires completion of the "Hard to Kill" quest.' WHERE `id` = 4887;
\ No newline at end of file +UPDATE `areatrigger_teleport` SET `heroic_required_quest_done`=11492, `heroic_required_failed_quest_text`='Heroic Difficulty requires completion of the "Hard to Kill" quest.' WHERE `id`=4887;
\ No newline at end of file diff --git a/sql/updates/850_world_scripts.sql b/sql/updates/850_world_scripts.sql index 720465b63f0..3027947cf14 100644 --- a/sql/updates/850_world_scripts.sql +++ b/sql/updates/850_world_scripts.sql @@ -1 +1 @@ -UPDATE creature_template SET ScriptName = 'npc_bessy' WHERE entry = 20415;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415;
\ No newline at end of file diff --git a/sql/updates/852_world_scripts.sql b/sql/updates/852_world_scripts.sql index 96b5c7d6e71..001b43c8820 100644 --- a/sql/updates/852_world_scripts.sql +++ b/sql/updates/852_world_scripts.sql @@ -1,2 +1,2 @@ -update creature_template set scriptname='mob_nestlewood_owlkin' where entry=16518; -update item_template set scriptname='item_inoculating_crystal' where entry=22962;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' WHERE `entry`=16518; +UPDATE `item_template` SET `ScriptName`='item_inoculating_crystal' WHERE `entry`=22962;
\ No newline at end of file diff --git a/sql/updates/857_world_scripts.sql b/sql/updates/857_world_scripts.sql index 3a34d80ee76..acd712aecb9 100644 --- a/sql/updates/857_world_scripts.sql +++ b/sql/updates/857_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname='npc_kaya_flathoof' where entry=11856;
\ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_kaya_flathoof' WHERE `entry`=11856;
\ No newline at end of file diff --git a/sql/updates/863_world_scripts.sql b/sql/updates/863_world_scripts.sql index e23f6067c05..a7a214b8956 100644 --- a/sql/updates/863_world_scripts.sql +++ b/sql/updates/863_world_scripts.sql @@ -1,5 +1,7 @@ +UPDATE `creature_template` SET `ScriptName`='npc_OOX17' WHERE `entry`=7784; + DELETE FROM `script_texts` WHERE `entry` BETWEEN -1060005 AND -1060000; -INSERT INTO script_texts +INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), @@ -7,6 +9,4 @@ VALUES (-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), (-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), (-1060004, 'No one challenges the wastevander nomads -- not even robotic chickens! ATTACK!', NULL, NULL, 'Niemand fordert die Wüsenläufernomaden heraus - auch keine Robothühner! ANGRIFF!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (-1060005, 'Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!', NULL, NULL, 'Tarnsysteme online! GLUCK! Tarnung für Transport nach Beutebucht wird aktiviert.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL); - -UPDATE `creature_template` SET `ScriptName` = 'npc_OOX17' WHERE `entry` = 7784;
\ No newline at end of file + (-1060005, 'Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!', NULL, NULL, 'Tarnsysteme online! GLUCK! Tarnung für Transport nach Beutebucht wird aktiviert.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL);
\ No newline at end of file diff --git a/sql/updates/871_world.sql b/sql/updates/871_world.sql index 54922de2a40..114cd3101b7 100644 --- a/sql/updates/871_world.sql +++ b/sql/updates/871_world.sql @@ -1,6 +1,6 @@ DELETE FROM `trinity_string` WHERE `entry` BETWEEN '288' AND '295'; DELETE FROM `trinity_string` WHERE `entry` BETWEEN '2000' AND '2029'; -INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (2000, '|cff00ff00New ticket from|r|cffff00ff %s.|r |cff00ff00Ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), (2001, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00edited his/her ticket:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), (2002, '|cff00ff00Character|r|cffff00ff %s |r|cff00ff00abandoned ticket entry:|r|cffff00ff %d.|r', '', '', '', '', '', '', '', ''), @@ -28,4 +28,4 @@ INSERT INTO trinity_string (`entry`, `content_default`, `content_loc1`, `content (2024, '\n|cff00ccff%s|r |cff00ff00Added comment|r: \"%s\"|r ', '', '', '', '', '', '', '', ''); DELETE FROM `command` WHERE (`name` LIKE '%ticket closedlist%'); -INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket closedlist','1','Displays a list of closed GM tickets.'); +INSERT INTO `command` (`name`,`security`,`help`) VALUES ('.ticket closedlist','1','Displays a list of closed GM tickets.');
\ No newline at end of file diff --git a/sql/updates/884_world.sql b/sql/updates/884_world.sql index fd3ead62313..99fab2ac742 100644 --- a/sql/updates/884_world.sql +++ b/sql/updates/884_world.sql @@ -1,4 +1,4 @@ -delete from command where name in ('gobject tempadd','npc tempadd'); -insert into command (name, security, help) values +DELETE FROM `command` WHERE `name` IN ('gobject tempadd','npc tempadd'); +INSERT INTO `command` (name, security, help) values ('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'), -('npc addtemp','2','Adds temporary NPC, not saved to database.'); +('npc addtemp','2','Adds temporary NPC, not saved to database.');
\ No newline at end of file diff --git a/sql/updates/917_world.sql b/sql/updates/917_world.sql index 084091ec0af..7c989ce7ca4 100644 --- a/sql/updates/917_world.sql +++ b/sql/updates/917_world.sql @@ -3,6 +3,6 @@ CREATE TABLE `version` ( `db_version` varchar(120) default NULL COMMENT 'Version of world DB.', `script_version` varchar(120) default NULL COMMENT 'Version of scripts DB.' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes'; -INSERT INTO version (core_version, db_version, script_version) VALUES ("",(SELECT version FROM db_version),(SELECT version FROM script_db_version)); -DROP TABLE IF EXISTS db_version; -DROP TABLE IF EXISTS script_db_version;
\ No newline at end of file +INSERT INTO `version` (core_version, db_version, script_version) VALUES ("",(SELECT version FROM db_version),(SELECT version FROM script_db_version)); +DROP TABLE IF EXISTS `db_version`; +DROP TABLE IF EXISTS `script_db_version`;
\ No newline at end of file diff --git a/sql/updates/919_world.sql b/sql/updates/919_world.sql index 24267d49223..4d4a6308576 100644 --- a/sql/updates/919_world.sql +++ b/sql/updates/919_world.sql @@ -1,2 +1,2 @@ -ALTER TABLE version +ALTER TABLE `version` ADD `core_revision` BIGINT UNSIGNED AFTER `core_version`;
\ No newline at end of file diff --git a/sql/updates/930_characters.sql b/sql/updates/930_characters.sql index f0ec58c2dc6..cc215786bb1 100644 --- a/sql/updates/930_characters.sql +++ b/sql/updates/930_characters.sql @@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `auctionhousebot` ( -- -- Data for table `auctionhousebot` -- -insert into `auctionhousebot` (`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerbiddinginterval`,`buyerbidsperinterval`) values +INSERT IGNORE INTO `auctionhousebot` (`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerbiddinginterval`,`buyerbidsperinterval`) values (2,'Alliance',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1), (6,'Horde',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1), -(7,'Neutral',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1); +(7,'Neutral',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1);
\ No newline at end of file diff --git a/sql/updates/933_world_scripts.sql b/sql/updates/933_world_scripts.sql index 7b1271e25cc..1a3e9d96f56 100644 --- a/sql/updates/933_world_scripts.sql +++ b/sql/updates/933_world_scripts.sql @@ -1 +1 @@ -update creature_template set scriptname='npc_snake_trap_serpents' where entry in (19921, 19833); +UPDATE `creature_template` SET `ScriptName`='npc_snake_trap_serpents' WHERE `entry` IN (19921, 19833);
\ No newline at end of file diff --git a/sql/updates/935_world_scripts.sql b/sql/updates/935_world_scripts.sql index de02b51d490..934d3a7de23 100644 --- a/sql/updates/935_world_scripts.sql +++ b/sql/updates/935_world_scripts.sql @@ -1,6 +1,6 @@ -DELETE FROM `creature` WHERE `id` = '17653'; +DELETE FROM `creature` WHERE `id`='17653'; -UPDATE `gameobject_template` SET `flags` = '4' WHERE `entry` IN ('181766','181823'); -UPDATE `gameobject` SET `SpawnMask` = '3',`state` = '1' WHERE `id` IN ('181766','181823'); +UPDATE `gameobject_template` SET `flags`='4' WHERE `entry` IN ('181766','181823'); +UPDATE `gameobject` SET `SpawnMask`='3',`state`='1' WHERE `id` IN ('181766','181823'); -UPDATE `instance_template` SET `script` = 'instance_blood_furnace' WHERE `map` = '542';
\ No newline at end of file +UPDATE `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542;
\ No newline at end of file diff --git a/sql/updates/940_world_scripts.sql b/sql/updates/940_world_scripts.sql index c9ad252f41f..c7f378c6360 100644 --- a/sql/updates/940_world_scripts.sql +++ b/sql/updates/940_world_scripts.sql @@ -1,2 +1,2 @@ -ALTER TABLE custom_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE script_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0';
\ No newline at end of file +ALTER TABLE `custom_texts` CHANGE COLUMN `emote` `emote` smallint(5) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `script_texts` CHANGE COLUMN `emote` `emote` smallint(5) unsigned NOT NULL DEFAULT '0';
\ No newline at end of file diff --git a/sql/updates/945_world_scripts.sql b/sql/updates/945_world_scripts.sql index 8d007e347f9..e64ec54a3f7 100644 --- a/sql/updates/945_world_scripts.sql +++ b/sql/updates/945_world_scripts.sql @@ -1,8 +1,8 @@ -update creature_template set scriptname='' where entry=22083; -update creature_template set scriptname='npc_overlord_morghor' where entry=23139; -update creature_template set scriptname='' where entry=23141; -DELETE FROM script_texts WHERE entry BETWEEN -1000221 and -1000206; -INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=22083; +UPDATE `creature_template` SET `ScriptName`='npc_overlord_morghor' WHERE `entry`= 23139; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=23141; +DELETE FROM `script_texts` WHERE entry BETWEEN -1000221 and -1000206; +INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES (-1000206, 'Come, $N. Lord Stormrage awaits.', 0, 1, 'OVERLORD_SAY_1'), (-1000207, 'Lord Illidan will be here shortly.', 0, 1, 'OVERLORD_SAY_2'), (-1000208, 'Lord Illidan, this is the Dragonmaw that I, and others, have told you about. He will lead us to victory!', 0, 1, 'OVERLORD_SAY_3'), @@ -20,12 +20,12 @@ INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES (-1000220, 'I expect to see this insect\'s carcass in pieces in my lair within the hour. Fail and you will suffer a fate so much worse than death.', 0, 1, 'LORD_ILLIDAN_SAY_7'), (-1000221, 'You will not harm the boy, Mor\'ghor! Quickly, $N, climb on my back!', 0, 22, 'YARZILL_THE_MERC_SAY'); -DELETE FROM script_texts WHERE entry='-1000222'; -INSERT INTO script_texts (entry, content_default, type, language, emote, comment) VALUES +DELETE FROM `script_texts` WHERE `entry`='-1000222'; +INSERT INTO `script_texts` (entry, content_default, type, language, emote, comment) VALUES (-1000222, 'Thank you, mortal.', 0, 11, 1, 'SAY_JUST_EATEN'); -DELETE FROM script_texts WHERE entry BETWEEN -1000234 and -1000223; -INSERT INTO script_texts (entry, content_default, emote, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000234 and -1000223; +INSERT INTO `script_texts` (entry, content_default, emote, comment) VALUES (-1000223, 'I sense the tortured spirits, $N. They are this way, come quickly!', 1, 'SAY_START'), (-1000224, 'Watch out!', 0, 'SAY_AGGRO1'), (-1000225, 'Naga attackers! Defend yourself!', 0, 'SAY_AGGRO2'), @@ -37,5 +37,4 @@ INSERT INTO script_texts (entry, content_default, emote, comment) VALUES (-1000231, 'Lady Vashj must answer for these atrocities. She must be brought to justice!', 0, 'SAY_PROGRESS4'), (-1000232, 'The tumultuous nature of the great waterways of Azeroth and Draenor are a direct result of tormented water spirits.', 0, 'SAY_PROGRESS5'), (-1000233, 'It shouldn\'t be much further, $N. The exit is just up ahead.', 0, 'SAY_PROGRESS6'), -(-1000234, 'Thank you, $N. Please return to my brethren at the Altar of Damnation, near the Hand of Gul\'dan, and tell them that Wilda is safe. May the Earthmother watch over you...', 0, 'SAY_END'); - +(-1000234, 'Thank you, $N. Please return to my brethren at the Altar of Damnation, near the Hand of Gul\'dan, and tell them that Wilda is safe. May the Earthmother watch over you...', 0, 'SAY_END');
\ No newline at end of file diff --git a/sql/updates/947_world_scripts.sql b/sql/updates/947_world_scripts.sql index 7067a1ed706..a62e3a24455 100644 --- a/sql/updates/947_world_scripts.sql +++ b/sql/updates/947_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000244 and -1000235; -INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000244 and -1000235; +INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES (-1000235, 'Ok, $N. Follow me to the cave where I\'ll attempt to harness the power of the rune stone into these goggles.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_1'), (-1000236, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_2'), (-1000237, 'I\'ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_3'), diff --git a/sql/updates/948_world_scripts.sql b/sql/updates/948_world_scripts.sql index 5f8f74cb5c0..4828323f7e6 100644 --- a/sql/updates/948_world_scripts.sql +++ b/sql/updates/948_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000247 and -1000245; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000247 and -1000245; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000245, 'You, there! Hand over that moonstone and nobody gets hurt!', 1, 'SAY_RIZZLE_START'), (-1000246, 'Just chill!', 4, 'SAY_RIZZLE_GRENADE'), (-1000247, 'All right, you win! I surrender! Just don\'t hurt me!', 1, 'SAY_RIZZLE_FINAL');
\ No newline at end of file diff --git a/sql/updates/950_world_scripts.sql b/sql/updates/950_world_scripts.sql index 789ad810123..df7fda62a4d 100644 --- a/sql/updates/950_world_scripts.sql +++ b/sql/updates/950_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000266 and -1000248; -INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000266 and -1000248; +INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES (-1000248, 'The last thing I remember is the ship falling and us getting into the pods. I\'ll go see how I can help. Thank you!', 0, 0, 'draenei survivor - HEAL1'), (-1000249, '$C, Where am I? Who are you? Oh no! What happened to the ship?.', 0, 0, 'draenei survivor - HEAL2'), (-1000250, '$C You saved me! I owe you a debt that I can never repay. I\'ll go see if I can help the others.', 0, 0, 'draenei survivor - HEAL3'), diff --git a/sql/updates/951_world_scripts.sql b/sql/updates/951_world_scripts.sql index 39208672b32..c0d7a80d58c 100644 --- a/sql/updates/951_world_scripts.sql +++ b/sql/updates/951_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000279 and -1000267; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000279 and -1000267; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000267, 'Ready when you are, warrior.', 1, 'flathead - SAY_BIG_WILL_READY'), (-1000268, 'The Affray has begun, get ready to fight!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_BEGIN'), (-1000269, 'You! Enter the fray!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_FRAY'), diff --git a/sql/updates/952_world_scripts.sql b/sql/updates/952_world_scripts.sql index e06302538a2..b252050d981 100644 --- a/sql/updates/952_world_scripts.sql +++ b/sql/updates/952_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts where entry BETWEEN -1000285 and -1000280; -INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000285 and -1000280; +INSERT INTO `script_texts` (entry, content_default, type, language, comment) VALUES (-1000280, 'Thank you, dear Paladin, you just saved my life.', 0, 7, 'faulk - SAY_HEAL'), (-1000281, 'Very well. Let\'s see what you have to show me, $N.', 0, 0, 'anvilvard - SAY_PR_1'), diff --git a/sql/updates/953_world_scripts.sql b/sql/updates/953_world_scripts.sql index 3811b6a98cf..3f0f46fd8e3 100644 --- a/sql/updates/953_world_scripts.sql +++ b/sql/updates/953_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts where entry BETWEEN -1000292 and -1000286; -INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000292 and -1000286; +INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES (-1000286, 'A shadowy, sinister presence has invader the Emerald Dream. Its power is poised to spill over into our world, $N. We must oppose it! That\'s why I cannot accompany you in person.', 0, 0, 'clintar_spirit'), (-1000287, 'The Emerald Dream will never be yours!', 0, 0, 'clintar_spirit'), (-1000288, 'Begone from this place!', 0, 0, 'clintar_spirit'), diff --git a/sql/updates/954_world_scripts.sql b/sql/updates/954_world_scripts.sql index 009f59517ac..70a5a377dbd 100644 --- a/sql/updates/954_world_scripts.sql +++ b/sql/updates/954_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000305 and -1000293; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000305 and -1000293; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000293, 'In Nagrand, food hunt ogre!', 0, 'LUMP_SAY0'), (-1000294, 'You taste good with maybe a little salt and pepper.', 0, 'LUMP_SAY1'), (-1000295, 'OK, OK! Lump give up!', 0, 'LUMP_DEFEAT'), diff --git a/sql/updates/955_world_scripts.sql b/sql/updates/955_world_scripts.sql index 7c389377433..5978a4786ad 100644 --- a/sql/updates/955_world_scripts.sql +++ b/sql/updates/955_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000333 and -1000306; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000333 and -1000306; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000306, 'Follow me, stranger. This won\'t take long.', 0, 'npc_kservant - SAY1'), (-1000307, 'Shattrath was once the draenei capital of this world. Its name means \"dwelling of light.\"', 4, 'npc_kservant - WHISP1'), (-1000308, 'When the Burning Legion turned the orcs against the draenei, the fiercest battle was fought here. The draenei fought tooth and nail, but in the end the city fell.', 4, 'npc_kservant - WHISP2'), @@ -31,12 +31,12 @@ INSERT INTO script_texts (entry, content_default, type, comment) VALUES (-1000332, 'Time to meet your maker!', 0, ''), (-1000333, 'Alright, we give up! Don\'t hurt us!', 0, ''); -DELETE FROM script_texts WHERE entry=-1000334; -INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +DELETE FROM `script_texts` WHERE `entry`=-1000334; +INSERT INTO `script_texts` (entry, content_default, type, language, comment) VALUES (-1000334, 'Thank you, dear Paladin, you just saved my life.', 0, 10, 'stillblade - SAY_HEAL'); -DELETE FROM script_texts WHERE entry BETWEEN -1000349 and -1000335; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000349 and -1000335; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland - SAY_QUESTACCEPT'), (-1000336, 'Be careful, $N. Those wolves like to hide among the trees.', 0, 'npc_deathstalker_erland - SAY_START'), diff --git a/sql/updates/956_world_scripts.sql b/sql/updates/956_world_scripts.sql index 35859f191b5..8ac06a7ab97 100644 --- a/sql/updates/956_world_scripts.sql +++ b/sql/updates/956_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000365 and -1000350; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000365 and -1000350; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000350, 'Who dares awaken Aquementas?', 1, 'mob_aquementas - AGGRO_YELL_AQUE'), (-1000351, 'I give up! Please don\'t kill me!', 0, 'mob_unkor_the_ruthless - SAY_SUBMIT'), @@ -9,9 +9,7 @@ INSERT INTO script_texts (entry, content_default, type, comment) VALUES (-1000353, 'Ok let\'s get out of here!', 0, 'npc_isla_starmane - SAY_PROGRESS_1'), (-1000354, 'You sure you\'re ready? Take a moment.', 0, 'npc_isla_starmane - SAY_PROGRESS_2'), (-1000355, 'Alright, let\'s do this!', 0, 'npc_isla_starmane - SAY_PROGRESS_3'), -(-1000356, 'Ok, I think I can make it on my own from here. Thank you so much for breaking me out of there!', 0, - -'npc_isla_starmane - SAY_PROGRESS_4'), +(-1000356, 'Ok, I think I can make it on my own from here. Thank you so much for breaking me out of there!', 0, 'npc_isla_starmane - SAY_PROGRESS_4'), (-1000357, 'Belore...', 0, 'npc_lady_sylvanas_windrunner - SAY_LAMENT_END'), (-1000358, 'kneels down and pick up the amulet.', 2, 'npc_lady_sylvanas_windrunner - EMOTE_LAMENT_END'), diff --git a/sql/updates/957_world_scripts.sql b/sql/updates/957_world_scripts.sql index 8cae6b3fe87..368bd1f5573 100644 --- a/sql/updates/957_world_scripts.sql +++ b/sql/updates/957_world_scripts.sql @@ -33,4 +33,4 @@ INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) ('2081','4','-1430','1705','112'), ('2081','5','-1393.5','1705.5','112'), ('2081','6','-1369.8','1724.5','112'), -('2081','7','-1377','1760','112'); +('2081','7','-1377','1760','112');
\ No newline at end of file diff --git a/sql/updates/963_world_scripts.sql b/sql/updates/963_world_scripts.sql index df886987039..9083b243064 100644 --- a/sql/updates/963_world_scripts.sql +++ b/sql/updates/963_world_scripts.sql @@ -1,13 +1,13 @@ -UPDATE creature_template set ScriptName='mob_illidari_spawn' WHERE entry IN (22075,22074,19797); +UPDATE `creature_template` SET `ScriptName`='mob_illidari_spawn' WHERE `entry` IN (22075,22074,19797); UPDATE `creature_template` SET `ScriptName`='mob_torloth_the_magnificent' WHERE `entry`='22076'; -UPDATE creature_template SET ScriptName='npc_lord_illidan_stormrage' WHERE entry=22083; -delete from creature where id=22083; -INSERT INTO creature (id, map, spawnMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) +UPDATE `creature_template` SET `ScriptName`='npc_lord_illidan_stormrage' WHERE `entry`=22083; +DELETE FROM `creature` WHERE `id`=22083; +INSERT INTO `creature` (id, map, spawnMask, modelid, equipment_id, position_x, position_y, position_z, orientation, spawntimesecs, spawndist, currentwaypoint, curhealth, curmana, DeathState, MovementType) VALUES (22083, 530, 1, 0, 0, -4635.75, 1386.32, 137.34, 5.72398, 25,0, 0, 9955, 6774, 0, 0); -update gameobject_template set scriptname='go_crystal_prison' where entry=185126; +UPDATE `gameobject_template` SET `ScriptName`='go_crystal_prison' WHERE `entry`=185126; -DELETE FROM script_texts WHERE entry BETWEEN -1000374 and -1000366; -INSERT INTO script_texts (entry, content_default, type, comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000374 and -1000366; +INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES (-1000366, 'So you have defeated the Crimson Sigil. You now seek to challenge my rule? Not even Arthas could defeat me, yet you dare to even harbor such thoughts? Then I say to you, come! Come $N! The Black Temple awaits...', 1, 'Quest: Battle of the crimson watch - END_TEXT'), (-1000367, 'At your command, my liege...', 0, 'TorlothAnim - First'), diff --git a/sql/updates/965_world_scripts.sql b/sql/updates/965_world_scripts.sql index 9c93f78ec09..e3160223d5a 100644 --- a/sql/updates/965_world_scripts.sql +++ b/sql/updates/965_world_scripts.sql @@ -14,4 +14,4 @@ REPLACE INTO `spell_script_target` VALUES (21934,1,21934), (43144,1,23817), (12613,1,5843), -(9095,1,1200); +(9095,1,1200);
\ No newline at end of file diff --git a/sql/updates/966_world_scripts.sql b/sql/updates/966_world_scripts.sql index 10a3e09985c..f49411890f4 100644 --- a/sql/updates/966_world_scripts.sql +++ b/sql/updates/966_world_scripts.sql @@ -1,5 +1,5 @@ -DELETE FROM script_texts WHERE entry BETWEEN -1000395 AND -1000375; -INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000395 AND -1000375; +INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES (-1000375 ,'I remember well the sting of defeat at the conclusion of the Third War. I have waited far too long for my revenge. Now the shadow of the Legion falls over this world. It is only a matter of time until all of your failed creation... is undone.',11332,1,0,0,'kazzak SAY_INTRO'), (-1000376,'The Legion will conquer all!',11333,1,0,0,'kazzak SAY_AGGRO1'), (-1000377,'All mortals will perish!',11334,1,0,0,'kazzak SAY_AGGRO2'), diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/970_world_scripts.sql index 3394b71ab20..5a9223cfc78 100644 --- a/sql/updates/970_world_scripts.sql +++ b/sql/updates/970_world_scripts.sql @@ -5,4 +5,4 @@ INSERT INTO `script_texts` (entry, content_default, type, language, comment) VAL (-1000398, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'), (-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'), (-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'), -(-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE'); +(-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE');
\ No newline at end of file diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql index cb59973d5e2..862b66dbf07 100644 --- a/sql/world_scripts_full.sql +++ b/sql/world_scripts_full.sql @@ -21,7 +21,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_tablet_of_the_seven' WHERE `en UPDATE `gameobject_template` set `ScriptName`='go_manticron_cube' WHERE `entry`=181713; UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_trigger' WHERE `entry`=104593; UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_door' WHERE `entry`=176594; -UPDATE `gameobject_template` SET `scriptname`='go_crystal_prison' WHERE `entry`=185126; +UPDATE `gameobject_template` SET `ScriptName`='go_crystal_prison' WHERE `entry`=185126; /* GUARD */ UPDATE `creature_template` SET `ScriptName`='guard_azuremyst' WHERE `entry`=18038; @@ -67,6 +67,7 @@ UPDATE `item_template` SET `ScriptName`='item_vorenthals_presence' WHERE `entry` UPDATE `item_template` SET `ScriptName`='item_yehkinyas_bramble' WHERE `entry`=10699; UPDATE `item_template` SET `ScriptName`='item_zezzaks_shard' WHERE `entry`=31463; UPDATE `item_template` SET `ScriptName`='item_only_for_flight' WHERE `entry` IN (34475, 34489, 24538); +UPDATE `item_template` SET `ScriptName`='item_inoculating_crystal' WHERE `entry`=22962; /* NPC (usually creatures to be found in more than one specific zone) */ UPDATE `creature_template` SET `ScriptName`='npc_chicken_cluck' WHERE `entry`=620; @@ -219,11 +220,11 @@ UPDATE `creature_template` SET `ScriptName`='boss_high_interrogator_gerstahn' WH UPDATE `creature_template` SET `ScriptName`='boss_magmus' WHERE `entry`=9938; UPDATE `creature_template` SET `ScriptName`='boss_seethrel' WHERE `entry`=9038; UPDATE `creature_template` SET `ScriptName`='boss_vilerel' WHERE `entry`=9036; -UPDATE `creature_template` SET `ScriptName`='phalanx' WHERE `entry`=9502; UPDATE `creature_template` SET `ScriptName`='npc_lokhtos_darkbargainer' WHERE `entry`=12944; UPDATE `creature_template` SET `ScriptName`='npc_kharan_mighthammer' WHERE `entry`=9021; UPDATE `creature_template` SET `ScriptName`='npc_grimstone' WHERE `entry`=10096; UPDATE `creature_template` SET `ScriptName`='npc_rocknot' WHERE `entry`=9503; +UPDATE `creature_template` SET `ScriptName`='mob_phalanx' WHERE `entry`=9502; /* BLACKROCK SPIRE */ /* BLACKROCK SPIRE Lower bosses */ @@ -329,7 +330,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_steamrigger_mechanic' WHERE `en /* SERPENTSHRINE CAVERN */ UPDATE `instance_template` SET `script`='instance_serpent_shrine' WHERE `map`=548; UPDATE `creature_template` SET `ScriptName`='boss_hydross_the_unstable' WHERE `entry`=21216; -UPDATE `creature_template` SET `ScriptName`='mob_toxic_sporebat' WHERE entry=22140; +UPDATE `creature_template` SET `ScriptName`='mob_toxic_sporebat' WHERE `entry`=22140; /* Leotheras the Blind event */ UPDATE `creature_template` SET `ScriptName`='boss_leotheras_the_blind' WHERE `entry`=21215; UPDATE `creature_template` SET `ScriptName`='boss_leotheras_the_blind_demonform' WHERE `entry`=21845; @@ -420,7 +421,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_screecher_spirit' WHERE `entry` UPDATE `creature_template` SET `ScriptName`='npc_blood_knight_dawnstar' WHERE `entry`=17832; UPDATE `creature_template` SET `ScriptName`='npc_budd_nedreck' WHERE `entry`=23559; UPDATE `creature_template` SET `ScriptName`='npc_rathis_tomber' WHERE `entry`=16224; -UPDATE `creature_template` SET `Scriptname`='npc_ranger_lilatha' WHERE entry=16295; +UPDATE `creature_template` SET `Scriptname`='npc_ranger_lilatha' WHERE `entry`=16295; update `gameobject_template` SET `ScriptName`='go_gilded_brazier' WHERE `entry`=181956; /* GNOMEREGAN */ @@ -638,7 +639,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_protectorate_nether_drake' WHER UPDATE `creature_template` SET `ScriptName`='npc_veronia' WHERE `entry`=20162; UPDATE `creature_template` SET `ScriptName`='mob_phase_hunter' WHERE `entry`=18879; UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry`=20907; -UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE entry =20415; +UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415; /* ONYXIA'S LAIR */ UPDATE `creature_template` SET `ScriptName`='boss_onyxia' WHERE `entry`=10184; @@ -655,7 +656,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_thrall_warchief' WHERE `entry`= UPDATE `creature_template` SET `ScriptName`='boss_amnennar_the_coldbringer' WHERE `entry`=7358; /* RAZORFEN KRAUL */ -UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508; +UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE `entry`=4508; /* REDRIDGE MOUNTAINS */ @@ -717,8 +718,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_neltharaku' WHERE `entry`=21657 UPDATE `creature_template` SET `ScriptName`='npc_oronok_tornheart' WHERE `entry`=21183; UPDATE `creature_template` SET `ScriptName`='mob_mature_netherwing_drake' WHERE `entry`=21648; UPDATE `creature_template` SET `ScriptName`='mob_enslaved_netherwing_drake' WHERE `entry`=21722; -UPDATE `creature_template` SET `ScriptName`='npc_overlord_morghor' WHERE entry= 23139; -UPDATE `creature_template` SET `ScriptName`='' WHERE entry=23141; +UPDATE `creature_template` SET `ScriptName`='npc_overlord_morghor' WHERE `entry`= 23139; +UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=23141; UPDATE `creature_template` SET `ScriptName`='mob_illidari_spawn' WHERE `entry` IN (22075, 22074, 19797); UPDATE `creature_template` SET `ScriptName`='mob_torloth_the_magnificent' WHERE `entry`=22076; UPDATE `creature_template` SET `ScriptName`='npc_lord_illidan_stormrage' WHERE `entry`=22083; @@ -786,7 +787,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_freed_soul' WHERE `entry`=11136 /* 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_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; |