*Second part of previous commit.

--HG-- branch : trunk
2009-06-18 19:31:55 +02:00
parent c790caec69
commit c6c1284eb0
346 changed files with 327 additions and 344 deletions
@@ -712,4 +712,4 @@ INSERT INTO `script_waypoint` VALUES
 (2917, 41, 4671.924316, 599.752197, 16.01242, 5000, 'SAY_REM_REMEMBER'),
 (2917, 42, 4676.976074, 600.649780, 17.82566, 5000, 'EMOTE_REM_END');

-/* EOF */
+/* EOF */
@@ -1131,4 +1131,4 @@ INSERT INTO `creature_ai_scripts` VALUES



-/* EOF */
+/* EOF */
@@ -378,4 +378,4 @@ UPDATE item_instance SET data= CONCAT(
  SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',30),' ',-30),' 0 0 0 ',
  SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',60),' ',-60+30),' 0 ',
  SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',134),' ',-134+60))
-WHERE SUBSTRING_INDEX(data,' ',134) = data AND SUBSTRING_INDEX(data,' ',134-1) <> data;
+WHERE SUBSTRING_INDEX(data,' ',134) = data AND SUBSTRING_INDEX(data,' ',134-1) <> data;
@@ -9121,4 +9121,4 @@ DELETE FROM `playercreateinfo` WHERE `race`=7 AND `class` IN (4,8,9);
 INSERT INTO `playercreateinfo` VALUES
 (7,4,0,1,-6240,331,383),
 (7,8,0,1,-6240,331,383),
-(7,9,0,1,-6240,331,383);
+(7,9,0,1,-6240,331,383);
@@ -186,4 +186,4 @@ CREATE TABLE `spell_loot_template` (
  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
  PRIMARY KEY  (`entry`,`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
@@ -1516,4 +1516,4 @@ UNLOCK TABLES;

 -- Dump completed on 2008-01-10 11:37:06

-- Updated on 2003-02-22 01:44:45
+-- Updated on 2003-02-22 01:44:45
@@ -12,4 +12,3 @@ GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPT

 GRANT ALL PRIVILEGES ON `realmd` . * TO 'trinity'@'localhost' WITH GRANT OPTION;

-
@@ -19,4 +19,3 @@ DROP DATABASE IF EXISTS `world` ;
 DROP DATABASE IF EXISTS `characters` ;

 DROP DATABASE IF EXISTS `realmd` ;
-
@@ -229,4 +229,3 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

 -- Dump completed on 2008-01-10 11:37:06
-
@@ -20,4 +20,3 @@ DELETE FROM guild_bank_item WHERE item_guid IN (SELECT item_guid FROM item_test

 DELETE FROM guild_bank_item WHERE item_guid IN (SELECT item_guid FROM item_test WHERE `source`='m');
 DROP TABLE IF EXISTS item_test;
-
@@ -1,4 +1,3 @@
 DELETE FROM pet_aura           WHERE guid NOT IN (SELECT id FROM character_pet);
 DELETE FROM pet_spell          WHERE guid NOT IN (SELECT id FROM character_pet);
 DELETE FROM pet_spell_cooldown WHERE guid NOT IN (SELECT id FROM character_pet);
-
@@ -50,4 +50,3 @@ ALTER TABLE merge_creature DROP COLUMN guid_new;

 INSERT creature SELECT * FROM merge_creature;

-
@@ -9,4 +9,4 @@ INSERT INTO `spell_script_target` (`entry`,`type`,`targetEntry`) VALUES
 ('32314', '2', '17138'),
 ('32314', '2', '18037'),
 ('32314', '2', '18064'),
-('32314', '2', '18065');
+('32314', '2', '18065');
@@ -1,2 +1,2 @@
 UPDATE `item_template` SET `ScriptName`='item_arcane_charges' WHERE `entry`='34475';
-UPDATE gameobject_template SET faction = 14 WHERE entry = 185134;
+UPDATE gameobject_template SET faction = 14 WHERE entry = 185134;
@@ -5,4 +5,4 @@ INSERT INTO `spell_affect` VALUES (16999, 2, 0x1000001000);
 DELETE from `spell_affect` where entry=16998 and effectId=0;
 DELETE from `spell_affect` where entry=16998 and effectId=2;
 INSERT INTO `spell_affect` VALUES (16998, 0, 0x1000001000);
-INSERT INTO `spell_affect` VALUES (16998, 2, 0x1000001000);
+INSERT INTO `spell_affect` VALUES (16998, 2, 0x1000001000);
@@ -5,4 +5,4 @@ INSERT INTO `spell_affect` VALUES (16998, 1, 0x40000001000);
 INSERT INTO `spell_affect` VALUES (16998, 2, 0x40000001000);
 INSERT INTO `spell_affect` VALUES (16999, 0, 0x40000001000);
 INSERT INTO `spell_affect` VALUES (16999, 1, 0x40000001000);
-INSERT INTO `spell_affect` VALUES (16999, 2, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16999, 2, 0x40000001000);
@@ -137,4 +137,4 @@ UPDATE `instance_template` SET `access_id` = '48' WHERE `map` = '565';
 UPDATE `instance_template` SET `access_id` = '49' WHERE `map` = '568';
 UPDATE `instance_template` SET `access_id` = '50' WHERE `map` = '580';
 UPDATE `instance_template` SET `access_id` = '51' WHERE `map` = '585';
-UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354');
+UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354');
@@ -5,4 +5,4 @@ INSERT INTO `spell_script_target` VALUES ('41455', '1', '22951');
 INSERT INTO `spell_script_target` VALUES ('41455', '1', '22952');
 INSERT INTO `spell_script_target` VALUES ('42471', '1', '23817');
 INSERT INTO `spell_script_target` VALUES ('43734', '1', '23817');
-INSERT INTO `spell_script_target` VALUES ('42631', '1', '23920');
+INSERT INTO `spell_script_target` VALUES ('42631', '1', '23920');
@@ -2,4 +2,4 @@ ALTER TABLE `arena_team_member` ADD COLUMN `points_to_add` int(10) UNSIGNED NOT
 DROP TABLE IF EXISTS `saved_variables`;
 CREATE TABLE `saved_variables` (                                                                             
    `NextArenaPointDistributionTime` timestamp NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves';
@@ -159,4 +159,4 @@ INSERT INTO command VALUES
 ('server exit',4,'Syntax: .server exit\r\n\r\nTerminate Trinity NOW.'),
 ('server motd',0,'Syntax: .server motd\r\n\r\nShow server Message of the day.'),
 ('server set loglevel',4,'Syntax: .server set loglevel #level\r\n\r\nSet server log level (0 - errors only, 1 - basic, 2 - detail, 3 - debug).'),
-('server set motd',3,'Syntax: .server set motd $MOTD\r\n\r\nSet server Message of the day.');
+('server set motd',3,'Syntax: .server set motd $MOTD\r\n\r\nSet server Message of the day.');
@@ -213,3 +213,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 -- 

 -- ALTER TABLE `script_texts` ORDER BY `entry` desc;
+
@@ -2,4 +2,4 @@ update creature_template set speed='0.01', scriptname='mob_toxic_sporebat' WHERE
 update creature_template SET scriptname='npc_overlord_morghor' WHERE entry=23139;
 update creature_template SET scriptname='npc_lord_illidan_stormrage' WHERE entry=22083;
 update creature_template SET scriptname='npc_yarzill_the_merc' WHERE entry=23141;
-update quest_template SET StartScript=0 WHERE entry=11108;
+update quest_template SET StartScript=0 WHERE entry=11108;
@@ -1,3 +1,3 @@
 DELETE FROM `command` WHERE `name` IN ('reload spell_linked_spell');
 INSERT INTO `command` VALUES
-('reload spell_linked_spell','3','Usage: .reload spell_linked_spell\r\nReloads the spell_linked_spell DB table.');
+('reload spell_linked_spell','3','Usage: .reload spell_linked_spell\r\nReloads the spell_linked_spell DB table.');
@@ -77,4 +77,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1560019,'Thrall will remain a slave. Taretha will die. You have failed.',10426,1,0,'epoch SAY_SLAY2'),
 (-1560020,'Not so fast!',10423,1,0,'epoch SAY_BREATH1'),
 (-1560021,'Struggle as much as you like!',10424,1,0,'epoch SAY_BREATH2'),
-(-1560022,'No!...The master... will not... be pleased.',10427,1,0,'epoch SAY_DEATH');
+(-1560022,'No!...The master... will not... be pleased.',10427,1,0,'epoch SAY_DEATH');
@@ -18,4 +18,4 @@ INSERT INTO trinity_string VALUES
 (341,'%s is not following you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (342,'%s is now not following you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (810,'You must be in a raid group to enter the instance %s!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(811,'You cannot enter %s while in a ghost mode!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(811,'You cannot enter %s while in a ghost mode!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -11,4 +11,4 @@ UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entr
 UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entry` = 184428 LIMIT 1;
 UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entry` = 184429 LIMIT 1;
 UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entry` = 184430 LIMIT 1;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entry` = 184431 LIMIT 1;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_ethereum_prison' WHERE `entry` = 184431 LIMIT 1;
@@ -24,4 +24,4 @@ UPDATE `gameobject_template` SET `ScriptName` = 'go_kael_orb' WHERE `entry` = 18
 UPDATE `gameobject_template` SET `ScriptName` = 'go_movie_orb' WHERE `entry` = 187578;

 update creature_template SET spell1=6474 WHERE entry=22487;
-update creature_template SET spell1=3600 WHERE entry=22486;
+update creature_template SET spell1=3600 WHERE entry=22486;
@@ -90,4 +90,4 @@ VALUES
 INSERT INTO spell_linked_spell
   (`spell_trigger`, `spell_effect`, `type`, `comment`)
 VALUES
-   (45246, 45348, 1, 'Apply Flame Touched');
+   (45246, 45348, 1, 'Apply Flame Touched');
@@ -1,3 +1,3 @@
 -- Magtheridon Earthquake
 DELETE FROM spell_script_target WHERE `entry` IN (30657);
-INSERT INTO spell_script_target VALUES ('30657', '1', '24136');
+INSERT INTO spell_script_target VALUES ('30657', '1', '24136');
@@ -5,4 +5,4 @@ insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27799','27803','0','Holy Nova (rank4)');
 insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27800','27804','0','Holy Nova (rank5)');
 insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('27801','27805','0','Holy Nova (rank6)');
-insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('25331','25329','0','Holy Nova (rank7)');
+insert into `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) values('25331','25329','0','Holy Nova (rank7)');
@@ -14,4 +14,4 @@ INSERT INTO `command` (name,security,help) VALUES
 ('pet tp',2,'Syntax: .pet tp #\r\n\r\nChange pet\'s amount of training points.'),
 ('modify gender',2,'Syntax: .modify gender\r\n\r\n.modify gender #male/female - Turns selected player into a male or female'),
 ('gobject activate',2,'Syntax: .gobject activate #guid\r\n\r\nActivates an object like a door or a button.'),
-('playall',2,'Syntax: .playall #soundid\r\n\r\nPlayer a sound to whole server.');
+('playall',2,'Syntax: .playall #soundid\r\n\r\nPlayer a sound to whole server.');
@@ -2,4 +2,4 @@ UPDATE `creature_template` SET `ScriptName`='npc_clintar_dreamwalker' WHERE `ent
 UPDATE `creature_template` SET `ScriptName`='npc_clintar_spirit' WHERE `entry` = 22916;
 UPDATE `creature_template` SET `ScriptName`='mob_sparrowhawk' WHERE `entry`=22979;
 UPDATE `creature_template` SET `ScriptName`='mob_rizzle_sprysprocket' WHERE `entry`=23002;
-UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=23025;
+UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=23025;
@@ -1,2 +1,2 @@
 ALTER TABLE `characters`
-    ADD `latency` int(11) unsigned NOT NULL default '0' AFTER `taxi_path`;
+    ADD `latency` int(11) unsigned NOT NULL default '0' AFTER `taxi_path`;
@@ -22,4 +22,4 @@ update creature_template set scriptname = 'mob_blade_of_azzinoth' where entry =
 -- parasitic shadowfiend
 update creature_template set scriptname = 'mob_parasitic_shadowfiend' where entry = 23498;
 -- Maiev
-update creature_template set minlevel = 73, maxlevel = 73, minhealth = 500000, maxhealth = 500000, mindmg = 3000, maxdmg = 4000 where entry = 23197;
+update creature_template set minlevel = 73, maxlevel = 73, minhealth = 500000, maxhealth = 500000, mindmg = 3000, maxdmg = 4000 where entry = 23197;
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='boss_pathaleon_the_calculator' WHERE `entry`=19220;
 UPDATE `creature_template` SET `ScriptName`='mob_nether_wraith' WHERE `entry`=21062;
-UPDATE `instance_template` SET `script`='instance_mechanar' WHERE `map`=554;
+UPDATE `instance_template` SET `script`='instance_mechanar' WHERE `map`=554;
@@ -2,4 +2,3 @@ delete from `command` where `name` IN ('senditems','sendmail');
 insert into `command` (`name`, `security`, `help`) values
 ('senditems',3,'Syntax: .senditems #playername "#subject" "#text" itemid1[:count1] itemid2[:count2] ... itemidN[:countN]\r\n\r\nSend a mail to a player. Subject and mail text must be in "". If for itemid not provided related count values then expected 1, if count > max items in stack then items will be send in required amount stacks. All stacks amount in mail limited to 12.'),
 ('sendmail',1,'Syntax: .sendmail #playername "#subject" "#text"\r\n\r\nSend a mail to a player. Subject and mail text must be in "".');
- 
@@ -26,4 +26,4 @@ INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `commen

 DELETE FROM spell_target_position WHERE `id` IN (46019, 46020);
 INSERT INTO spell_target_position () VALUES (46019, 580, 1704.34, 928.17, -74.558, 0);
-INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0);
+INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0);
@@ -98,4 +98,4 @@ ALTER TABLE creature_movement
  ADD COLUMN textid2 int(11) NOT NULL default '0' AFTER textid1,
  ADD COLUMN textid3 int(11) NOT NULL default '0' AFTER textid2,
  ADD COLUMN textid4 int(11) NOT NULL default '0' AFTER textid3,
