* Updated CMakeLists with precious revisions

* Modified sql updates to more proper version
* Added script names to script_full table

--HG--
branch : trunk

4 files changed, 12 insertions, 29 deletions

diff --git a/sql/updates/1206_world_scripts.sql b/sql/updates/1206_world_scripts.sql
index b48a714ffbc..b35e054f57c 100644
--- a/sql/updates/1206_world_scripts.sql
+++ b/sql/updates/1206_world_scripts.sql
@@ -1 +1 @@
-UPDATE `gameobject_template` SET `ScriptName` = 'go_legion_obelisk' WHERE `entry` = 185193;
UPDATE `gameobject_template` SET `ScriptName` = 'go_legion_obelisk' WHERE `entry` = 185195;
UPDATE `gameobject_template` SET `ScriptName` = 'go_legion_obelisk' WHERE `entry` = 185196;
UPDATE `gameobject_template` SET `ScriptName` = 'go_legion_obelisk' WHERE `entry` = 185197;
UPDATE `gameobject_template` SET `ScriptName` = 'go_legion_obelisk' WHERE `entry` = 185198;
\ No newline at end of file
+UPDATE `gameobject_template` SET `ScriptName`='go_legion_obelisk' WHERE `entry` IN (185193,185195,185196,185197,185198);
\ No newline at end of file
diff --git a/sql/updates/1207_world_scripts.sql b/sql/updates/1207_world_scripts.sql
index addabe98f1b..ac955837516 100644
--- a/sql/updates/1207_world_scripts.sql
+++ b/sql/updates/1207_world_scripts.sql
@@ -1,2 +1,2 @@
-UPDATE creature_template SET ScriptName='npc_surristrasz' WHERE entry=24795;

-UPDATE creature_template SET ScriptName='npc_tiare' WHERE entry=30051;

+UPDATE `creature_template` SET `ScriptName`='npc_surristrasz' WHERE `entry`=24795;

+UPDATE `creature_template` SET `ScriptName`='npc_tiare' WHERE `entry`=30051;
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 75df4d2bcd6..975d18ef279 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -18,4 +18,6 @@ INSTALL(FILES
 1185_(mangos_7214)_01_world_command.sql
 1185_(mangos_7214)_02_world_trinity_string.sql
 1185_(mangos_7214)_03_mangos_spell_proc_event.sql
+1206_world_scripts.sql
+1207_world_scripts.sql
 DESTINATION share/trinity/sql/updates)
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index e965308050f..0bff82169f9 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -20,6 +20,7 @@ UPDATE `gameobject_template` set `ScriptName`='go_manticron_cube' WHERE `entry`=
 UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_trigger' WHERE `entry`=104593;
 UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_door' WHERE `entry`=176594;
 UPDATE `gameobject_template` SET `ScriptName`='go_crystal_prison' WHERE `entry`=185126;
+UPDATE `gameobject_template` SET `ScriptName`='go_legion_obelisk' WHERE `entry` IN (185193,185195,185196,185197,185198);
 
 /* GUARD */
 UPDATE `creature_template` SET `ScriptName`='guard_azuremyst' WHERE `entry`=18038;
@@ -95,7 +96,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_ravenholdt' WHERE `entry`=13936
 
 /* ALTERAC VALLEY */
 
-
 /* ARATHI HIGHLANDS */
 UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE `entry`=2768;
 
@@ -105,10 +105,8 @@ UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=230
 UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858;
 UPDATE `creature_template` SET `ScriptName`='npc_ruul_snowhoof' WHERE `entry`=12818;
 
-
 /* AUCHINDOUN */
 
-
 /* MANA TOMBS */
 UPDATE `creature_template` SET `ScriptName`='boss_pandemonius' WHERE `entry`=18341;
 UPDATE `creature_template` SET `ScriptName`='boss_nexusprince_shaffar' WHERE `entry`=18344;
@@ -151,7 +149,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' WHERE `entry
 
 /* BADLANDS */
 
-
 /* BARRENS */
 UPDATE `creature_template` SET `ScriptName`='npc_beaten_corpse' WHERE `entry`=10668;
 UPDATE `creature_template` SET `ScriptName`='npc_sputtervalve' WHERE `entry`=3442;
@@ -200,7 +197,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_spirit_of_olum' WHERE `entry`=2
 
 /* BLACKFATHOM DEPTHS */
 
-
 /* BLACKROCK DEPTHS */
 UPDATE `creature_template` SET `ScriptName`='boss_emperor_dagran_thaurissan' WHERE `entry`=9019;
 UPDATE `creature_template` SET `ScriptName`='boss_moira_bronzebeard' WHERE `entry`=8929;
