Changes in Trial of the Champion:

-Implemented new scripts for Grand Champions, it includes vehicle fight (it is not 100 % done)
-Implemented more Vehicles Accessories. (related with the instance)
-Implemented basic support for event at spawn or dead from Boss Eadric/Paletress.
-Implemented basic support for event at spawn from Boss Black Knight.

For a complete fix see TDB forum > New Fix Submissions > Core related DB content.

--HG--
branch : trunk

4 files changed, 48 insertions, 6 deletions

diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 304d3a3cfac..24137c26f00 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -1990,3 +1990,16 @@ INSERT INTO `script_waypoint` VALUES
     (7998,14,-520.928,-117.679,-156.119,0,''),
     (7998,15,-521.717,-119.564,-156.114,0,'');
 
+DELETE FROM `script_waypoint` WHERE `entry`=35491;
+INSERT INTO `script_waypoint` VALUES
+    (35491,1,754.709,646.999,442.961,0,''),
+    (35491,2,738.85,637.289,439.134,0,''),
+    (35491,3,727.272,619.164,438.186,0,''),
+    (35491,4,733.524,608.939,433.711,0,''),
+    (35491,5,745.537,605.399,428.795,0,''),
+    (35491,6,754.46,607.124,426.542,0,''),
+    (35491,7,763.48,616.796,422.603,0,''),
+    (35491,8,761.823,625.299,418.482,0,''),
+    (35491,9,755.923,631.506,413.966,0,''),
+    (35491,10,744.841,634.505,411.575,0,'');
+
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index c9d14c588e5..e4e3e174816 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1221,17 +1221,21 @@ UPDATE `creature_template` SET `ScriptName`='npc_cairne_bloodhoof' WHERE `entry`
 
 /* TRIAL OF THE CHAMPION */
 UPDATE `instance_template` SET `script`='instance_trial_of_the_champion' WHERE `map`=650;
-UPDATE `creature_template` SET `Scriptname`='npc_toc5_announcer',`npcflag`=1 WHERE entry IN (35004, 35005);
-UPDATE `creature_template` SET `ScriptName`='mob_toc5_warrior' WHERE entry IN (34705, 35572);
-UPDATE `creature_template` SET `ScriptName`='mob_toc5_mage' WHERE entry IN (34702, 35569);
-UPDATE `creature_template` SET `ScriptName`='mob_toc5_shaman' WHERE entry IN (34701, 35571);
-UPDATE `creature_template` SET `ScriptName`='mob_toc5_hunter' WHERE entry IN (34657, 35570);
-UPDATE `creature_template` SET `ScriptName`='mob_toc5_rogue' WHERE entry IN (34703, 35617);
+UPDATE `creature_template` SET `ScriptName`='generic_vehicleAI_toc5' WHERE `entry` IN (35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,33298,33416,33297,33414,33301,33408,33300,33409,33418);
+UPDATE `creature_template` SET `ScriptName`='boss_warrior_toc5' WHERE `entry` IN (34705,35572);
+UPDATE `creature_template` SET `ScriptName`='boss_mage_toc5' WHERE `entry` IN (34702,35569);
+UPDATE `creature_template` SET `ScriptName`='boss_shaman_toc5' WHERE `entry` IN (35571,34701);
+UPDATE `creature_template` SET `ScriptName`='boss_hunter_toc5' WHERE `entry` IN (35570,34657);
+UPDATE `creature_template` SET `ScriptName`='boss_rouge_toc5' WHERE `entry` IN (35617,34703);
+UPDATE `creature_template` SET `ScriptName`='npc_announcer_toc5' WHERE `entry`IN (35004,35005);
 UPDATE `creature_template` SET `ScriptName`='npc_risen_ghoul' WHERE `entry` IN (35545,35564);
 UPDATE `creature_template` SET `ScriptName`='boss_black_knight' WHERE `entry`=35451;
 UPDATE `creature_template` SET `ScriptName`='boss_eadric' WHERE `entry`=35119;
 UPDATE `creature_template` SET `ScriptName`='boss_paletress' WHERE `entry`=34928;
 UPDATE `creature_template` SET `ScriptName`='npc_memory' WHERE `entry` IN (35052,35041,35033,35046,35043,35047,35044,35039, 35034, 35049, 35030, 34942, 35050, 35042, 35045, 35037, 35031, 35038, 35029,35048,35032,35028,35040,35036,35051);
