From 1bbc7fd84cc7a8cb41324603fcda25477e9a6863 Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Sat, 30 Jan 2016 04:23:03 +0100
Subject: DB/Object: Add 2 missing traps on Icc

(cherry picked from commit e249db9777e9914770f59e10838b742ba1b37324)
---
 .../world/2016_04_02_10_world_2016_01_31_32_world_335.sql    | 12 ------------
 .../world/2016_04_02_11_world_2016_01_31_32_world_335.sql    | 12 ++++++++++++
 .../world/2016_04_02_12_world_2016_01_30_01_world.sql        |  6 ++++++
 3 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 sql/updates/world/2016_04_02_10_world_2016_01_31_32_world_335.sql
 create mode 100644 sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql
 create mode 100644 sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql

(limited to 'sql')

diff --git a/sql/updates/world/2016_04_02_10_world_2016_01_31_32_world_335.sql b/sql/updates/world/2016_04_02_10_world_2016_01_31_32_world_335.sql
deleted file mode 100644
index 64b32cb2d89..00000000000
--- a/sql/updates/world/2016_04_02_10_world_2016_01_31_32_world_335.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- Create new gossip_menu_option 3223 for Apothecary Dithers and 3228 for Alchemist Arbington:
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (3223,3228,3229) AND `OptionBroadcastTextID` IN (6516,6517,6518,6519,6531);
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
-(3223,0,0,"What's needed for the cauldron at Felstone Field?",6516,3,131,0,0,0,0,'',0),
-(3223,1,0,"What's needed for the cauldron at Dalson's Tears?",6517,3,131,0,0,0,0,'',0),
-(3223,2,0,"What's needed for the cauldron at the Writhing Haunt?",6518,3,131,0,0,0,0,'',0),
-(3223,3,0,"What's needed for the cauldron at Gahrron's Withering?",6519,3,131,0,0,0,0,'',0),
-(3228,0,0,"What's needed for the cauldron at Felstone Field?",6516,3,131,0,0,0,0,'',0),
-(3228,1,0,"What's needed for the cauldron at Dalson's Tears?",6517,3,131,0,0,0,0,'',0),
-(3228,2,0,"What's needed for the cauldron at the Writhing Haunt?",6518,3,131,0,0,0,0,'',0),
-(3228,3,0,"What's needed for the cauldron at Gahrron's Withering?",6519,3,131,0,0,0,0,'',0),
-(3229,0,0,"I need a Vitreous Focuser.",6531,3,131,0,0,0,0,'',0);
diff --git a/sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql b/sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql
new file mode 100644
index 00000000000..64b32cb2d89
--- /dev/null
+++ b/sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql
@@ -0,0 +1,12 @@
+-- Create new gossip_menu_option 3223 for Apothecary Dithers and 3228 for Alchemist Arbington:
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (3223,3228,3229) AND `OptionBroadcastTextID` IN (6516,6517,6518,6519,6531);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
+(3223,0,0,"What's needed for the cauldron at Felstone Field?",6516,3,131,0,0,0,0,'',0),
+(3223,1,0,"What's needed for the cauldron at Dalson's Tears?",6517,3,131,0,0,0,0,'',0),
+(3223,2,0,"What's needed for the cauldron at the Writhing Haunt?",6518,3,131,0,0,0,0,'',0),
+(3223,3,0,"What's needed for the cauldron at Gahrron's Withering?",6519,3,131,0,0,0,0,'',0),
+(3228,0,0,"What's needed for the cauldron at Felstone Field?",6516,3,131,0,0,0,0,'',0),
+(3228,1,0,"What's needed for the cauldron at Dalson's Tears?",6517,3,131,0,0,0,0,'',0),
+(3228,2,0,"What's needed for the cauldron at the Writhing Haunt?",6518,3,131,0,0,0,0,'',0),
+(3228,3,0,"What's needed for the cauldron at Gahrron's Withering?",6519,3,131,0,0,0,0,'',0),
+(3229,0,0,"I need a Vitreous Focuser.",6531,3,131,0,0,0,0,'',0);
diff --git a/sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql b/sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql
new file mode 100644
index 00000000000..c9405c4ee61
--- /dev/null
+++ b/sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql
@@ -0,0 +1,6 @@
+--
+SET @Guid:=6177;
+DELETE FROM `gameobject` WHERE `guid` IN (@Guid+0, @Guid+1);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(@Guid+0, 201888, 631, 0, 0, 15, 1, 4312.29, 3025.22, 360.518, 2.92954, 0, 0, 0.994384, 0.105829, 604800, 0, 1, 0),
+(@Guid+1, 201889, 631, 0, 0, 15, 1, 4403.27, 3027.19, 360.52, 0.0274907, 0, 0, 0.0137449, 0.999906, 604800, 0, 1, 0);
-- 
cgit v1.2.3