@@ -269,6 +265,10 @@ UPDATE `creature_template` SET `ScriptName`='npc_fallen_hero_of_horde' WHERE `en
 UPDATE `creature_template` SET `ScriptName`='mob_webbed_creature' WHERE `entry`=17680;
 UPDATE `creature_template` SET `ScriptName`='npc_captured_sunhawk_agent' WHERE `entry`=17824;
 
+/* BOREAN TUNDRA */
+UPDATE `creature_template` SET `ScriptName`='npc_surristrasz' WHERE `entry`=24795;
+UPDATE `creature_template` SET `ScriptName`='npc_tiare' WHERE `entry`=30051;
+
 /* BURNING STEPPES */
 UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
 
@@ -306,7 +306,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_medivh_bm' WHERE `entry`=15608;
 UPDATE `creature_template` SET `ScriptName`='npc_time_rift' WHERE `entry`=17838;
 UPDATE `creature_template` SET `ScriptName`='npc_saat' WHERE `entry`=20201;
 
-
 /* COILFANG RESERVOIR */
 
 /* THE SLAVE PENS */
@@ -352,10 +351,8 @@ UPDATE `creature_template` SET `ScriptName`='mob_coilfang_strider' WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='mob_fathom_sporebat' WHERE `entry`=22140;
 UPDATE `creature_template` SET `ScriptName`='mob_shield_generator_channel' WHERE `entry`=19870;
 
-
 /* DARKSHORE */
 
-
 /* DEADMINES */
 UPDATE `instance_template` SET `script`='instance_deadmines' WHERE `map`=36;
 UPDATE `item_template` SET `ScriptName`='item_defias_gunpowder' WHERE `entry`=5397;
@@ -365,23 +362,17 @@ UPDATE `gameobject_template` SET `ScriptName`='go_main_chambers_access_panel' WH
 
 /* DEADWIND PASS */
 
-
 /* DESOLACE */
 
-
 /* DIRE MAUL */
 
-
 /* DUN MOROGH */
 UPDATE `creature_template` SET `ScriptName`='npc_narm_faulk' WHERE `entry`=6177;
 
-
 /* DUROTAR */
 
-
 /* DUSKWOOD */
 
-
 /* DUSTWALLOW MARSH */
 UPDATE `creature_template` SET `ScriptName`='mobs_risen_husk_spirit' WHERE `entry` IN (23554,23555);
 UPDATE `creature_template` SET `ScriptName`='npc_deserter_agitator' WHERE `entry`=23602;
@@ -423,7 +414,6 @@ update `gameobject_template` SET `ScriptName`='go_gilded_brazier' WHERE `entry`=
 
 /* GNOMEREGAN */
 
-
 /* GRUUL'S LAIR */
 UPDATE `instance_template` SET `script`='instance_gruuls_lair' WHERE `map` =565;
 UPDATE `creature_template` SET `ScriptName`='boss_gruul' WHERE `entry`=19044;
@@ -434,10 +424,8 @@ UPDATE `creature_template` SET `ScriptName`='boss_blindeye_the_seer' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='boss_olm_the_summoner' WHERE `entry`=18834;
 UPDATE `creature_template` SET `ScriptName`='boss_krosh_firehand' WHERE `entry`=18832;
 
-
 /* HELLFIRE CITADEL */
 
-
 /* BLOOD FURNACE */
 /* The Maker,Broggok,Kelidan,Broggok's cloud */
 UPDATE `instance_template` SET `script`='instance_blood_furnace' WHERE `map`=542;
@@ -482,10 +470,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry
 
 /* HILLSBRAD FOOTHILLS */
 
-
 /* HINTERLANDS */
 
-
 /* IRONFORGE */
 UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;
 
@@ -648,14 +634,13 @@ UPDATE `creature_template` SET `ScriptName`='npc_thrall_warchief' WHERE `entry`=
 
 /* RAGEFIRE CHASM */
 
-
 /* RAZORFEN DOWNS */
 UPDATE `creature_template` SET `ScriptName`='boss_amnennar_the_coldbringer' WHERE `entry`=7358;
 
 /* RAZORFEN KRAUL */
 UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE `entry`=4508;
-/* REDRIDGE MOUNTAINS */
 
+/* REDRIDGE MOUNTAINS */
 
 /* RUINS OF AHN'QIRAJ */
 UPDATE `instance_template` SET `script`='instance_ruins_of_ahnqiraj' WHERE `map`=509;
@@ -794,7 +779,6 @@ update `creature_template` set `ScriptName`='mob_shadow_image' WHERE `entry`=252
 
 /* SWAMP OF SORROWS */
 
-
 /* TANARIS */
 UPDATE `creature_template` SET `ScriptName`='mob_aquementas' WHERE `entry`=9453;
 UPDATE `creature_template` SET `ScriptName`='npc_custodian_of_time' WHERE `entry`=20129;
@@ -805,7 +789,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_OOX17' WHERE `entry`=7784;
 
 /* TELDRASSIL */
 
-
 /* TEMPEST KEEP */
 
 /* THE MECHANAR */
@@ -918,7 +901,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_parqual_fintallas' WHERE `entry
 
 /* WAILING CAVERNS */
 
-
 /* WESTERN PLAGUELANDS */
 UPDATE `creature_template` SET `ScriptName`='npcs_dithers_and_arbington' WHERE `entry` IN (11056,11057);
 UPDATE `creature_template` SET `ScriptName`='npc_the_scourge_cauldron' WHERE `entry`=11152;
@@ -928,7 +910,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=4
 
 /* WETLANDS */
 
-
 /* WINTERSPRING */
 UPDATE `creature_template` SET `ScriptName`='npc_lorax' WHERE `entry`=10918;
 UPDATE `creature_template` SET `ScriptName`='npc_rivern_frostwind' WHERE `entry`=10618;
@@ -977,4 +958,4 @@ UPDATE `creature_template` SET `ScriptName`='mob_spawn_of_marli' WHERE `entry`=1
 UPDATE `creature_template` SET `ScriptName`='mob_batrider' WHERE `entry`=14965;
 UPDATE `creature_template` SET `ScriptName`='mob_shade_of_jindo' WHERE `entry`=14986;
 
-/* EOF */
+/* EOF */
\ No newline at end of file