+UPDATE `creature_template` SET `ScriptName`='npc_argent_soldier'  WHERE `entry` IN (35309,35305,35307);
+UPDATE `creature_template` SET `ScriptName`='npc_black_knight_skeletal_gryphon' WHERE `entry`=35491;
+UPDATE `creature_template` SET `AIName`='PassiveAI' WHERE `entry` IN (35332,35330,35328,35327,35331,35329,35325,35314,35326,35323);
 
 /* TIRISFAL GLADES */
 UPDATE `creature_template` SET `ScriptName`='npc_calvin_montague' WHERE `entry`=6784;
diff --git a/sql/updates/7285_world_script_waypoint.sql b/sql/updates/7285_world_script_waypoint.sql
new file mode 100644
index 00000000000..fe11d7dbe49
--- /dev/null
+++ b/sql/updates/7285_world_script_waypoint.sql
@@ -0,0 +1,13 @@
+DELETE FROM `script_waypoint` WHERE `entry`=35491;
+INSERT INTO `script_waypoint` VALUES
+(35491,1,754.709,646.999,442.961,0,''),
+(35491,2,738.85,637.289,439.134,0,''),
+(35491,3,727.272,619.164,438.186,0,''),
+(35491,4,733.524,608.939,433.711,0,''),
+(35491,5,745.537,605.399,428.795,0,''),
+(35491,6,754.46,607.124,426.542,0,''),
+(35491,7,763.48,616.796,422.603,0,''),
+(35491,8,761.823,625.299,418.482,0,''),
+(35491,9,755.923,631.506,413.966,0,''),
+(35491,10,744.841,634.505,411.575,0,'');
+
diff --git a/sql/updates/7285_world_scriptname.sql b/sql/updates/7285_world_scriptname.sql
new file mode 100644
index 00000000000..7265c6e0405
--- /dev/null
+++ b/sql/updates/7285_world_scriptname.sql
@@ -0,0 +1,12 @@
+UPDATE `creature_template` SET `ScriptName`='generic_vehicleAI_toc5' WHERE `entry` IN (35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,33298,33416,33297,33414,33301,33408,33300,33409,33418);
+UPDATE `creature_template` SET `ScriptName`='boss_warrior_toc5' WHERE `entry` IN (34705,35572);
+UPDATE `creature_template` SET `ScriptName`='boss_mage_toc5' WHERE `entry` IN (34702,35569);
+UPDATE `creature_template` SET `ScriptName`='boss_shaman_toc5' WHERE `entry` IN (35571,34701);
+UPDATE `creature_template` SET `ScriptName`='boss_hunter_toc5' WHERE `entry` IN (35570,34657);
+UPDATE `creature_template` SET `ScriptName`='boss_rouge_toc5' WHERE `entry` IN (35617,34703);
+UPDATE `creature_template` SET `ScriptName`='npc_announcer_toc5' WHERE `entry`IN (35004,35005);
+UPDATE `instance_template` SET `script`='instance_trial_of_the_champion' WHERE `map`=650;
+UPDATE `creature_template` SET `ScriptName`='npc_argent_soldier'  WHERE `entry` IN (35309,35305,35307);
+UPDATE `creature_template` SET `ScriptName`='npc_black_knight_skeletal_gryphon' WHERE `entry`=35491;
+UPDATE `creature_template` SET `AIName`='PassiveAI' WHERE `entry` IN (35332,35330,35328,35327,35331,35329,35325,35314,35326,35323);
+