-  ADD COLUMN textid5 int(11) NOT NULL default '0' AFTER textid4;
+  ADD COLUMN textid5 int(11) NOT NULL default '0' AFTER textid4;
@@ -1,3 +1,2 @@
 UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`='16993';
 UPDATE `creature_template` SET `ScriptName` = 'mob_phase_hunter' WHERE `entry` = '18879';
-
@@ -36,4 +36,3 @@ INSERT INTO `trinity_string` VALUES
 (748,'The Frostwolf General is Dead!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (749,'The Stormpike General is Dead!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
 ;
-
@@ -1,3 +1,2 @@
 UPDATE `creature_template` SET `ScriptName` = 'npc_steam_tonk' WHERE `entry` = '19405';
 UPDATE `creature_template` SET `ScriptName` = 'npc_tonk_mine' WHERE `entry` = '15368';
-
@@ -1,3 +1,2 @@
 DELETE FROM `spell_script_target` WHERE `entry` in (30659);
 INSERT INTO `spell_script_target` VALUES (30659, 1, 17281);
-
@@ -17,4 +17,4 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (784,'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (785,'Arena testing turned %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (786,'|cffff0000[Automatic]:|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(787,'|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(787,'|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -7,3 +7,4 @@ INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `commen
 -- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49011, 49009, 0, 'Wyvern Sting');
 -- Rank 6 (not available till wotlk)
 -- INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (-49012, 49010, 0, 'Wyvern Sting');
