Removed DB content data from Core Repo. That data must be handled by Database project.

ALso added a couple missing scripts from fulls.

--HG--
branch : trunk

19 files changed, 189 insertions, 276 deletions

diff --git a/sql/updates/5300_world_scripts_dk.sql b/sql/updates/5300_world_scripts_dk.sql
deleted file mode 100644
index d63773d3466..00000000000
--- a/sql/updates/5300_world_scripts_dk.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `KillCredit1` = '29519' WHERE `entry` IN ('29519','29520','29565','29566','29567');
diff --git a/sql/updates/5314_world_scripts_ulduar.sql b/sql/updates/5314_world_scripts_ulduar.sql
index efe012b5ebf..ce2f32af7cd 100644
--- a/sql/updates/5314_world_scripts_ulduar.sql
+++ b/sql/updates/5314_world_scripts_ulduar.sql
@@ -1,26 +1,14 @@
-UPDATE creature_template SET scriptname = "spell_pool_of_tar" WHERE entry = 33090;
-
-UPDATE creature_template SET spell1=62288 WHERE entry = 33090;
-UPDATE creature_template SET speed=1 WHERE entry=33113;
-UPDATE creature_template SET speed=1.25 WHERE entry IN (33060,33109);
-UPDATE creature_template SET speed=2 WHERE entry=33062;
-UPDATE creature_template SET faction_A=1965,faction_H=1965 WHERE entry IN (33090,33113,33139);
-
-UPDATE creature_template SET flags_extra = 0 WHERE entry IN (33114);
-
-DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);
-INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
-(62427, 1, 33109), # Load into Catapult
-(62374, 1, 33060), # Pursued
-(62374, 1, 33109),
-(62399, 1, 33139); # Overload Circuit
-
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(-62475,-62399, 0, 'System Shutdown'),
-(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
-( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
-
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33143);
-INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
-(33143, 62399, 0, 0, 0, 0); # Overide device
+UPDATE creature_template SET scriptname = "spell_pool_of_tar" WHERE entry = 33090;

+

+DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);

+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES

+(62427, 1, 33109), # Load into Catapult

+(62374, 1, 33060), # Pursued

+(62374, 1, 33109),

+(62399, 1, 33139); # Overload Circuit

+

+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);

+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES

+(-62475,-62399, 0, 'System Shutdown'),

+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell

