Missed changes on previous commit.

3 files changed, 9 insertions, 18 deletions

diff --git a/Wintergrasp_temp/Spawns.sql b/Wintergrasp_temp/Spawns.sql
index 90840ba4001..72ade18933c 100644
--- a/Wintergrasp_temp/Spawns.sql
+++ b/Wintergrasp_temp/Spawns.sql
@@ -204,8 +204,10 @@ INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equ
 
 -- banners
 SET @OGUID := 281000;
-DELETE FROM `gameobject` WHERE `id` IN (192269,192284,192285,192338,192339,192488,192254,192255,192336,192501,192502);
-DELETE FROM `gameobject` WHERE `id` BETWEEN 192349 AND 192379;
+DELETE FROM `gameobject` WHERE `id` IN (192254,192255,192269,192284,192285,192286,192287,192292,192299,192304,192305,192306,192307,192308,192309,192310,192312,192313,192314,192316,192317,192318,192319,192320,192321,
+                                        192322,192323,192324,192325,192326,192327,192328,192329,192330,192331,192332,192333,192334,192335,192336,192338,192339,192349,192350,192351,192352,192353,192354,192355,192356,
+										192357,192358,192359,192360,192361,192362,192363,192364,192366,192367,192368,192369,192370,192371,192372,192373,192374,192375,192376,192377,192378,192379,192487,192488,192501,
+										192502);
 DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID AND @OGUID+115;
 INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
 -- Fortress Banners "Alliance"
@@ -330,7 +332,7 @@ INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`
 (@OGUID+115,192502,571,1,128,4397.6626,2840.299,429.921661,1.58824873,0,0,0,0,120,0,1);
 
 SET @OGUID := 280000;
-DELETE FROM `gameobject` WHERE `id` IN (192458,192459,192460,192461,192289,192290,192434,192435,192280,192283,192425,192426,192427,192428,192288,192291);
+DELETE FROM `gameobject` WHERE `id` IN (192458,192459,192460,192461,192289,192290,192434,192435,192280,192283,192425,192426,192427,192428,192288,192291,192400,192401,192281,192282);
 INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
 -- The Sunken Ring "Horde"
 (@OGUID+0,192458,571,1,16,4811.4,2441.9,358.207,-2.0333,0,0,0,1,180,0,1),
diff --git a/Wintergrasp_temp/Strings.sql b/Wintergrasp_temp/Strings.sql
index 5be8799aeba..43038cc9fba 100644
--- a/Wintergrasp_temp/Strings.sql
+++ b/Wintergrasp_temp/Strings.sql
@@ -11,7 +11,7 @@
 -- 'You have reached Rank 2: First Lieutenant' Sent to player by raid leader
 
 -- Wintergrasp coreside texts
-DELETE FROM trinity_string WHERE entry BETWEEN 12050 AND 12072;
+DELETE FROM `trinity_string` WHERE `entry` BETWEEN 12050 AND 12072;
 INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`)VALUES
 (12050, '%s has been captured by %s ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (12051, '%s is under attack by %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -38,7 +38,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (12072, 'The Wintergrasp fortress has been captured by %s !', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 -- Wintergrasp script texts
-DELETE FROM `script_texts` WHERE entry BETWEEN -1850500 AND -1850507;
+DELETE FROM `script_texts` WHERE entry BETWEEN -1850507 AND -1850500;
 INSERT INTO `script_texts` (`npc_entry`,`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
 (0, -1850500, 'Guide me to the Fortress Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
 (0, -1850501, 'Guide me to the Sunken Ring Graveyard.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, ''),
diff --git a/Wintergrasp_temp/Template_update.sql b/Wintergrasp_temp/Template_update.sql
index 7cfcac4daa0..c55f86fceef 100644
--- a/Wintergrasp_temp/Template_update.sql
+++ b/Wintergrasp_temp/Template_update.sql
@@ -10,9 +10,9 @@ UPDATE `gameobject_template` SET `faction`=114 WHERE `entry` IN (193096,193097,1
                                                                  193128,193129,193130,193131,193132,193133,193134,193135,193136,193137,193138,193139,193140,193141,193142,193143,193144,193145,
 																 193146,193147,193148,193149,193150,193151,193152,193153,193154,193155,193156,193157,193158,193159,193160,193161,193162,193163,
 																 193164,193165); -- nameless GOs
-																 
+
 UPDATE `creature_template` SET `exp`=0 WHERE `entry`=31841; -- Taunka Spirit Guide
-UPDATE `creature_template` SET `exp`= WHERE `entry`=31842; -- Dwarven Spirit Guide
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=31842; -- Dwarven Spirit Guide
 UPDATE `creature_template` SET `exp`=0 WHERE `entry`=31052; -- Bowyer Randolph
 UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=39172; -- Marshal Magruder
 UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=30488; -- Travis Day
@@ -74,14 +74,3 @@ INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`
 (39173,29261,0,1,0, NULL), -- Champion Ros'slai
 (30740,0,0,257,375, NULL); -- Valiance Expedition Champion
 
--- Wintergrasp creature addon cleanups
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131258 AND 131322;
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131326 AND 131328;
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131350 AND 131353;
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131376 AND 131380;
-DELETE FROM `creature_addon` WHERE `guid`=131392;
-DELETE FROM `creature_addon` WHERE `guid`=131437;
-DELETE FROM `creature_addon` WHERE `guid`=131458;
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131631 AND 131634;
-DELETE FROM `creature_addon` WHERE `guid`=131706;
-DELETE FROM `creature_addon` WHERE `guid` BETWEEN 131727 AND 131731;