+
@@ -23,4 +23,4 @@ INSERT INTO trinity_string (entry, content_default) VALUES
    (1137, 'You must be in GM mode to teleport to a player in a battleground.'),
    (1138, 'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.');

-DELETE FROM trinity_string WHERE entry = 714 OR entry = 716;
+DELETE FROM trinity_string WHERE entry = 714 OR entry = 716;
@@ -19,4 +19,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1000134, 'We\'ve had too many setbacks along the way: Hellfire Citadel, Fallen Sky Ridge, Firewing Point... Prince Kael\'thas will tolerate no further delays. I will tolerate nothing other than complete success!', 0, 0, 0, 'dawnforge PATHALEON_CULATOR_IMAGE_2_1'),
 (-1000135, 'I am returning to Tempest Keep. See to it that I do not have reason to return!', 0, 0, 0, 'dawnforge PATHALEON_CULATOR_IMAGE_2_2' ),
 (-1000136, 'Yes, my lord.', 0, 0, 0, 'dawnforge COMMANDER_DAWNFORGE_4 SAY_ARCANIST_ARDONIS_2'),
-(-1000137, 'See to it, Ardonis!', 0, 0, 0, 'dawnforge COMMANDER_DAWNFORGE_5');
+(-1000137, 'See to it, Ardonis!', 0, 0, 0, 'dawnforge COMMANDER_DAWNFORGE_5');
@@ -2,4 +2,3 @@ ALTER TABLE spell_chain DROP COLUMN first_spell;
 ALTER TABLE spell_chain DROP COLUMN rank;
 ALTER TABLE spell_chain RENAME TO spell_required;
 DELETE FROM spell_required WHERE req_spell=0;
