* Used finally after long time trinity sql coding style

* Missing data are now in 4321_world - just import this
* Updated all FULL sqls to 4321

--HG--
branch : trunk

4 files changed, 48 insertions, 44 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 894f1c56d1d..f33773743b2 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -1,4 +1,4 @@
--- Up to TC2 3515
+-- Up to TC2 4321
 -- 
 -- trinityscript_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts.
 -- valid entries for table are between -1000000 and -1999999
@@ -343,13 +343,10 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1000425, 'Ah. I remember now! I gave the mysterious fossil to Hollee! Check with her.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'remtravel SAY_REM_REMEMBER'),
 (-1000426, '%s goes back to work, oblivious to everything around him.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 7, 0, 'remtravel EMOTE_REM_END'),
 (-1000427, 'Something tells me this $r wants the mysterious fossil too. Help!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'remtravel SAY_REM_AGGRO'),
-
 (-1000428, 'Ah...the wondrous sound of kodos. I love the way they make the ground shake... inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_1'),
 (-1000429, 'Hey, look out with that kodo! You had better inspect that beast before i give you credit!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'kodo round SAY_SMEED_HOME_2'),
 (-1000430, 'That kodo sure is a beauty. Wait a minute, where are my bifocals? Perhaps you should inspect the beast for me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'kodo round SAY_SMEED_HOME_3');
 
-
-
 -- -1 033 000 SHADOWFANG KEEP
 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
 (-1033000, 'Follow me and I''ll open the courtyard door for you.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 1, 'prisoner ashcrombe SAY_FREE_AS'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 6c73a8e9c90..1b073b8f33b 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -1,4 +1,4 @@
--- Up to TC2 3515
+-- Up to TC2 4321
 
 -- This file contains all waypoints used by escortAI scripts
 DROP TABLE IF EXISTS script_waypoint;
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index d0caeba039f..ff54cbf4569 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1,4 +1,4 @@
--- Up to TC2 4006
+-- Up to TC2 4321
 
 /* WORLD BOSS */
 UPDATE `creature_template` SET `ScriptName`='boss_ysondre' WHERE `entry`=14887;
@@ -424,6 +424,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_alexstrasza_wr_gate' WHERE `ent
 /* DEADWIND PASS */
 
 /* DESOLACE */
+UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627);
 
 /* DIRE MAUL */
 
@@ -488,7 +489,6 @@ UPDATE `creature_template` SET `ScriptName`='boss_krosh_firehand' WHERE `entry`=
 /* HELLFIRE CITADEL */
 
 /* BLOOD FURNACE */
-/* The Maker,Broggok,Kelidan,Broggok's cloud */
 UPDATE `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542;
 UPDATE `creature_template` SET `ScriptName`='boss_the_maker' WHERE `entry`=17381;
 UPDATE `creature_template` SET `ScriptName`='boss_broggok' WHERE `entry`=17380;
@@ -683,6 +683,16 @@ UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415;
 UPDATE `creature_template` SET `ScriptName`='npc_commander_dawnforge' WHERE `entry`=19831;
 
+/* THE NEXUS */
+UPDATE `instance_template` SET `script`='instance_nexus' WHERE `map`=576;
+UPDATE `creature_template` SET `ScriptName`='boss_magus_telestra' WHERE `entry`=26731;
+UPDATE `creature_template` SET `ScriptName`='boss_anomalus' WHERE `entry`=26763;
+UPDATE `creature_template` SET `ScriptName`='mob_chaotic_rift' WHERE `entry`=26918
+UPDATE `creature_template` SET `ScriptName`='boss_ormorok' WHERE `entry`=26794;
+UPDATE `creature_template` SET `ScriptName`='mob_crystal_spike' WHERE `entry`=27099;
+UPDATE `creature_template` SET `ScriptName`='mob_crystalline_tangler' WHERE `entry`=32665;
+UPDATE `creature_template` SET `ScriptName`='boss_keristrasza' WHERE `entry`=26723;
+
 /* ONYXIA'S LAIR */
 UPDATE `creature_template` SET `ScriptName`='boss_onyxia' WHERE `entry`=10184;
 
@@ -1078,32 +1088,11 @@ UPDATE `creature_template` SET `ScriptName`='mob_batrider' WHERE `entry`=14965;
 UPDATE `creature_template` SET `ScriptName`='mob_shade_of_jindo' WHERE `entry`=14986;
 UPDATE `creature_template` SET `ScriptName`='mob_ohgan' WHERE `entry`=14988;
 
-
-
--- Grand Magus Telestra
-update `creature_template` set `ScriptName`='boss_magus_telestra' where `entry`=26731;
-
--- Anomalus
-update `creature_template` set `ScriptName`='boss_anomalus' where `entry`=26763;
-update `creature_template` set `ScriptName`='mob_chaotic_rift' where `entry`=26918;
-
--- Ormorok the Tree-Shaper
-update `creature_template` set `ScriptName`='boss_ormorok' where `entry`=26794;
-update `creature_template` set `ScriptName`='mob_crystal_spike' where `entry`=27099;
-update `creature_template` set `ScriptName`='mob_crystalline_tangler' where `entry`=32665;
-
--- Keristrasza
-update `creature_template` set `ScriptName`='boss_keristrasza' where `entry`=26723;
-
--- Instance script
-update `instance_template` set `script`='instance_nexus' where `map`=576;
-
 -- --------
 -- EVENT AI
 -- --------
-
-UPDATE creature_template set AIName = 'EventAI' where entry in  (26796, 26798, 26929, 26928, 26930);
-DELETE FROM `creature_ai_scripts` WHERE `creature_id` in (26796, 26798, 26929, 26928, 26930);
+UPDATE `creature_template` SET `AIName` = 'EventAI' WHERE entry IN  (26796, 26798, 26929, 26928, 26930);
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (26796, 26798, 26929, 26928, 26930);
 INSERT INTO `creature_ai_scripts` VALUES 
 -- Commander Stoutbeard
 ( 2679600, 26796, 4, 0, 100, 4, 0, 0, 0, 0, 28, 0, 47543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Commander Stoutbeard - crystal prison remove'),
@@ -1131,6 +1120,4 @@ INSERT INTO `creature_ai_scripts` VALUES
 ( 2693003, 26930, 0, 0, 100, 3, 9000, 9000, 15000, 16000, 11, 47727, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Magus Telestra frost - cast blizzard N'),
 ( 2693004, 26930, 0, 0, 100, 5, 9000, 9000, 15000, 16000, 11, 56936, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Grand Magus Telestra frost - cast blizzard H');
 
-
-
-/* EOF */
+/* EOF */
\ No newline at end of file
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 6f947ee09b4..c8656ee3ecc 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -1,4 +1,4 @@
--- Up to TC2 4018
+-- Up to TC2 4321
 
 -- --------
 -- LINKED
@@ -493,6 +493,15 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 (54744,1,0),
 (54746,1,0);
 
+-- For quest The Denouncement and The Restless Dead
+DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES 
+('48714', '2', '27237'),
+('48714', '2', '27235'),
+('48714', '2', '27234'),
+('48714', '2', '27236'),
+('57806', '2', '31043');
+
 -- --------
 -- POSITION
 -- --------
@@ -1493,7 +1502,9 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 (48743, 1, 26125); -- Death pact
 
 -- Eye of Acherus
-REPLACE into `spell_target_position` values (51852, 609, 2361.21, -5660.45, 503.828, 4.49);
+DELETE FROM `spell_target_position` WHERE `id`=51852;
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(51852, 609, 2361.21, -5660.45, 503.828, 4.49);
 
 update creature_template set minlevel=50,maxlevel=52,minhealth=2215,maxhealth=2317,faction_A=2084,faction_H=2084,mindmg=50,maxdmg=50 where entry=28528; -- ghoul
 UPDATE `creature_template` SET spell1=52372,spell2=52373,spell3=52374,spell4=52375 WHERE `entry`=28406;
@@ -1509,15 +1520,24 @@ UPDATE creature_template SET `VehicleId`=200 WHERE `entry` IN (28605,28606,28607
 -- Vehicle and summon spell(summon npc 28788) for Acherus Deathcharger
 UPDATE creature_template SET `spell1`=52362, `VehicleId`=200 WHERE `entry`=28782;
 
-replace into creature_questrelation (id,quest) VALUES (28377,12701);
-replace into creature_involvedrelation (id,quest) VALUES (28377,12701);
-replace into creature_involvedrelation (id,quest) VALUES (28914,12723);
-replace into creature_questrelation (id,quest) VALUES (28914,12724);
-replace into creature_involvedrelation (id,quest) VALUES (28914,12724);
-replace into creature_questrelation (id,quest) VALUES (28913,12725);
-replace into creature_involvedrelation (id,quest) VALUES (28912,12725);
-replace into creature_questrelation (id,quest) VALUES (28912,12727);
-replace into creature_involvedrelation (id,quest) VALUES (28913,12727);
+DELETE FROM `creature_questrelation` WHERE `quest`=12701;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12701;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12723;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723);
+DELETE FROM `creature_questrelation` WHERE `quest`=12724;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12724;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_questrelation` WHERE `quest`=12725;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12725;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725);
+DELETE FROM `creature_questrelation` WHERE `quest`=12727;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12727;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727);
 
 DELETE FROM `npc_spellclick_spells` WHERE `spell_id` IN (
 54568, 54575, 52263, 52280, 52447);