+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
\ No newline at end of file
diff --git a/sql/updates/5403_world_scripts_ulduar.sql b/sql/updates/5403_world_scripts_ulduar.sql
index f9fa49f5941..ad051138d3c 100644
--- a/sql/updates/5403_world_scripts_ulduar.sql
+++ b/sql/updates/5403_world_scripts_ulduar.sql
@@ -1,18 +1,8 @@
-INSERT INTO creature_template (entry, vehicleid) VALUES
-(32930, 312), # Kologarn
-(33214, 348) # Mechanolift 304-A
-ON DUPLICATE KEY UPDATE
-vehicleid = VALUES(vehicleid);
-
-UPDATE creature_template SET InhabitType = 4 WHERE entry = 33214;
-
-update creature_template set spell1=62395, AIName = 'TurretAI', scriptname='' where entry = 33139;
-update creature_template set spell1=62402 where entry = 33142;
-update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;
-
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(-62475,-62399, 0, 'System Shutdown - Overload Circuit'),
-(-62475,-62375, 0, 'System Shutdown - Gathering Speed'),
-(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
-( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
+update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;

+

+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);

+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES

+(-62475,-62399, 0, 'System Shutdown - Overload Circuit'),

+(-62475,-62375, 0, 'System Shutdown - Gathering Speed'),

+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell

+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');

diff --git a/sql/updates/5448_world_scripts_ulduar.sql b/sql/updates/5448_world_scripts_ulduar.sql
index 6402dc29043..a4e503ccbbd 100644
--- a/sql/updates/5448_world_scripts_ulduar.sql
+++ b/sql/updates/5448_world_scripts_ulduar.sql
@@ -1,13 +1,6 @@
-INSERT INTO creature_template (entry, vehicleid) VALUES
-(32930, 338), # Kologarn
-(32934, 380), # Right Arm
-(33214, 348) # Mechanolift 304-A
-ON DUPLICATE KEY UPDATE
-vehicleid = VALUES(vehicleid);
-
-DELETE FROM `spell_script_target` WHERE `entry` IN (62056,63985);
-INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
-(63985, 1, 32934), # Stone Grip
-(62056, 1, 32934);
-
-update creature_template set scriptname = "boss_flame_leviathan_safety_container" where entry = 33218;
+DELETE FROM `spell_script_target` WHERE `entry` IN (62056,63985);

+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES

+(63985, 1, 32934), # Stone Grip

+(62056, 1, 32934);

+

+update creature_template set scriptname = "boss_flame_leviathan_safety_container" where entry = 33218;

diff --git a/sql/updates/5469_world_creature.sql b/sql/updates/5469_world_creature.sql
deleted file mode 100644
index 0fe2c0cb171..00000000000
--- a/sql/updates/5469_world_creature.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `creature` WHERE `map`=30;
diff --git a/sql/updates/5472_world_scripts.sql b/sql/updates/5472_world_scripts.sql
index 1df55fcd6ee..50ade986537 100644
--- a/sql/updates/5472_world_scripts.sql
+++ b/sql/updates/5472_world_scripts.sql
@@ -1,13 +1,5 @@
--- spell 30298 tries to start event script 10675 but it doesn't exist. create it & make it spawn Geezle
-delete from event_scripts where id = 10675;
-insert into `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `x`, `y`, `z`, `o`) values 
-(10675, 0, 10, 17318, 90000, '-5139.79','-11248.27','5.23', '6.27609');
-
--- geezle should not spawn by default
-update creature set spawnMask=0 where guid = 85587;
-
--- add missing sentence to Geezle's text & Overgrind's name to flag pickup emote --- Disabled due to script_texts being borked
--- delete from `script_texts` where `entry` in (-1000266,-1000259);
--- 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
--- ('-1000266','%s picks up the naga flag.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','2','0','0','geezle - EMOTE_SPARK'),
--- ('-1000259','What\'s the big idea, Spark? Why\'d you call for this meeting?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','geezle - GEEZLE_SAY_1');
+-- add missing sentence to Geezle's text & Overgrind's name to flag pickup emote --- Disabled due to script_texts being borked

+-- delete from `script_texts` where `entry` in (-1000266,-1000259);

+-- 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

+-- ('-1000266','%s picks up the naga flag.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','2','0','0','geezle - EMOTE_SPARK'),

+-- ('-1000259','What\'s the big idea, Spark? Why\'d you call for this meeting?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','geezle - GEEZLE_SAY_1');

diff --git a/sql/updates/5482_world_scripts_waypoint_TDB.sql b/sql/updates/5482_world_scripts_waypoint_TDB.sql
deleted file mode 100644
index 6903f495a2a..00000000000
--- a/sql/updates/5482_world_scripts_waypoint_TDB.sql
+++ /dev/null
@@ -1 +0,0 @@
-Update waypoint_scripts set datalong=83 where datalong=169 and command=2;
diff --git a/sql/updates/5484_world_scripts.sql b/sql/updates/5484_world_scripts.sql
deleted file mode 100644
index 6009b133343..00000000000
--- a/sql/updates/5484_world_scripts.sql
+++ /dev/null
@@ -1 +0,0 @@
-update creature_template set inhabittype=3 where entry=21217;
diff --git a/sql/updates/5491_world_scripts_ulduar.sql b/sql/updates/5491_world_scripts_ulduar.sql
deleted file mode 100644
index 9bcb0c65618..00000000000
--- a/sql/updates/5491_world_scripts_ulduar.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO creature_template (entry, vehicleid) VALUES
-(32930, 328) # Kologarn
-ON DUPLICATE KEY UPDATE
-vehicleid = VALUES(vehicleid);
diff --git a/sql/updates/5513_world_wintergrasp.sql b/sql/updates/5513_world_wintergrasp.sql
deleted file mode 100644
index 8594ce26754..00000000000
--- a/sql/updates/5513_world_wintergrasp.sql
+++ /dev/null
@@ -1 +0,0 @@
-update game_graveyard_zone set ghost_zone = 4603 where id = 1474;
diff --git a/sql/updates/5524_world_scripts.sql b/sql/updates/5524_world_scripts.sql
index 8e52da00ea5..802685752cc 100644
--- a/sql/updates/5524_world_scripts.sql
+++ b/sql/updates/5524_world_scripts.sql
@@ -1,10 +1,6 @@
-update creature_template set ScriptName = 'npc_iruk' where entry = 26219;
-UPDATE creature_template SET ScriptName = 'npc_corastrasza' WHERE entry = 32548;
-
-DELETE FROM `spell_script_target` WHERE entry = 61245;
-INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
-(61245, 1, 32535);
-
-UPDATE creature_template SET VehicleId = 165 , spell1 = 56091,spell2 = 56092,spell3 = 57090,spell4 = 57143 ,spell5 = 57108,spell6=57403, unit_class = 1, minhealth = 100000, maxhealth = 100000 WHERE entry = 32535;
-UPDATE creature_template SET armor = 9729, mindmg = 422, maxdmg=586, minrangedmg=345, maxrangedmg=509, attackpower=642, rangedattackpower=103 WHERE entry = 32535;
-update creature set DeathState = 0 where id = 26219;
+update creature_template set ScriptName = 'npc_iruk' where entry = 26219;

+UPDATE creature_template SET ScriptName = 'npc_corastrasza' WHERE entry = 32548;

+

+DELETE FROM `spell_script_target` WHERE entry = 61245;

+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES

+(61245, 1, 32535);

diff --git a/sql/updates/5576_world_scripts_dk.sql b/sql/updates/5576_world_scripts_dk.sql
deleted file mode 100644
index edad28297fb..00000000000
--- a/sql/updates/5576_world_scripts_dk.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE creature_template SET spell1=52435,spell2=52576,spell5=52588,VehicleId=79,speed=0 WHERE entry = 28833;
-UPDATE `creature_template` SET vehicleid=87 WHERE (`entry`='28817'); -- mine car
\ No newline at end of file
diff --git a/sql/updates/5612_world_scripts.sql b/sql/updates/5612_world_scripts.sql
index fdd8d0cfcc1..3d52d63f50f 100644
--- a/sql/updates/5612_world_scripts.sql
+++ b/sql/updates/5612_world_scripts.sql
@@ -1,2 +1,2 @@
-
-UPDATE `creature_template` SET `ScriptName`='npc_razael_and_lyana',`npcflag`=`npcflag`|1 WHERE `entry` IN (23778,23998);
+

+UPDATE `creature_template` SET `ScriptName`='npc_razael_and_lyana' WHERE `entry` IN (23778,23998);

diff --git a/sql/updates/5654_world_creature_TDB.sql b/sql/updates/5654_world_creature_TDB.sql
deleted file mode 100644
index e40ea32058b..00000000000
--- a/sql/updates/5654_world_creature_TDB.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-
-UPDATE `creature_template` SET `spell2`=55328 WHERE `entry`=3579;
-UPDATE `creature_template` SET `spell2`=55329 WHERE `entry`=3911;
-UPDATE `creature_template` SET `spell2`=55330 WHERE `entry`=3912;
-UPDATE `creature_template` SET `spell2`=55332 WHERE `entry`=3913;
-UPDATE `creature_template` SET `spell2`=55333 WHERE `entry`=7398;
-UPDATE `creature_template` SET `spell2`=55335 WHERE `entry`=7399;
-UPDATE `creature_template` SET `spell2`=55278 WHERE `entry`=15478;
-UPDATE `creature_template` SET `spell2`=58589 WHERE `entry`=31120;
-UPDATE `creature_template` SET `spell2`=58590 WHERE `entry`=31121;
-UPDATE `creature_template` SET `spell2`=58591 WHERE `entry`=31122;
diff --git a/sql/updates/5696_world.sql b/sql/updates/5696_world.sql
index 9b52bda9729..5fcde663895 100644
--- a/sql/updates/5696_world.sql
+++ b/sql/updates/5696_world.sql
@@ -1,91 +1,88 @@
-
--- *Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.
-DELETE FROM `areatrigger_scripts` WHERE `entry`=962;
-INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES('962','at_zumrah');
-
--- *Judgement of Light PPM based, not 100%. By Drevi.
-DELETE FROM `spell_proc_event` WHERE `entry`=20185;
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-( 20185, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,  15,   0,   0); -- Judgement of Light
-
--- *A Spirit Guide Escort Quest, code from SD2, patch by manuel.
-UPDATE `creature_template` SET `ScriptName`='npc_ancestral_wolf' WHERE `entry`=17077;
-
--- This should be sent to TDB
--- INSERT INTO `gameobject` VALUES (NULL, 300070, 530, 1,1,-20.236, 3803.41, 93.1402, 5.24994, 0, 0, 0.493946, -0.869492, 25, 0, 1);
-
-DELETE FROM `script_texts` WHERE `npc_entry`=17077;
-INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
-   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
-   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
-   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME');
-
-DELETE FROM `script_waypoint` WHERE `entry`=17077;
-INSERT INTO `script_waypoint` VALUES
-   (17077, 0, -16.950142, 3801.409424, 95.064, 5000, 'EMOTE_WOLF_LIFT_HEAD'),
-   (17077, 1, -15.577404, 3805.170898, 94.833, 2500, ''),
-   (17077, 2, -20.011766, 3806.609863, 92.476, 5000, 'EMOTE_WOLF_HOWL'),
-   (17077, 3, -18.594666, 3816.207764, 91.482, 0, ''),
-   (17077, 4, -19.293468, 3838.218750, 85.012, 0, ''),
-   (17077, 5, -16.504408, 3871.034668, 82.327, 0, ''),
-   (17077, 6, 2.064510, 3898.678711, 85.623, 0, ''),
-   (17077, 7, 16.403864, 3921.174072, 86.024, 0, ''),
-   (17077, 8, 47.307926, 3932.001465, 83.302, 0, ''),
-   (17077, 9, 90.067230, 3942.906250, 77.000, 0, ''),
-   (17077, 10, 106.886024, 3944.388428, 76.502, 0, ''),
-   (17077, 11, 139.085480, 3941.897217, 80.617, 0, ''),
-   (17077, 12, 150.092346, 3942.782959, 80.399, 0, ''),
-   (17077, 13, 193.511475, 3950.396484, 74.366, 0, ''),
-   (17077, 14, 226.274948, 3958.003418, 73.257, 0, ''),
-   (17077, 15, 246.686981, 3963.309326, 76.376, 0, ''),
-   (17077, 16, 264.206177, 3977.726563, 83.704, 0, ''),
-   (17077, 17, 279.857422, 3986.417236, 88.245, 0, ''),
-   (17077, 18, 304.039642, 3998.354004, 95.649, 0, ''),
-   (17077, 19, 328.071503, 3995.832764, 104.434, 0, ''),
-   (17077, 20, 347.485229, 3990.817627, 113.608, 0, ''),
-   (17077, 21, 351.257202, 3954.260254, 125.747, 0, ''),
-   (17077, 22, 345.625977, 3932.016113, 132.358, 0, ''),
-   (17077, 23, 347.971893, 3908.549561, 135.520, 0, ''),
-   (17077, 24, 351.887878, 3891.062744, 139.957, 0, ''),
-   (17077, 25, 346.116852, 3864.634277, 146.647, 0, ''),
-   (17077, 26, 330.012360, 3839.859375, 154.148, 0, ''),
-   (17077, 27, 297.250610, 3811.855225, 166.893, 0, ''),
-   (17077, 28, 290.783112, 3800.188477, 172.130, 0, ''),
-   (17077, 29, 288.125427, 3782.474365, 180.825, 0, ''),
-   (17077, 30, 296.817841, 3771.629639, 184.961, 0, ''),
-   (17077, 31, 305.256256, 3765.380615, 185.360, 0, ''),
-   (17077, 32, 311.447906, 3757.902100, 184.312, 0, ''),
-   (17077, 33, 325.258026, 3730.282227, 184.076, 0, ''),
-   (17077, 34, 341.158630, 3717.757080, 183.904, 0, ''),
-   (17077, 35, 365.589020, 3717.200684, 183.902, 0, ''),
-   (17077, 36, 387.395081, 3731.750732, 183.645, 0, ''),
-   (17077, 37, 396.574127, 3732.604248, 179.831, 0, ''),
-   (17077, 38, 404.303192, 3737.313232, 180.151, 0, ''),
-   (17077, 39, 410.995972, 3742.286865, 183.364, 0, ''),
-   (17077, 40, 434.904541, 3761.058838, 186.219, 0, ''),
-   (17077, 41, 460.128815, 3774.436768, 186.348, 0, ''),
-   (17077, 42, 467.643951, 3788.506104, 186.446, 0, ''),
-   (17077, 43, 491.551666, 3815.446777, 189.848, 0, ''),
-   (17077, 44, 496.957855, 3836.875244, 193.078, 0, ''),
-   (17077, 45, 502.889191, 3855.458740, 194.834, 0, ''),
-   (17077, 46, 508.208466, 3863.689453, 194.024, 0, ''),
-   (17077, 47, 528.907593, 3887.348633, 189.762, 0, ''),
-   (17077, 48, 527.722229, 3890.686523, 189.240, 0, ''),
-   (17077, 49, 524.637329, 3891.768066, 189.149, 0, ''),
-   (17077, 50, 519.146057, 3886.701660, 190.128, 60000, 'SAY_WOLF_WELCOME');
-
--- *TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.
--- This should be applied to world_script_waypoints.sql ASAP
-ALTER TABLE `creature_addon`
-    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`;
-ALTER TABLE `creature_template_addon`
-    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`;
-
-ALTER TABLE `waypoint_data` ADD COLUMN `id_old` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID' AFTER `wpguid`;
-UPDATE `waypoint_data` SET `id_old`=`id`*0.1;
-
-REPLACE INTO `creature_addon` ( `guid` ) SELECT `id_old` FROM `waypoint_data`;
-
-UPDATE `creature_addon`,`waypoint_data` SET `creature_addon`.`path_id` = `waypoint_data`.`id` WHERE `creature_addon`.`guid`=`waypoint_data`.`id_old`;
-
-ALTER TABLE `waypoint_data` DROP COLUMN `id_old`;
+

+-- *Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.

+DELETE FROM `areatrigger_scripts` WHERE `entry`=962;

+INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES('962','at_zumrah');

+

+-- *Judgement of Light PPM based, not 100%. By Drevi.

+DELETE FROM `spell_proc_event` WHERE `entry`=20185;

+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES

+( 20185, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,  15,   0,   0); -- Judgement of Light

+

+-- *A Spirit Guide Escort Quest, code from SD2, patch by manuel.

+UPDATE `creature_template` SET `ScriptName`='npc_ancestral_wolf' WHERE `entry`=17077;

+

+DELETE FROM `script_texts` WHERE `npc_entry`=17077;

+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES

+   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),

+   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),

+   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME');

+

+DELETE FROM `script_waypoint` WHERE `entry`=17077;

+INSERT INTO `script_waypoint` VALUES

+   (17077, 0, -16.950142, 3801.409424, 95.064, 5000, 'EMOTE_WOLF_LIFT_HEAD'),

+   (17077, 1, -15.577404, 3805.170898, 94.833, 2500, ''),

+   (17077, 2, -20.011766, 3806.609863, 92.476, 5000, 'EMOTE_WOLF_HOWL'),

+   (17077, 3, -18.594666, 3816.207764, 91.482, 0, ''),

+   (17077, 4, -19.293468, 3838.218750, 85.012, 0, ''),

+   (17077, 5, -16.504408, 3871.034668, 82.327, 0, ''),

+   (17077, 6, 2.064510, 3898.678711, 85.623, 0, ''),

+   (17077, 7, 16.403864, 3921.174072, 86.024, 0, ''),

+   (17077, 8, 47.307926, 3932.001465, 83.302, 0, ''),

+   (17077, 9, 90.067230, 3942.906250, 77.000, 0, ''),

+   (17077, 10, 106.886024, 3944.388428, 76.502, 0, ''),

+   (17077, 11, 139.085480, 3941.897217, 80.617, 0, ''),

+   (17077, 12, 150.092346, 3942.782959, 80.399, 0, ''),

+   (17077, 13, 193.511475, 3950.396484, 74.366, 0, ''),

+   (17077, 14, 226.274948, 3958.003418, 73.257, 0, ''),

+   (17077, 15, 246.686981, 3963.309326, 76.376, 0, ''),

+   (17077, 16, 264.206177, 3977.726563, 83.704, 0, ''),

+   (17077, 17, 279.857422, 3986.417236, 88.245, 0, ''),

+   (17077, 18, 304.039642, 3998.354004, 95.649, 0, ''),

+   (17077, 19, 328.071503, 3995.832764, 104.434, 0, ''),

+   (17077, 20, 347.485229, 3990.817627, 113.608, 0, ''),

+   (17077, 21, 351.257202, 3954.260254, 125.747, 0, ''),

+   (17077, 22, 345.625977, 3932.016113, 132.358, 0, ''),

+   (17077, 23, 347.971893, 3908.549561, 135.520, 0, ''),

+   (17077, 24, 351.887878, 3891.062744, 139.957, 0, ''),

+   (17077, 25, 346.116852, 3864.634277, 146.647, 0, ''),

+   (17077, 26, 330.012360, 3839.859375, 154.148, 0, ''),

+   (17077, 27, 297.250610, 3811.855225, 166.893, 0, ''),

+   (17077, 28, 290.783112, 3800.188477, 172.130, 0, ''),

+   (17077, 29, 288.125427, 3782.474365, 180.825, 0, ''),

+   (17077, 30, 296.817841, 3771.629639, 184.961, 0, ''),

+   (17077, 31, 305.256256, 3765.380615, 185.360, 0, ''),

+   (17077, 32, 311.447906, 3757.902100, 184.312, 0, ''),

+   (17077, 33, 325.258026, 3730.282227, 184.076, 0, ''),

+   (17077, 34, 341.158630, 3717.757080, 183.904, 0, ''),

+   (17077, 35, 365.589020, 3717.200684, 183.902, 0, ''),

+   (17077, 36, 387.395081, 3731.750732, 183.645, 0, ''),

+   (17077, 37, 396.574127, 3732.604248, 179.831, 0, ''),

+   (17077, 38, 404.303192, 3737.313232, 180.151, 0, ''),

+   (17077, 39, 410.995972, 3742.286865, 183.364, 0, ''),

+   (17077, 40, 434.904541, 3761.058838, 186.219, 0, ''),

+   (17077, 41, 460.128815, 3774.436768, 186.348, 0, ''),

+   (17077, 42, 467.643951, 3788.506104, 186.446, 0, ''),

+   (17077, 43, 491.551666, 3815.446777, 189.848, 0, ''),

+   (17077, 44, 496.957855, 3836.875244, 193.078, 0, ''),

+   (17077, 45, 502.889191, 3855.458740, 194.834, 0, ''),

+   (17077, 46, 508.208466, 3863.689453, 194.024, 0, ''),

+   (17077, 47, 528.907593, 3887.348633, 189.762, 0, ''),

+   (17077, 48, 527.722229, 3890.686523, 189.240, 0, ''),

+   (17077, 49, 524.637329, 3891.768066, 189.149, 0, ''),

+   (17077, 50, 519.146057, 3886.701660, 190.128, 60000, 'SAY_WOLF_WELCOME');

+

+-- *TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.

+-- This should be applied to world_script_waypoints.sql ASAP

+ALTER TABLE `creature_addon`

+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`;

+ALTER TABLE `creature_template_addon`

+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`;

+

+ALTER TABLE `waypoint_data` ADD COLUMN `id_old` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID' AFTER `wpguid`;

+UPDATE `waypoint_data` SET `id_old`=`id`*0.1;

+

+REPLACE INTO `creature_addon` ( `guid` ) SELECT `id_old` FROM `waypoint_data`;

+

+UPDATE `creature_addon`,`waypoint_data` SET `creature_addon`.`path_id` = `waypoint_data`.`id` WHERE `creature_addon`.`guid`=`waypoint_data`.`id_old`;

+

+ALTER TABLE `waypoint_data` DROP COLUMN `id_old`;

diff --git a/sql/updates/5698_world.sql b/sql/updates/5698_world.sql
index bb3272bd46b..71ace9fb784 100644
--- a/sql/updates/5698_world.sql
+++ b/sql/updates/5698_world.sql
@@ -1,6 +1 @@
-UPDATE `creature_template` SET `ScriptName`='mob_nerubar_victim' WHERE `entry`=25284;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=25669;
-INSERT INTO `creature_ai_scripts`
-(`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`)
-VALUES
-(2566901, 25669, 10, 0, 100, 3, 1, 20, 2000, 2000, 33, 25669, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Scout Warsong Granary - Killed Moster at LOS'),(2567101, 25671, 10, 0, 100, 3, 1, 20, 2000, 2000, 33, 25671, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Scout Torp''s Farm - Killed Moster at LOS'),(2567201, 25672, 10, 0, 100, 3, 1, 20, 2000, 2000, 33, 25672, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Scout Warsong Slaughterhouse - Killed Moster at LOS');
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='mob_nerubar_victim' WHERE `entry`=25284;
\ No newline at end of file
diff --git a/sql/updates/5700_world.sql b/sql/updates/5700_world.sql
index ee137fd8e64..c0abdcd0276 100644
--- a/sql/updates/5700_world.sql
+++ b/sql/updates/5700_world.sql
@@ -1,56 +1,54 @@
-
--- Sunken temple (already in world_scripts_full.sql)
-UPDATE `instance_template` SET `script`='instance_sunken_temple' WHERE `map`=109;
-UPDATE `gameobject_template` SET `ScriptName`='go_atalai_statue' WHERE `entry` IN (148830,148831,148832,148833,148834,148835);
-DELETE FROM `areatrigger_scripts` WHERE `entry`=4016;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4016,'at_malfurion_stormrage');
-
--- Duskwood (already in world_scripts_full.sql)
-DELETE FROM `areatrigger_scripts` WHERE `entry`=4017;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4017,'at_twilight_grove');
-UPDATE `creature_template` SET `ScriptName`='boss_twilight_corrupter' WHERE `entry`=15625;
-
--- quest data: Long Forgotten Memories
--- TDB(???): UPDATE `quest_template` SET `method`=0 WHERE `entry`=8305;
--- quest data: A pawn on the eternal board
--- Already in world_scripts_full.sql
-UPDATE `gameobject_template` SET `ScriptName`='go_crystalline_tear' WHERE `entry`=180633;
-UPDATE `creature_template` SET `ScriptName`='mob_qiraj_war_spawn' WHERE `entry` IN (15414,15422,15424,15423);
-UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `entry`=15381;
-UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;
-
--- Already in world_script_texts.sql
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1350030 AND -1350000;
-INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`emote`,`comment`) VALUES
-   (15381,-1350000,'We must act quickly or all shall be lost!',0,1,'ANACHRONOS_SAY_1'),
-   (15381,-1350001,'NOW, STAGHELM! WE GO NOW! Prepare your magic!',0,81,'ANACHRONOS_SAY_2'),
-   (15381,-1350002,'Stay close...',0,1,'ANACHRONOS_SAY_3'),
-   (15381,-1350003,'The sands of time will halt, but only for a moment! I will now conjure the barrier.',0,1,'ANACHRONOS_SAY_4'),
-   (15381,-1350004,'FINISH THE SPELL STAGHELM! I CANNOT HOLD THE GLYPHS OF WARDING IN PLACE MUCH LONGER! CALL FORTH THE ROOTS!',0,53,'ANACHRONOS_SAY_5'),
-   (15381,-1350005,'It... It is over, Lord Staghelm. We are victorious. Albeit the cost for this victory was great.',0,1,'ANACHRONOS_SAY_6'),
-   (15381,-1350006,'There is but one duty that remains...',0,1,'ANACHRONOS_SAY_7'),
-   (15381,-1350007,'Before I leave this place, I make one final offreing to you, Lord Staghelm. Should a time arise in which you must gain entry to this accursed fortress, use the Scepter of the Shifting Sands on the sacred gong. The magic holding the barrier together will dissipate and the horrors of Ahn''Qiraj will be unleashed upon the world once more.',0,1,'ANACHRONOS_SAY_8'),
-   (15381,-1350008,'Lord Staghelm, where are you going? You would shatter our bond for the sake of pride?',0,1,'ANACHRONOS_SAY_9'),
-   (15381,-1350009,'And now you know all that there is to know, mortal...',0,1,'ANACHRONOS_SAY_10'),
-   (15381,-1350010,'hands the Scepter of the Shifting Sands to Fandral Staghelm.',2,1,'ANACHRONOS_EMOTE_1'),
-   (15381,-1350011,'shakes his head in dissapointment.',2,274,'ANACHRONOS_EMOTE_2'),
-   (15381,-1350012,'kneels down to pick up the fragments of the shattered scepter.',2,87,'ANACHRONOS_EMOTE_3'),
-   (15382,-1350013,'My forces cannot overcome the Qiraji defenses. We will not be able to get close enough to place your precious barrier, dragon.',0,1,'FANDRAL_SAY_1'),
-   (15382,-1350014,'It is done dragon. Lead the way...',0,1,'FANDRAL_SAY_2'),
-   (15382,-1350015,'Ancient ones guide my hand... Wake from your slumber! WAKE AND SEAL THIS CURSED PLACE!',0,1,'FANDRAL_SAY_3'),
-   (15382,-1350016,'After the savagery that my people have witnessed and felt, you expect me to accept another burden, dragon? Surely you are mad.',0,25,'FANDRAL_SAY_4'),
-   (15382,-1350017,'I want nothing to do with Silithus, the Qiraji and least of all, any damned dragons!',0,1,'FANDRAL_SAY_5'),
-   (15382,-1350018,'My son''s soul will find no comfort in this hollow victory, dragon. I will have him back.Thought it takes a millennia, I WILL have my son back!',0,254,'FANDRAL_SAY_6'),
-   (15382,-1350019,'falls to one knee - exhausted.',2,16,'FANDRAL_EMOTE_1'),
-   (15382,-1350020,'hurls the Scepter of the Shifting Sands into the barrier, shattering it.',2,0,'FANDRAL_EMOTE_2'),
-   (15379,-1350021,'Aye, Fandral, remember these words: Let not your grief guide your faith. These thoughts you hold... dark places you go, night elf. Absolution cannot be had through misguided vengeance.',0,1,'CAELESTRASZ_SAY_1'),
-   (15379,-1350022,'Do not forget the sacrifices made on this day, night elf. We have all suffered immensely at the hands of these beasts.',0,1,'CAELESTRASZ_SAY_2'),
-   (15379,-1350023,'Alexstrasza grant me the resolve to drive our enemies back!',1,53,'CAELESTRASZ_YELL_1'),
-   (15380,-1350024,'This distraction will give you and the young druid time enough to seal the gate. Do not falter. Now, let us see how they deal with chaotic magic.',0,1,'ARYGOS_SAY_1'),
-   (15380,-1350025,'Let them feel the wrath of the Blue Flight! May Malygos protect me!',1,53,'ARYGOS_YELL_1'),
-   (15380,-1350026,'nods knowingly.',2,273,'ARYGOS_EMOTE_1'),
-   (15378,-1350027,'There is a way...',0,1,'MERITHRA_SAY_1'),
-   (15378,-1350028,'We will push them back, Anachronos. This I vow. Uphold the end of this task. Let not your hands falter as you seal our fates behind the barrier.',0,1,'MERITHRA_SAY_2'),
-   (15378,-1350029,'Succumb to the endless dream, little ones. Let it consume you!',1,53,'MERITHRA_YELL_1'),
-   (15378,-1350030,'glances at her compatriots.',2,2,'MERITHRA_EMOTE_1');
-
+

+-- Sunken temple (already in world_scripts_full.sql)

+UPDATE `instance_template` SET `script`='instance_sunken_temple' WHERE `map`=109;

+UPDATE `gameobject_template` SET `ScriptName`='go_atalai_statue' WHERE `entry` IN (148830,148831,148832,148833,148834,148835);

+DELETE FROM `areatrigger_scripts` WHERE `entry`=4016;

+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4016,'at_malfurion_stormrage');

+

+-- Duskwood (already in world_scripts_full.sql)

+DELETE FROM `areatrigger_scripts` WHERE `entry`=4017;

+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4017,'at_twilight_grove');

+UPDATE `creature_template` SET `ScriptName`='boss_twilight_corrupter' WHERE `entry`=15625;

+

+-- quest data: A pawn on the eternal board

+-- Already in world_scripts_full.sql

+UPDATE `gameobject_template` SET `ScriptName`='go_crystalline_tear' WHERE `entry`=180633;

+UPDATE `creature_template` SET `ScriptName`='mob_qiraj_war_spawn' WHERE `entry` IN (15414,15422,15424,15423);

+UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `entry`=15381;

+UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;

+

+-- Already in world_script_texts.sql

+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1350030 AND -1350000;

+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`emote`,`comment`) VALUES

+   (15381,-1350000,'We must act quickly or all shall be lost!',0,1,'ANACHRONOS_SAY_1'),

+   (15381,-1350001,'NOW, STAGHELM! WE GO NOW! Prepare your magic!',0,81,'ANACHRONOS_SAY_2'),

+   (15381,-1350002,'Stay close...',0,1,'ANACHRONOS_SAY_3'),

+   (15381,-1350003,'The sands of time will halt, but only for a moment! I will now conjure the barrier.',0,1,'ANACHRONOS_SAY_4'),

+   (15381,-1350004,'FINISH THE SPELL STAGHELM! I CANNOT HOLD THE GLYPHS OF WARDING IN PLACE MUCH LONGER! CALL FORTH THE ROOTS!',0,53,'ANACHRONOS_SAY_5'),

+   (15381,-1350005,'It... It is over, Lord Staghelm. We are victorious. Albeit the cost for this victory was great.',0,1,'ANACHRONOS_SAY_6'),

+   (15381,-1350006,'There is but one duty that remains...',0,1,'ANACHRONOS_SAY_7'),

+   (15381,-1350007,'Before I leave this place, I make one final offreing to you, Lord Staghelm. Should a time arise in which you must gain entry to this accursed fortress, use the Scepter of the Shifting Sands on the sacred gong. The magic holding the barrier together will dissipate and the horrors of Ahn''Qiraj will be unleashed upon the world once more.',0,1,'ANACHRONOS_SAY_8'),

+   (15381,-1350008,'Lord Staghelm, where are you going? You would shatter our bond for the sake of pride?',0,1,'ANACHRONOS_SAY_9'),

+   (15381,-1350009,'And now you know all that there is to know, mortal...',0,1,'ANACHRONOS_SAY_10'),

+   (15381,-1350010,'hands the Scepter of the Shifting Sands to Fandral Staghelm.',2,1,'ANACHRONOS_EMOTE_1'),

+   (15381,-1350011,'shakes his head in dissapointment.',2,274,'ANACHRONOS_EMOTE_2'),

+   (15381,-1350012,'kneels down to pick up the fragments of the shattered scepter.',2,87,'ANACHRONOS_EMOTE_3'),

+   (15382,-1350013,'My forces cannot overcome the Qiraji defenses. We will not be able to get close enough to place your precious barrier, dragon.',0,1,'FANDRAL_SAY_1'),

+   (15382,-1350014,'It is done dragon. Lead the way...',0,1,'FANDRAL_SAY_2'),

+   (15382,-1350015,'Ancient ones guide my hand... Wake from your slumber! WAKE AND SEAL THIS CURSED PLACE!',0,1,'FANDRAL_SAY_3'),

+   (15382,-1350016,'After the savagery that my people have witnessed and felt, you expect me to accept another burden, dragon? Surely you are mad.',0,25,'FANDRAL_SAY_4'),

+   (15382,-1350017,'I want nothing to do with Silithus, the Qiraji and least of all, any damned dragons!',0,1,'FANDRAL_SAY_5'),

+   (15382,-1350018,'My son''s soul will find no comfort in this hollow victory, dragon. I will have him back.Thought it takes a millennia, I WILL have my son back!',0,254,'FANDRAL_SAY_6'),

+   (15382,-1350019,'falls to one knee - exhausted.',2,16,'FANDRAL_EMOTE_1'),

+   (15382,-1350020,'hurls the Scepter of the Shifting Sands into the barrier, shattering it.',2,0,'FANDRAL_EMOTE_2'),

+   (15379,-1350021,'Aye, Fandral, remember these words: Let not your grief guide your faith. These thoughts you hold... dark places you go, night elf. Absolution cannot be had through misguided vengeance.',0,1,'CAELESTRASZ_SAY_1'),

+   (15379,-1350022,'Do not forget the sacrifices made on this day, night elf. We have all suffered immensely at the hands of these beasts.',0,1,'CAELESTRASZ_SAY_2'),

+   (15379,-1350023,'Alexstrasza grant me the resolve to drive our enemies back!',1,53,'CAELESTRASZ_YELL_1'),

+   (15380,-1350024,'This distraction will give you and the young druid time enough to seal the gate. Do not falter. Now, let us see how they deal with chaotic magic.',0,1,'ARYGOS_SAY_1'),

+   (15380,-1350025,'Let them feel the wrath of the Blue Flight! May Malygos protect me!',1,53,'ARYGOS_YELL_1'),

+   (15380,-1350026,'nods knowingly.',2,273,'ARYGOS_EMOTE_1'),

+   (15378,-1350027,'There is a way...',0,1,'MERITHRA_SAY_1'),

+   (15378,-1350028,'We will push them back, Anachronos. This I vow. Uphold the end of this task. Let not your hands falter as you seal our fates behind the barrier.',0,1,'MERITHRA_SAY_2'),

+   (15378,-1350029,'Succumb to the endless dream, little ones. Let it consume you!',1,53,'MERITHRA_YELL_1'),

+   (15378,-1350030,'glances at her compatriots.',2,2,'MERITHRA_EMOTE_1');

+

diff --git a/sql/updates/5864_world_scripts.sql b/sql/updates/5864_world_scripts.sql
index d3a47a31958..5de1cf6ab91 100644
--- a/sql/updates/5864_world_scripts.sql
+++ b/sql/updates/5864_world_scripts.sql
@@ -1,8 +1,5 @@
-
-UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307;
-UPDATE `creature_template` SET `ScriptName`='boss_drakkari_elemental' WHERE `entry`=29573;
-UPDATE `creature_template` SET `ScriptName`='npc_living_mojo' WHERE `entry`=29830;
-
-DELETE FROM `creature_ai_scripts` WHERE `id` = 1650612;
-INSERT INTO `creature_ai_scripts` (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`) VALUES
-(1650612, 16506, 6, 0, 100, 0, 0, 0, 0, 0, 11, 28732, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Naxxramas Worshipper - Widow Embrace');
+

+UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307;

+UPDATE `creature_template` SET `ScriptName`='boss_drakkari_elemental' WHERE `entry`=29573;

+UPDATE `creature_template` SET `ScriptName`='npc_living_mojo' WHERE `entry`=29830;

+

diff --git a/sql/updates/6020_world_scripts.sql b/sql/updates/6020_world_scripts.sql
deleted file mode 100644
index c13db82fcae..00000000000
--- a/sql/updates/6020_world_scripts.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-
--- Quest - Kroshius' Infernal Core (level 50 warlock specific)
-UPDATE `creature_template` SET `AIName`='EventAI' WHERE `entry`=14467;
-INSERT INTO `creature_ai_scripts`
-   (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`)
-VALUES 
-   (1446701, 14467, 11, 0, 100, 0, 0, 0, 0, 0, 1, -980, 0, 0, 19, 768, 0, 0, 2, 16, 0, 0, 'Kroshius Spawn Say');
-INSERT INTO `creature_ai_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 
-   (-980, 'Kroshius live? Kroshius crush!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0, 0, NULL);