-
@@ -36,4 +36,4 @@ INSERT INTO `spell_proc_event` VALUES ('43983', '0', '0', '0', '0', '0', '16384'
 DELETE FROM `spell_script_target` WHERE `entry` = 42577;
 INSERT INTO `spell_script_target` VALUES ('42577', '1', '24136');

-UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
+UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
@@ -1,2 +1,2 @@
 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_mausoleum_door' WHERE `entry` = 176594;
@@ -4,4 +4,4 @@ INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES ('6614','Notific
 INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES ('6615','|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r');
 INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmnotify', 2, 'Syntax: .gmnotify $notification\r\nDisplays a notification on the screen of all online GM\'s.');
 INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmnameannounce', 2, 'Syntax: .gmnameannounce $announcement.\r\nSend an announcement to all online GM\'s, displaying the name of the sender.');
-INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmannounce', 4, 'Syntax: .gmannounce $announcement\r\nSend an announcement to online Gamemasters.');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES ('gmannounce', 4, 'Syntax: .gmannounce $announcement\r\nSend an announcement to online Gamemasters.');
@@ -4,4 +4,3 @@ DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (-49011, -49012);
 -- typo
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (43468, 43648);
 INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43648, 44007, 1, 'Storm Eye Safe Zone');
-
@@ -6,4 +6,4 @@ insert into event_scripts values
 -- remove every Image from Medivh (should not be spawned by db)
 delete from creature where id = 17651;
 -- add script
-update creature_template set scriptname = 'npc_image_of_medivh' where entry = 17651;
+update creature_template set scriptname = 'npc_image_of_medivh' where entry = 17651;
@@ -2,4 +2,4 @@ delete from creature where id=17318;
 update creature_template set scriptname='npc_geezle' where entry=17318;
 delete from event_scripts where id=10675;
 insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554), 
