From 5be032fe7964675f36e9b819aad98730989c9ffd Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 6 Mar 2011 12:36:01 +0100
Subject: SQL: Corrected improper sql file naming

---
 sql/updates/world/2011_03_05_3_spell_area.sql      |   4 -
 .../world/2011_03_05_3_world_spell_area.sql        |   4 +
 sql/updates/world/2011_03_05_4_creatures.sql       | 133 ---------------------
 sql/updates/world/2011_03_05_4_world_creatures.sql | 133 +++++++++++++++++++++
 sql/updates/world/2011_03_05_5_creatures.sql       |  58 ---------
 sql/updates/world/2011_03_05_5_world_creatures.sql |  58 +++++++++
 6 files changed, 195 insertions(+), 195 deletions(-)
 delete mode 100644 sql/updates/world/2011_03_05_3_spell_area.sql
 create mode 100644 sql/updates/world/2011_03_05_3_world_spell_area.sql
 delete mode 100644 sql/updates/world/2011_03_05_4_creatures.sql
 create mode 100644 sql/updates/world/2011_03_05_4_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_05_5_creatures.sql
 create mode 100644 sql/updates/world/2011_03_05_5_world_creatures.sql

(limited to 'sql')

diff --git a/sql/updates/world/2011_03_05_3_spell_area.sql b/sql/updates/world/2011_03_05_3_spell_area.sql
deleted file mode 100644
index b7efd814e3e..00000000000
--- a/sql/updates/world/2011_03_05_3_spell_area.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Dragonmaw Fel Orc illusion for Netherwing Mines area after Netherwing quest chain for reputation is complete
-DELETE FROM `spell_area` WHERE `spell`=40214 AND `area`=3965;
-INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
-(40214,3965,11013,1,0,0,0,2,1);
diff --git a/sql/updates/world/2011_03_05_3_world_spell_area.sql b/sql/updates/world/2011_03_05_3_world_spell_area.sql
new file mode 100644
index 00000000000..b7efd814e3e
--- /dev/null
+++ b/sql/updates/world/2011_03_05_3_world_spell_area.sql
@@ -0,0 +1,4 @@
+-- Dragonmaw Fel Orc illusion for Netherwing Mines area after Netherwing quest chain for reputation is complete
+DELETE FROM `spell_area` WHERE `spell`=40214 AND `area`=3965;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
+(40214,3965,11013,1,0,0,0,2,1);
diff --git a/sql/updates/world/2011_03_05_4_creatures.sql b/sql/updates/world/2011_03_05_4_creatures.sql
deleted file mode 100644
index 1ee645a097e..00000000000
--- a/sql/updates/world/2011_03_05_4_creatures.sql
+++ /dev/null
@@ -1,133 +0,0 @@
--- Some Dalran and Area Updates (sniff)
--- Template updates 
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32415; -- Hamaka
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31031; -- Misensi
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36670; -- Magister Hathorel
-UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37858; -- Razorscale Image
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
-UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|33544 WHERE `entry`=42078; -- Mini Thor
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32325; -- Gold Priest
-
--- Model data 
-UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1.05,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
-UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27957; -- Hamaka
-UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Underbelly Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0.75,`gender`=0 WHERE `modelid`=4449; -- Imp
-UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30806; -- Razorscale Image
-UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=0,`gender`=2 WHERE `modelid`=32670; -- Mini Thor
-
--- Addon data
-DELETE FROM `creature_template_addon` WHERE `entry` IN (417,31233,31228,33778,34244,31236,29631,32692,32687,30352,31085,30755,31081,28671,28160,31031,28674,31238,29238,31229,
-32596,32415,32419,32418,32253,32412,32602,32732,31439,35826,32428,36670,32251,32252,32420,30659,32730,28991,32470,27047,29497,29534,31851,29493,28989,29533,32686,32683,
-29325,31080,20735,28742,29496,32265,31517,29499,37858,29156,29476,28993,32691,32675,30885,32328,32339,32743,23472,33938,33937,33936,34095,29527,28956,28691,28332,28994,28692,
-42078,29494,35497,29523,35500,28992,32683,29763,29764,29765,29766,37776,32509,29529,29529,28776,30726,28774,29528,32601,32710,32752,
-32322,32325);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(32322,0,0,1,0, NULL), -- Gold Warrior
-(32325,0,0,1,0, NULL), -- Gold Priest
-(32752,0,0,1,0, NULL), -- Tabitha
-(32710,0,0,1,0, NULL), -- Garl Grimgrizzle
-(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
-(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
-(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
-(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
-(37776,0,0,1,0, NULL), -- Apprentice Nelphi
-(32509,0,0,257,0, NULL), -- Brammold Deepmine
-(29528,0,0,257,0, NULL), -- Debbi Moore
-(29529,0,0,257,0, NULL), -- Ninsianna
-(28776,0,0,257,0, NULL), -- Elizabeth Ross
-(30726,0,0,257,0, NULL), -- Archivist Betha
-(28774,0,0,257,0, NULL), -- Andrew Matthews
-(42078,0,0,1,0, NULL), -- Mini Thor
-(29494,0,0,257,0, NULL), -- Shen Kang Cheng
-(35497,0,0,257,0, NULL), -- Rafael Langrom
-(29523,0,0,257,0, NULL), -- Bragund Brightlink
-(35500,0,0,257,0, NULL), -- Matilda Brightlink
-(28992,0,0,257,0, NULL), -- Valerie Langrom
-(32683,0,0,257,0, NULL), -- Grezla the Hag
-(32686,0,0,257,0, NULL), -- Crafticus Mindbender
-(28692,0,0,257,0, NULL), -- "Red" Jack Findle
-(28994,0,0,257,0, NULL), -- Abra Cadabra
-(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
-(28691,0,0,257,0, NULL), -- Susana Averoy
-(30885,0,0,1,0, NULL), -- Blazik Fireclaw
-(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
-(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
-(32743,0,1,1,0, NULL), -- Willard Blauvelt
-(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
-(33938,0,0,1,0, NULL), -- Zom Bocom
-(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
-(33936,0,0,1,0, NULL), -- Nargle Lashcord
-(34095,0,0,1,0, NULL), -- Trapjaw Rix
-(29527,0,0,257,0, NULL), -- Orton Bennet
-(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
-(29534,0,0,1,0, NULL), -- "Baroness" Llana
-(31851,0,65536,1,0, NULL), -- Wooly Mammoth
-(29493,0,0,257,0, NULL), -- Jarold Puller
-(28989,0,0,258,0, NULL), -- Aemara
-(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
-(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
-(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
-(28993,0,0,1,0, NULL), -- Aerith Primrose
-(29476,0,0,258,0, NULL), -- Dagna Flintlock
-(29156,0,0,257,0, NULL), -- Archmage Celindra
-(37858,0,50331648,0,0, NULL), -- Razorscale Image
-(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
-(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
-(29499,0,0,257,0, NULL), -- Bartram Haller
-(31228,0,0,1,0, NULL), -- Grove Walker
-(33778,0,1,1,0, NULL), -- Tournament Hippogryph
-(34244,0,0,1,0, NULL), -- Jean Pierre Poulain
-(31236,0,0,1,0, NULL), -- Dappled Stag
-(29631,0,0,1,0, NULL), -- Awilo Lon'gomba
-(32692,0,0,257,0, NULL), -- Arcanist Alec
-(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
-(30352,0,0,256,0, NULL), -- Skybreaker Marine
-(31085,0,0,1,0, NULL), -- Sky-Reaver Klum
-(30755,0,0,256,0, NULL), -- Kor'kron Reaver
-(31081,0,0,1,0, NULL), -- Officer Van Rossem
-(28160,0,0,257,0, NULL), -- Archmage Pentarus
-(28674,0,0,257,0, NULL), -- Aludane Whitecloud
-(31031,0,0,1,69, NULL), -- Misensi
-(31238,27525,0,257,0, NULL), -- Hira Snowdawn
-(29238,0,0,1,0, NULL), -- Scourge Haunt
-(31229,0,0,1,0, NULL), -- Ancient Watcher
-(32596,0,0,257,0, NULL), -- Dalaran Visitor
-(32602,25833,0,257,0, NULL), -- Dalaran Visitor
-(32601,22471,0,257,0, NULL), -- Dalaran Visitor
-(32415,0,0,1,0, NULL), -- Hamaka
-(32419,0,0,1,0, NULL), -- Umbiwa
-(32418,0,0,1,0, NULL), -- Abohba
-(32253,0,0,2,0, NULL), -- Kyunghee
-(32412,0,0,1,0, NULL), -- Mato
-(32732,0,0,257,0, NULL), -- Dorfus Alphamage
-(31439,0,0,1,0, NULL), -- Archmage Timear
-(35826,0,1,1,0, NULL), -- Kaye Toogie
-(32428,0,0,1,0, NULL), -- Underbelly Rat
-(36670,0,0,1,0, NULL), -- Magister Hathorel
-(32251,0,0,2,0, NULL), -- Shokavis
-(32252,0,0,2,0, NULL), -- Wanathan
-(32420,0,0,1,10, NULL), -- Mimbihi
-(30659,0,0,1,333, NULL), -- Violet Hold Guard
-(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
-(28991,0,0,257,0, NULL), -- Valaden Silverblade
-(32470,0,0,1,0, NULL), -- Sewer Frog
-(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
-(29497,0,0,257,0, NULL), -- Walther Whiteford
-(29325,0,0,1,379, NULL), -- Torgo the Younger
-(31080,0,0,1,0, NULL), -- Warden Alturas
-(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
-(28742,0,0,257,0, NULL), -- Marcia Chase
-(29496,0,0,257,0, NULL); -- Kerta the Bold
-
--- Template updates for gameobject 
-UPDATE `gameobject_template` SET `faction`=0 WHERE `entry`=35591; -- Fishing Bobber
diff --git a/sql/updates/world/2011_03_05_4_world_creatures.sql b/sql/updates/world/2011_03_05_4_world_creatures.sql
new file mode 100644
index 00000000000..1ee645a097e
--- /dev/null
+++ b/sql/updates/world/2011_03_05_4_world_creatures.sql
@@ -0,0 +1,133 @@
+-- Some Dalran and Area Updates (sniff)
+-- Template updates 
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32415; -- Hamaka
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31031; -- Misensi
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36670; -- Magister Hathorel
+UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37858; -- Razorscale Image
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
+UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|33544 WHERE `entry`=42078; -- Mini Thor
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32325; -- Gold Priest
+
+-- Model data 
+UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1.05,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
+UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27957; -- Hamaka
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Underbelly Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0.75,`gender`=0 WHERE `modelid`=4449; -- Imp
+UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30806; -- Razorscale Image
+UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=0,`gender`=2 WHERE `modelid`=32670; -- Mini Thor
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (417,31233,31228,33778,34244,31236,29631,32692,32687,30352,31085,30755,31081,28671,28160,31031,28674,31238,29238,31229,
+32596,32415,32419,32418,32253,32412,32602,32732,31439,35826,32428,36670,32251,32252,32420,30659,32730,28991,32470,27047,29497,29534,31851,29493,28989,29533,32686,32683,
+29325,31080,20735,28742,29496,32265,31517,29499,37858,29156,29476,28993,32691,32675,30885,32328,32339,32743,23472,33938,33937,33936,34095,29527,28956,28691,28332,28994,28692,
+42078,29494,35497,29523,35500,28992,32683,29763,29764,29765,29766,37776,32509,29529,29529,28776,30726,28774,29528,32601,32710,32752,
+32322,32325);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(32322,0,0,1,0, NULL), -- Gold Warrior
+(32325,0,0,1,0, NULL), -- Gold Priest
+(32752,0,0,1,0, NULL), -- Tabitha
+(32710,0,0,1,0, NULL), -- Garl Grimgrizzle
+(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
+(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
+(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
+(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
+(37776,0,0,1,0, NULL), -- Apprentice Nelphi
+(32509,0,0,257,0, NULL), -- Brammold Deepmine
+(29528,0,0,257,0, NULL), -- Debbi Moore
+(29529,0,0,257,0, NULL), -- Ninsianna
+(28776,0,0,257,0, NULL), -- Elizabeth Ross
+(30726,0,0,257,0, NULL), -- Archivist Betha
+(28774,0,0,257,0, NULL), -- Andrew Matthews
+(42078,0,0,1,0, NULL), -- Mini Thor
+(29494,0,0,257,0, NULL), -- Shen Kang Cheng
+(35497,0,0,257,0, NULL), -- Rafael Langrom
+(29523,0,0,257,0, NULL), -- Bragund Brightlink
+(35500,0,0,257,0, NULL), -- Matilda Brightlink
+(28992,0,0,257,0, NULL), -- Valerie Langrom
+(32683,0,0,257,0, NULL), -- Grezla the Hag
+(32686,0,0,257,0, NULL), -- Crafticus Mindbender
+(28692,0,0,257,0, NULL), -- "Red" Jack Findle
+(28994,0,0,257,0, NULL), -- Abra Cadabra
+(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
+(28691,0,0,257,0, NULL), -- Susana Averoy
+(30885,0,0,1,0, NULL), -- Blazik Fireclaw
+(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
+(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
+(32743,0,1,1,0, NULL), -- Willard Blauvelt
+(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
+(33938,0,0,1,0, NULL), -- Zom Bocom
+(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
+(33936,0,0,1,0, NULL), -- Nargle Lashcord
+(34095,0,0,1,0, NULL), -- Trapjaw Rix
+(29527,0,0,257,0, NULL), -- Orton Bennet
+(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
+(29534,0,0,1,0, NULL), -- "Baroness" Llana
+(31851,0,65536,1,0, NULL), -- Wooly Mammoth
+(29493,0,0,257,0, NULL), -- Jarold Puller
+(28989,0,0,258,0, NULL), -- Aemara
+(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
+(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
+(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
+(28993,0,0,1,0, NULL), -- Aerith Primrose
+(29476,0,0,258,0, NULL), -- Dagna Flintlock
+(29156,0,0,257,0, NULL), -- Archmage Celindra
+(37858,0,50331648,0,0, NULL), -- Razorscale Image
+(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
+(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
+(29499,0,0,257,0, NULL), -- Bartram Haller
+(31228,0,0,1,0, NULL), -- Grove Walker
+(33778,0,1,1,0, NULL), -- Tournament Hippogryph
+(34244,0,0,1,0, NULL), -- Jean Pierre Poulain
+(31236,0,0,1,0, NULL), -- Dappled Stag
+(29631,0,0,1,0, NULL), -- Awilo Lon'gomba
+(32692,0,0,257,0, NULL), -- Arcanist Alec
+(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
+(30352,0,0,256,0, NULL), -- Skybreaker Marine
+(31085,0,0,1,0, NULL), -- Sky-Reaver Klum
+(30755,0,0,256,0, NULL), -- Kor'kron Reaver
+(31081,0,0,1,0, NULL), -- Officer Van Rossem
+(28160,0,0,257,0, NULL), -- Archmage Pentarus
+(28674,0,0,257,0, NULL), -- Aludane Whitecloud
+(31031,0,0,1,69, NULL), -- Misensi
+(31238,27525,0,257,0, NULL), -- Hira Snowdawn
+(29238,0,0,1,0, NULL), -- Scourge Haunt
+(31229,0,0,1,0, NULL), -- Ancient Watcher
+(32596,0,0,257,0, NULL), -- Dalaran Visitor
+(32602,25833,0,257,0, NULL), -- Dalaran Visitor
+(32601,22471,0,257,0, NULL), -- Dalaran Visitor
+(32415,0,0,1,0, NULL), -- Hamaka
+(32419,0,0,1,0, NULL), -- Umbiwa
+(32418,0,0,1,0, NULL), -- Abohba
+(32253,0,0,2,0, NULL), -- Kyunghee
+(32412,0,0,1,0, NULL), -- Mato
+(32732,0,0,257,0, NULL), -- Dorfus Alphamage
+(31439,0,0,1,0, NULL), -- Archmage Timear
+(35826,0,1,1,0, NULL), -- Kaye Toogie
+(32428,0,0,1,0, NULL), -- Underbelly Rat
+(36670,0,0,1,0, NULL), -- Magister Hathorel
+(32251,0,0,2,0, NULL), -- Shokavis
+(32252,0,0,2,0, NULL), -- Wanathan
+(32420,0,0,1,10, NULL), -- Mimbihi
+(30659,0,0,1,333, NULL), -- Violet Hold Guard
+(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
+(28991,0,0,257,0, NULL), -- Valaden Silverblade
+(32470,0,0,1,0, NULL), -- Sewer Frog
+(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
+(29497,0,0,257,0, NULL), -- Walther Whiteford
+(29325,0,0,1,379, NULL), -- Torgo the Younger
+(31080,0,0,1,0, NULL), -- Warden Alturas
+(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
+(28742,0,0,257,0, NULL), -- Marcia Chase
+(29496,0,0,257,0, NULL); -- Kerta the Bold
+
+-- Template updates for gameobject 
+UPDATE `gameobject_template` SET `faction`=0 WHERE `entry`=35591; -- Fishing Bobber
diff --git a/sql/updates/world/2011_03_05_5_creatures.sql b/sql/updates/world/2011_03_05_5_creatures.sql
deleted file mode 100644
index 6eb520e6f0a..00000000000
--- a/sql/updates/world/2011_03_05_5_creatures.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Dalaran Violet Citadel/Purple Parlor - npc scripts
-SET @CGuid = 151893; -- Set by TDB team
-
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32739; -- Baroness Zildjia
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32736; -- Scribe Whitman
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32741; -- Conjurer Weinhaus
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32631; -- Alfred Copperworth
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32734; -- Arcanist Ginsberg
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32735; -- Alchemist Burroughs
-
-DELETE FROM `creature` WHERE `id`=32741; -- Conjurer Weinhaus
-INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
-(@CGuid+0,32741,571,1,1,0,0,5871.94,852.655,846.336,6.21344,300,0,0,1,0,0,0,0,0,0);
-DELETE FROM `creature_template_addon` WHERE `entry` IN (31848,32287,32739,32736,32631,32737,32734,32735);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(31848,0,0,1,0, NULL), -- Zidormi
-(32287,0,0,257,0, NULL), -- Archmage Alvareaux
-(32739,0,0,257,0, NULL), -- Baroness Zildjia
-(32736,0,0,257,0, NULL), -- Scribe Whitman
-(32631,0,0,1,0, NULL), -- Alfred Copperworth
-(32737,0,0,257,0, NULL), -- Archmage John Nicholas
-(32734,0,0,257,0, NULL), -- Arcanist Ginsberg
-(32735,0,0,257,0, NULL); -- Alchemist Burroughs
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27756; -- Zidormi
-UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27886; -- Archmage Alvareaux
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28176; -- Baroness Zildjia
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28179; -- Scribe Whitman
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28119; -- Alfred Copperworth
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28174; -- Archmage John Nicholas
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28173; -- Arcanist Ginsberg
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28172; -- Alchemist Burroughs
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
-
--- Add teleport to gossip option "Teleport me to Caverns of Time." - Zidormi
-UPDATE `gossip_menu_option` SET `action_script_id`=10131 WHERE `menu_id`=10131 AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=10131;
-INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
-(10131,0,6,1,0,0,-8167.24,-4766.05,33.8599,1.74123);
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10131 AND `SourceEntry`=0;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,10131,0,0,27,65,3,0,0, '', 'Zidormi - Teleport to CoT level restriction'); -- Zidormi
-
--- Talk events for Baroness Zildjia, Scribe Whitman and Conjurer Weinhaus
-DELETE FROM `creature_text` WHERE `entry` IN (32739,32736,32741) AND `groupid`=0;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(32739,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
-(32739,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
-(32736,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Scribe Whitman'), -- Scribe Whitman
-(32736,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Scribe Whitman'), -- Scribe Whitman
-(32741,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Conjurer Weinhaus'), -- Conjurer Weinhaus
-(32741,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Conjurer Weinhaus'); -- Conjurer Weinhaus
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32739,32736,32741,32734,32735) AND `source_type`=0;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(32739,0,0,0,1,0,100,0,0,0,420000,1000000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Baroness Zildjia: Say rand text every 7-14 minutes'), -- Baroness Zildjia
-(32736,0,0,0,1,0,100,0,0,0,300000,840000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scribe Whitman: Say rand text every 5-14 minutes'), -- Scribe Whitman
-(32741,0,0,0,1,0,100,0,0,0,400000,520000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Conjurer Weinhaus: Say rand text every 5-7 minutes'), -- Conjurer Weinhaus
-(32734,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Arcanist Ginsberg: Random emote every 5-30 seconds'), -- Arcanist Ginsberg
-(32735,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Alchemist Burroughs: Random emote every 5-30 seconds'); -- Alchemist Burroughs
diff --git a/sql/updates/world/2011_03_05_5_world_creatures.sql b/sql/updates/world/2011_03_05_5_world_creatures.sql
new file mode 100644
index 00000000000..6eb520e6f0a
--- /dev/null
+++ b/sql/updates/world/2011_03_05_5_world_creatures.sql
@@ -0,0 +1,58 @@
+-- Dalaran Violet Citadel/Purple Parlor - npc scripts
+SET @CGuid = 151893; -- Set by TDB team
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32739; -- Baroness Zildjia
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32736; -- Scribe Whitman
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32741; -- Conjurer Weinhaus
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32631; -- Alfred Copperworth
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32734; -- Arcanist Ginsberg
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32735; -- Alchemist Burroughs
+
+DELETE FROM `creature` WHERE `id`=32741; -- Conjurer Weinhaus
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@CGuid+0,32741,571,1,1,0,0,5871.94,852.655,846.336,6.21344,300,0,0,1,0,0,0,0,0,0);
+DELETE FROM `creature_template_addon` WHERE `entry` IN (31848,32287,32739,32736,32631,32737,32734,32735);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(31848,0,0,1,0, NULL), -- Zidormi
+(32287,0,0,257,0, NULL), -- Archmage Alvareaux
+(32739,0,0,257,0, NULL), -- Baroness Zildjia
+(32736,0,0,257,0, NULL), -- Scribe Whitman
+(32631,0,0,1,0, NULL), -- Alfred Copperworth
+(32737,0,0,257,0, NULL), -- Archmage John Nicholas
+(32734,0,0,257,0, NULL), -- Arcanist Ginsberg
+(32735,0,0,257,0, NULL); -- Alchemist Burroughs
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27756; -- Zidormi
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27886; -- Archmage Alvareaux
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28176; -- Baroness Zildjia
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28179; -- Scribe Whitman
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28119; -- Alfred Copperworth
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28174; -- Archmage John Nicholas
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28173; -- Arcanist Ginsberg
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28172; -- Alchemist Burroughs
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
+
+-- Add teleport to gossip option "Teleport me to Caverns of Time." - Zidormi
+UPDATE `gossip_menu_option` SET `action_script_id`=10131 WHERE `menu_id`=10131 AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=10131;
+INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(10131,0,6,1,0,0,-8167.24,-4766.05,33.8599,1.74123);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10131 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,10131,0,0,27,65,3,0,0, '', 'Zidormi - Teleport to CoT level restriction'); -- Zidormi
+
+-- Talk events for Baroness Zildjia, Scribe Whitman and Conjurer Weinhaus
+DELETE FROM `creature_text` WHERE `entry` IN (32739,32736,32741) AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(32739,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
+(32739,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
+(32736,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Scribe Whitman'), -- Scribe Whitman
+(32736,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Scribe Whitman'), -- Scribe Whitman
+(32741,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Conjurer Weinhaus'), -- Conjurer Weinhaus
+(32741,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Conjurer Weinhaus'); -- Conjurer Weinhaus
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32739,32736,32741,32734,32735) AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(32739,0,0,0,1,0,100,0,0,0,420000,1000000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Baroness Zildjia: Say rand text every 7-14 minutes'), -- Baroness Zildjia
+(32736,0,0,0,1,0,100,0,0,0,300000,840000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scribe Whitman: Say rand text every 5-14 minutes'), -- Scribe Whitman
+(32741,0,0,0,1,0,100,0,0,0,400000,520000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Conjurer Weinhaus: Say rand text every 5-7 minutes'), -- Conjurer Weinhaus
+(32734,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Arcanist Ginsberg: Random emote every 5-30 seconds'), -- Arcanist Ginsberg
+(32735,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Alchemist Burroughs: Random emote every 5-30 seconds'); -- Alchemist Burroughs
-- 
cgit v1.2.3