-(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
+(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
@@ -15,4 +15,4 @@ INSERT INTO `spell_script_target` VALUES ('45388', '1', '25038');
 INSERT INTO `spell_script_target` VALUES ('45389', '1', '25265');
 INSERT INTO `spell_script_target` VALUES ('44885', '1', '25160');
 INSERT INTO `spell_script_target` VALUES ('46350', '1', '25160');
-INSERT INTO `spell_script_target` VALUES ('45714', '1', '25038');
+INSERT INTO `spell_script_target` VALUES ('45714', '1', '25038');
@@ -1,2 +1,2 @@
 UPDATE `trinity_string` SET `content_default`='Player |cffff0000%s|r kicked by |cffff0000%s|r. Reason: |cffff0000%s|r.' WHERE (`entry`='282');  
-UPDATE `command` SET `help`='Syntax: .kick [$charactername] [$reason]\r\n\r\nKick the given character name from the world with or without reason. If no character name is provided then the selected player (except for yourself) will be kicked. If no reason is provided, default is \"No Reason\".' WHERE (`name`='kick');
+UPDATE `command` SET `help`='Syntax: .kick [$charactername] [$reason]\r\n\r\nKick the given character name from the world with or without reason. If no character name is provided then the selected player (except for yourself) will be kicked. If no reason is provided, default is \"No Reason\".' WHERE (`name`='kick');
@@ -1,2 +1,2 @@
 UPDATE `quest_template` SET `SpecialFlags`=2 WHERE `entry`=665;
-UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE `entry`=2768;
+UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE `entry`=2768;
@@ -12,4 +12,4 @@ INSERT INTO `script_texts` (entry, content_default, sound, type, language, comme
 (-1047007, 'I am glad that we are out again from this damned ditch. However, up here it is not much better!', 0, 0, 0, 'Willix'),
 (-1047008, 'Finally! I am glad that I come, finally out here.', 0, 0, 0, 'Willix'),
 (-1047009, 'I will rather rest a moment and come again to breath, before I return to Ratchet.', 0, 0, 0, 'Willix'),
-(-1047010, 'Many thanks for your help.', 0, 0, 0, 'Willix');
+(-1047010, 'Many thanks for your help.', 0, 0, 0, 'Willix');
@@ -13,4 +13,4 @@ INSERT INTO trinity_string VALUES
 DELETE FROM `command` WHERE `name` = 'freeze' or `name` = 'unfreeze' or name = 'listfreeze';
 INSERT INTO `command` (`name`,`security`,`help`) VALUES ('freeze','2','Syntax: .freeze (#player)\r\n\"Freezes\" #player and disables his chat. When using this without #name it will freeze your target.');
 INSERT INTO `command` (`name`,`security`,`help`) VALUES ('unfreeze','2','Syntax: .unfreeze (#player)\r\n\"Unfreezes\" #player and enables his chat again. When using this without #name it will unfreeze your target.');
-INSERT INTO `command` (`name`,`security`,`help`) VALUES ('listfreeze','1','Syntax: .listfreeze\r\n\r\nSearch and output all frozen players.');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES ('listfreeze','1','Syntax: .listfreeze\r\n\r\nSearch and output all frozen players.');
@@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN ('38164','14144','14148');
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
 ('38164','0','0','0','0','1','0','0','60'),
 ('14144','0','0','0','2','0','0','0','0'),
-('14148','0','0','0','2','0','0','0','0');
+('14148','0','0','0','2','0','0','0','0');
@@ -1,2 +1,2 @@
 UPDATE `creature_template` SET `ScriptName`='boss_shirrak_the_dead_watcher' WHERE `entry`=18371;
-UPDATE `creature_template` SET `ScriptName`='mob_focus_fire' WHERE `entry`=18374;
+UPDATE `creature_template` SET `ScriptName`='mob_focus_fire' WHERE `entry`=18374;
@@ -24,4 +24,4 @@ UPDATE `creature_template` SET
 `ScriptName` = 'npc_kservant' WHERE `entry` = '19685';

 DELETE FROM `quest_start_scripts` WHERE `id`='10211';
-UPDATE `quest_template` SET `StartScript`='0' WHERE entry=10211;
+UPDATE `quest_template` SET `StartScript`='0' WHERE entry=10211;
@@ -6,4 +6,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1000143,'There\'s Farstrider Enclave now, $C. Not far to go... Look out! Troll ambush!!',0,0,1,'lilatha SAY_PROGRESS3'),
 (-1000144,'Thank you for saving my life and bringing me back to safety, $N',0,0,1,'lilatha SAY_END1'),
 (-1000145,'Captain Helios, I\'ve been rescued from the Amani Catacombs. Reporting for duty, sir!',0,0,1,'lilatha SAY_END2'),
-(-1000146,'Liatha, get someone to look at those injuries. Thank you for bringing her back safely.',0,0,1,'lilatha CAPTAIN_ANSWER');
+(-1000146,'Liatha, get someone to look at those injuries. Thank you for bringing her back safely.',0,0,1,'lilatha CAPTAIN_ANSWER');
@@ -1,3 +1,3 @@
 ALTER TABLE `custom_texts` ADD COLUMN `emote` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER `language`;
 ALTER TABLE `eventai_texts` ADD COLUMN `emote` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER `language`;
-ALTER TABLE `script_texts` ADD COLUMN `emote` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER `language`;
+ALTER TABLE `script_texts` ADD COLUMN `emote` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER `language`;
@@ -2,4 +2,4 @@ ALTER TABLE `character_ticket` RENAME TO `gm_tickets`;
 ALTER TABLE `gm_tickets` CHANGE `guid` `playerGuid` int(11) unsigned NOT NULL default '0'; 
 ALTER TABLE `gm_tickets` CHANGE `ticket_id` `guid` int(11) unsigned NOT NULL default '0'; 
 ALTER TABLE `gm_tickets` CHANGE `ticket_text` `message` text(0) NOT NULL;
-ALTER TABLE `gm_tickets` CHANGE `ticket_lastchange` `timestamp` int(10) NOT NULL default '0';
+ALTER TABLE `gm_tickets` CHANGE `ticket_lastchange` `timestamp` int(10) NOT NULL default '0';
@@ -1,3 +1,2 @@
 ALTER TABLE `gm_tickets` ADD `closed` tinyint(1) NOT NULL default '0' AFTER `timestamp`;
 ALTER TABLE `gm_tickets` ADD `assignedto` int(10) NOT NULL default '0' AFTER `timestamp`;
-
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='npc_infused_crystal' WHERE `entry`=16364;
 UPDATE `creature_template` SET `flags_extra`=0 WHERE `entry`=16364;
-DELETE FROM `creature` WHERE `id`=17086;
+DELETE FROM `creature` WHERE `id`=17086;
@@ -3,4 +3,4 @@ UPDATE `creature_template` SET `ScriptName`='boss_nightbane' WHERE `entry`=17225
 UPDATE `creature_template` SET `unit_flags`=0 WHERE `entry`=17225;
 DELETE FROM `event_scripts` WHERE `id`=10951;
 INSERT INTO `event_scripts` VALUES
-(10951,0,10,17651,180000,0,-11159,-1907.22,91.48,0);
+(10951,0,10,17651,180000,0,-11159,-1907.22,91.48,0);
@@ -3,4 +3,4 @@ CREATE TABLE `transport_events` (
 	`entry` int(11) unsigned NOT NULL default '0',
 	`waypoint_id` int(11) unsigned NOT NULL default '0',	
  `event_id` int(11) unsigned NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -120,4 +120,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1533108,'Fools, you have spread your powers too thin. Be free, my minions!',14482,1,0,'kelthuzad SAY_SPECIAL2_DISPELL');
 	
 UPDATE `script_texts` SET `sound`=8902 WHERE `entry`=-1533055;
-UPDATE `script_texts` SET `sound`=8901 WHERE `entry`=-1533056;
+UPDATE `script_texts` SET `sound`=8901 WHERE `entry`=-1533056;
@@ -16,4 +16,4 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc2`, `type`,
 (-1000160, 'This timeway is currently collapsing. What that may hold for the past, present and future is currently unknown...', 'Cette voie est en train de s\'effondrer. Ce qu\'elle peut avoir contenu dans le passé, le présent et le futur nous est actuellement inconnu...', 4, 0, 'WHISPER_CUSTODIAN_11'),
 (-1000161, 'The timeways are currently ranked in order from least catastrophic to most catastrophic. Note that they are all classified as catastrophic, meaning that any single one of these timeways collapsing would mean that your world would end. We only classify them in such a way so that the heroes and adventurers that are sent here know which timeway best suits their abilities.', 'Les voies sont pour le moment classées de la moins catastrophique à la plus catastrophique, ce qui veut dire que la moindre de celles-ci qui s\'effondre signifierait la fin de votre monde. Nous les classons seulement de cette façon pour que les héros et aventuriers qui y sont envoyés sachent quelle voie est la plus adaptée à leurs compétences.', 4, 0, 'WHISPER_CUSTODIAN_12'),
 (-1000162, 'All we know of this timeway is that it leads to Mount Hyjal. The Infinite Dragonflight have gone to great lengths to prevent our involvement. We know next to nothing, mortal. Soridormi is currently attempting to break through the timeway\'s defenses but has thus far been unsuccessful. You might be our only hope of breaking through and resolving the conflict.', 'Tout ce que nous savons sur cette voie temporelle est qu\'elle mène au Mont Hyjal. Le Vol du Dragon Infini s\'est donné beaucoup de peine pour empêcher notre participation. Soridormi est actuellement en train de tenter de briser les défenses de cette voie, mais ses efforts ont été vain jusqu\'ici. Vous pourriez être notre seul espoir de les briser et de résoudre le conflit.', 4, 0, 'WHISPER_CUSTODIAN_13'),
-(-1000163, 'Our time is at an end $N. I would wish you luck, if such a thing existed.', 'Notre entretien touche à sa fin, $N. Je vous souhaite bonne chance, si tant est qu\'une telle chose a jamais existé.', 4, 0, 'WHISPER_CUSTODIAN_14');
+(-1000163, 'Our time is at an end $N. I would wish you luck, if such a thing existed.', 'Notre entretien touche à sa fin, $N. Je vous souhaite bonne chance, si tant est qu\'une telle chose a jamais existé.', 4, 0, 'WHISPER_CUSTODIAN_14');
@@ -6,4 +6,4 @@ INSERT INTO `script_texts`
 VALUES
  (-1000147, 'Lets go $N. I am ready to start to Whitereach Post.', NULL, NULL, 'Gehen wir $N.Ich bin bereit,mich zum Weissgipfelposten aufzumachen.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL),
  (-1000148, 'This seems to me trusted. If we move to the east, we are  probably... Aah!  Wyvern attack !', NULL, NULL, 'Das kommt mir vertraut vor.Wenn wir nach Osten ziehen,können wir wahrscheinlich...Aah!Flügeldrachen im Angriff!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL),
-  (-1000149, 'Thanks so much... From here I find the way back to the Whitereach Post. Speak with Motega Firemane, maybe you can persuade him to send me home.', NULL, NULL, 'Tausend Dank...Von hier aus finde ich den Rückweg zum Weissgipfelposten.Sprecht unbedingt mit Motega Feuermähne,vielleicht könnt ihr ihn überreden,mich nach Hause zu schicken.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL);
+  (-1000149, 'Thanks so much... From here I find the way back to the Whitereach Post. Speak with Motega Firemane, maybe you can persuade him to send me home.', NULL, NULL, 'Tausend Dank...Von hier aus finde ich den Rückweg zum Weissgipfelposten.Sprecht unbedingt mit Motega Feuermähne,vielleicht könnt ihr ihn überreden,mich nach Hause zu schicken.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, NULL);
@@ -1,2 +1,2 @@
 ALTER TABLE `gm_tickets` CHANGE `guid` `guid` int(10) NOT NULL AUTO_INCREMENT;
-ALTER TABLE `gm_tickets` CHANGE `closed` `closed` int(10) NOT NULL;
+ALTER TABLE `gm_tickets` CHANGE `closed` `closed` int(10) NOT NULL;
@@ -1,4 +1,4 @@
 DELETE FROM `trinity_string` WHERE `entry` IN (10056, 10057);
 INSERT INTO `trinity_string` (entry, content_default) VALUES
 (10056, 'You must be a member of the Horde to enter the Hall of Legends.'),
-(10057, 'You must be a member of the Alliance to enter the Champion\'s Hall.');
+(10057, 'You must be a member of the Alliance to enter the Champion\'s Hall.');
@@ -1,2 +1,2 @@
 ALTER TABLE characters
-  CHANGE COLUMN gmstate extra_flags int(11) unsigned NOT NULL default '0';
+  CHANGE COLUMN gmstate extra_flags int(11) unsigned NOT NULL default '0';
@@ -1,3 +1,3 @@
 DELETE FROM spell_proc_event where entry = 42083;
 INSERT INTO spell_proc_event (entry, SchoolMask, Category, SkillID, SpellFamilyName, SpellFamilyMask, procFlags, ppmRate, cooldown) VALUES
-(42083,0,0,0,0,0x0000000000000000,0x00401000,0,45);
+(42083,0,0,0,0,0x0000000000000000,0x00401000,0,45);
@@ -10,4 +10,4 @@ VALUES
   (-1000203, 'A-Me home.A-ME go home!Tar Lord dont disturb A-ME.', NULL, NULL, 'A-ME daheim.A-ME geht heim!Teerfürst A-ME nicht aufhalten.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
   (-1000204, 'Tar Lord A-ME no hurt.A-ME good.', NULL, NULL, 'Teerfürst A-ME nicht wehtun.A-ME gut.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
   (-1000205, 'A-ME at home!A-ME good!Good A-ME.At home.Home.Home', NULL, NULL, 'A-ME daheim!A-ME gut!Gute A-ME.Daheim.Daheim.Daheim', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL);
-UPDATE `quest_template` SET `QuestFlags` = 2, `SpecialFlags` = 2 WHERE `entry` = 4245;
+UPDATE `quest_template` SET `QuestFlags` = 2, `SpecialFlags` = 2 WHERE `entry` = 4245;
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='npc_kayra_longmane' WHERE `entry`=17969;
 DELETE FROM `creature_template_addon` WHERE `entry`=17969;
-UPDATE `quest_template` SET specialflags=2 WHERE `entry`=9752;
+UPDATE `quest_template` SET specialflags=2 WHERE `entry`=9752;
@@ -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);
+UPDATE `creature_template` SET `unit_flags`=0, `flags_extra`=0 WHERE `entry` IN (19726, 19725);
@@ -1,4 +1,4 @@
 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');
+('42222','1','23616');
@@ -1,2 +1,2 @@
 ALTER TABLE account
-    CHANGE COLUMN tbc expansion tinyint(3) unsigned NOT NULL default '0';
+    CHANGE COLUMN tbc expansion tinyint(3) unsigned NOT NULL default '0';
@@ -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;
+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;
@@ -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;
+UPDATE `item_template` SET `ScriptName`='item_inoculating_crystal' WHERE `entry`=22962;
@@ -9,4 +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);
+   (-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);
@@ -3,4 +3,4 @@ update `creature_template` set `ScriptName`='mob_ember_of_alar' where `entry`='1
 update `creature_template` set `ScriptName`='mob_flame_patch_alar' where `entry`='20602';

 update gameobject_template set scriptname = "go_manticron_cube" where entry = 181713;
-update creature_template set scriptname = "mob_abyssal" where entry = 17454;
+update creature_template set scriptname = "mob_abyssal" where entry = 17454;
@@ -28,4 +28,4 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte
 (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.');
@@ -1,4 +1,4 @@
 DELETE FROM `command` WHERE `name` IN ('gobject addtemp','npc addtemp');
 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.');
@@ -7,4 +7,4 @@ INSERT INTO `areatrigger_scripts` VALUES (1526,'at_ring_of_law');

 DELETE FROM `script_texts` WHERE `entry`=-1230000;
 INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
-(-1230000,'Ah, hits the spot!',0,0,0,'rocknot SAY_GOT_BEER');
+(-1230000,'Ah, hits the spot!',0,0,0,'rocknot SAY_GOT_BEER');
@@ -5,4 +5,4 @@ CREATE TABLE `version` (
 ) 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`;
+DROP TABLE IF EXISTS `script_db_version`;
@@ -1,2 +1,2 @@
 ALTER TABLE `version`
-   ADD `core_revision` varchar(120) AFTER `core_version`;
+   ADD `core_revision` varchar(120) AFTER `core_version`;
@@ -53,4 +53,4 @@ CREATE TABLE IF NOT EXISTS `auctionhousebot` (
 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);
@@ -3,4 +3,4 @@ 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 `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542;
+UPDATE `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542;
@@ -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';
+ALTER TABLE `script_texts` CHANGE COLUMN `emote` `emote` smallint(5) unsigned NOT NULL DEFAULT '0';
@@ -37,4 +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');
@@ -9,4 +9,4 @@ INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES
 (-1000241, 'I\'ve done it! I have harnessed the power of the stone into the goggles! Let\'s get out of here!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_6'),
 (-1000242, 'Phew! Glad to be back from that creepy cave.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_7'),
 (-1000243, 'hands one glowing goggles over to Doctor Draxlegauge.', 2, 0, 'phizzlethorpe - EMOTE_PROGRESS_8'),
-(-1000244, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_9');
+(-1000244, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_9');
@@ -2,4 +2,4 @@ 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');
+(-1000247, 'All right, you win! I surrender! Just don\'t hurt me!', 1, 'SAY_RIZZLE_FINAL');
@@ -20,4 +20,4 @@ INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES
 (-1000263, 'Relax? Do you know what Kael\'thas does to those that fail him, Geezle? Eternal suffering and pain... Do NOT screw this up, fool.', 0, 0, 'geezle - SPARK_SAY_5'),
 (-1000264, 'Our Bloodmyst scouts have located our contact. The fool, Velen, will soon leave himself open and defenseless -- long enough for us to strike! Now get out of my sight before I vaporize you...', 0, 0, 'geezle - SPARK_SAY_6'),
 (-1000265, 'Yes, sir. It won\'t happen again...', 0, 0, 'geezle - GEEZLE_SAY_7'),
-(-1000266, 'picks up the naga flag.', 2, 0, 'geezle - EMOTE_SPARK');
+(-1000266, 'picks up the naga flag.', 2, 0, 'geezle - EMOTE_SPARK');
@@ -13,4 +13,4 @@ INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES
 (-1000276, 'Looks like we\'re out of woods, eh? Wonder what this does...', 0, 'shredder - SAY_PROGRESS_5'),
 (-1000277, 'Come on, don\'t break down on me now!', 0, 'shredder - SAY_PROGRESS_6'),
 (-1000278, 'That was a close one! Well, let\'s get going, it\'s still a ways to Ratchet!', 0, 'shredder - SAY_PROGRESS_7'),
-(-1000279, 'Hmm... I don\'t think this blinking red light is a good thing...', 0, 'shredder - SAY_PROGRESS_8');
+(-1000279, 'Hmm... I don\'t think this blinking red light is a good thing...', 0, 'shredder - SAY_PROGRESS_8');
@@ -7,4 +7,4 @@ INSERT INTO `script_texts` (entry, content_default, type, language, comment) VAL
 (-1000283, 'releases the last of its energies into the nerarby runestone, succesfully reactivating it.', 2, 0, 'crystal - EMOTE'),

 (-1000284, 'Deployment sucessful. Trespassers will be neutralized.', 0, 0, 'sentry - SAY_CONVERTED_1'),
-(-1000285, 'Objective acquired. Initiating security routines.', 0, 0, 'sentry - SAY_CONVERTED_1');
+(-1000285, 'Objective acquired. Initiating security routines.', 0, 0, 'sentry - SAY_CONVERTED_1');
@@ -6,4 +6,4 @@ INSERT INTO `script_texts` (entry, content_default, type, emote, comment) VALUES
 (-1000289, 'That\'s the first relic, but there are still two more. Follow me, $N.', 0, 0, 'clintar_spirit'),
 (-1000290, 'I\'ve recovered the second relic. Take a moment to rest, and then we\'ll continue to the last reliquary.', 0, 0, 'clintar_spirit'),
 (-1000291, 'We have all three of the relics, but my energy is rapidly fading. We must make our way back to Dreamwarden Lurosa! He will let you know what to do next.', 0, 0, 'clintar_spirit'),
-(-1000292, 'Lurosa, I am entrusting the Relics of Aviana to $N, who will take them to Morthis Whisperwing. I must return completely to the Emerald Dream now. Do not let $N fail!', 0, 0, 'clintar_spirit');
+(-1000292, 'Lurosa, I am entrusting the Relics of Aviana to $N, who will take them to Morthis Whisperwing. I must return completely to the Emerald Dream now. Do not let $N fail!', 0, 0, 'clintar_spirit');
@@ -16,4 +16,4 @@ INSERT INTO `script_texts` (entry, content_default, type, comment) VALUES
 (-1000303, 'is very weak', 2, 'mob_phase_hunter - EMOTE_WEAK'),

 (-1000304, 'Bessy, is that you?', 0, 'npc_bessy- SAY_THADELL_1'),
-(-1000305, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', 0, 'npc_bessy- SAY_THADELL_2');
+(-1000305, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', 0, 'npc_bessy- SAY_THADELL_2');
--- a/Show More
+++ b/Show More
				@@ -12,4 +12,3 @@ GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPT

				GRANT ALL PRIVILEGES ON `realmd` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
				`@@ -50,4 +50,3 @@ ALTER TABLE merge_creature DROP COLUMN guid_new;`

				`INSERT creature SELECT * FROM merge_creature;`