2 files changed, 102 insertions, 2 deletions
diff --git a/sql/updates/world/2011_04_17_05_world_creature.sql b/sql/updates/world/2011_04_17_05_world_creature.sql
index 16c5418d6da..9f9ab112ebd 100644
--- a/sql/updates/world/2011_04_17_05_world_creature.sql
+++ b/sql/updates/world/2011_04_17_05_world_creature.sql
@@ -19,14 +19,14 @@ INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equ
 (@GUID+10,29413,571,1,1,0,0,6550.22,-1296.998,395.8197,5.305801,300,0,0,1,0,0,0,0,0,0),
 (@GUID+11,29413,571,1,1,0,0,6562.411,-1279.173,394.7112,4.572762,300,0,0,1,0,0,0,0,0,0),
 (@GUID+12,29413,571,1,1,0,0,6582.667,-1295.584,396.0742,3.769911,300,0,0,1,0,0,0,0,0,0),
-(@GUID+13,29413,571,1,1,0,0,6572.444,-1251.02,397.3442,1.40402,300,0,0,1,0,0,0,0,0,0),
+(@GUID+13,29413,571,1,1,0,0,6572.444,-1251.02 ,397.3442,1.40402,300,0,0,1,0,0,0,0,0,0),
 (@GUID+14,29413,571,1,1,0,0,6554.481,-1243.797,398.5085,4.45059,300,0,0,1,0,0,0,0,0,0),
 (@GUID+15,29413,571,1,1,0,0,6671.676,-1297.581,395.9203,0.1032045,300,0,0,1,0,0,0,0,0,0),
 -- Crystalweb Spitter
 (117781,29412,571,1,1,26223,0,6519.95,-1027.48,433.737,0.175263,300,0,0,11379,0,0,0,0,0,0),
 (117782,29412,571,1,1,26223,0,6742.73,-1543.87,365.316,2.23402,300,0,0,11379,0,0,0,0,0,0),
 (117783,29412,571,1,1,26223,0,6669.02,-1082.85,400.338,5.49205,300,5,0,11379,0,0,1,0,0,0),
-(@GUID+16,0,29412,571,1,1,0,0,6685.524,-1304.507,395.6901,1.574838,300,0,0,1,0,0,0,0,0,0),
+(@GUID+16,29412,571,1,1,0,0,6685.524,-1304.507,395.6901,1.574838,300,0,0,1,0,0,0,0,0,0),
 (@GUID+17,29412,571,1,1,0,0,6585.083,-1121.508,410.5753,5.966588,300,0,0,1,0,0,0,0,0,0),
 (@GUID+18,29412,571,1,1,0,0,6691.913,-1491.667,377.6763,1.820203,300,0,0,1,0,0,0,0,0,0),
 (@GUID+19,29412,571,1,1,0,0,6658.331,-1299.063,396.7297,2.80998,300,0,0,1,0,0,0,0,0,0),
diff --git a/sql/updates/world/2011_04_17_06_creature.sql b/sql/updates/world/2011_04_17_06_creature.sql
new file mode 100644
index 00000000000..76ac9c62d5a
--- /dev/null
+++ b/sql/updates/world/2011_04_17_06_creature.sql
@@ -0,0 +1,100 @@
+SET @GUID := 152098; 
+
+DELETE FROM `creature` WHERE `id` IN (33211,33499,24495,28602,26266,29563,29695,29719,29720,29747,29790,24910);
+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`) VALUES 
+-- Lake Frog
+(@GUID  ,33211,571,1,1,0,0,3714.916,-4303.659,182.632217,5.098984,120,0,0,1,0,0,0),
+(@GUID+1,33211,571,1,1,0,0,3727.9043,-4302.23926,182.257217,3.08221,120,0,0,1,0,0,0),
+(@GUID+2,33211,571,1,1,0,0,3745.24487,-4297.097,182.389908,2.715872,120,0,0,1,0,0,0),
+(@GUID+3,33211,571,1,1,0,0,3756.47559,-4301.28857,182.095047,2.807836,120,0,0,1,0,0,0),
+(@GUID+4,33211,571,1,1,0,0,3771.68848,-4302.969,185.325317,2.31952834,120,0,0,1,0,0,0),
+(@GUID+5,33211,571,1,1,0,0,3772.791,-4310.51367,181.825317,0.8431596,120,0,0,1,0,0,0),
+(@GUID+6,33211,571,1,1,0,0,3775.21948,-4321.11475,180.200317,3.22582984,120,0,0,1,0,0,0),
+(@GUID+7,33211,571,1,1,0,0,3788.88062,-4324.47852,183.075317,5.38701057,120,0,0,1,0,0,0),
+(@GUID+8,33211,571,1,1,0,0,3794.85938,-4332.317,181.450317,1.17659271,120,0,0,1,0,0,0),
+(@GUID+9,33211,571,1,1,0,0,3802.84766,-4337.217,182.431076,6.150771,120,0,0,1,0,0,0),
+(@GUID+10,33211,571,1,1,0,0,3806.70459,-4355.509,181.681076,1.17746329,120,0,0,1,0,0,0),
+(@GUID+11,33211,571,1,1,0,0,3809.69434,-4349.24,182.556076,5.637143,120,0,0,1,0,0,0),
+(@GUID+12,33211,571,1,1,0,0,3813.42139,-4361.893,181.931076,2.17208815,120,0,0,1,0,0,0),
+(@GUID+13,33211,571,1,1,0,0,3814.98438,-4356.101,183.181076,2.89564323,120,0,0,1,0,0,0),
+-- Skelettal Woodcutter
+(@GUID+14,33499,571,1,1,0,0,5396.5166,375.7173,170.753632,2.53072739,120,0,0,1,0,0,0),
+(@GUID+15,33499,571,1,1,0,0,5410.31152,369.325531,167.654877,3.26376557,120,0,0,1,0,0,0),
+(@GUID+16,33499,571,1,1,0,0,5411.861,354.3646,166.12265,5.75958633,120,0,0,1,0,0,0),
+(@GUID+17,33499,571,1,1,0,0,5416.46338,439.1525,170.43544,3.42084527,120,0,0,1,0,0,0),
+(@GUID+18,33499,571,1,1,0,0,5426.99951,440.918182,169.2432,2.565634,120,0,0,1,0,0,0),
+(@GUID+19,33499,571,1,1,0,0,5427.884,360.650848,163.194031,5.078908,120,0,0,1,0,0,0),
+(@GUID+20,33499,571,1,1,0,0,5458.528,424.540039,163.886261,0.2268928,120,0,0,1,0,0,0),
+(@GUID+21,33499,571,1,1,0,0,5469.51074,374.17688,158.1148,4.20624352,120,0,0,1,0,0,0),
+-- Blix Fixwidget
+(@GUID+22,24495,1,1,1,0,0,1174.58008,-4292.92139,21.3573341,6.24827862,120,0,0,1,0,0,0), -- Only during Brewfest!
+-- Death's Hand Acolyte
+(@GUID+23,28602,1,1,1,0,0,-6104.96533,-1243.60107,-143.192078,3.12413931,120,0,0,1,0,0,0),
+(@GUID+24,28602,1,1,1,0,0,-6121.083,-1241.73962,-143.1921,3.19395256,120,0,0,1,0,0,0),
+-- Heigarr the Horrible
+(@GUID+25,26266,571,1,1,0,0,2711.477,4684.87061,2.576662,-2.87749,120,0,0,1,0,0,0), -- Spawns via script???
+-- Injured Icemaw Matriarch
+(@GUID+26,29563,571,1,2,0,0,7335.38135,-2055.097,764.358459,3.36848545,120,0,0,1,0,0,0), -- PHASEMASK = 0x00000002
+-- Tracker Thulin
+(@GUID+27,29695,571,1,1,0,0,7313.95752,-1611.87976,944.595459,1.79768908,120,0,0,1,0,0,0),
+-- Morbid Carcass PHASEMASK '0x00000002'
+(@GUID+28,29719,571,1,2,0,0,8249.877,2766.00684,641.9236,2.84488654,120,0,0,1,0,0,0), 
+(@GUID+29,29719,571,1,2,0,0,8251.455,2788.82275,641.9236,3.159046,120,0,0,1,0,0,0),
+(@GUID+30,29719,571,1,2,0,0,8277.752,2676.89429,689.776733,2.5395987,120,0,0,1,0,0,0),
+(@GUID+31,29719,571,1,2,0,0,8312.651,2687.84644,689.776733,1.71902692,120,0,0,1,0,0,0),
+(@GUID+32,29719,571,1,2,0,0,8333.677,2713.59741,658.5447,1.27409029,120,0,0,1,0,0,0),
+(@GUID+33,29719,571,1,2,0,0,8347.788,2669.8252,689.776733,0.123821385,120,0,0,1,0,0,0),
+(@GUID+34,29719,571,1,2,0,0,8353.299,2769.45532,656.0902,4.17133665,120,0,0,1,0,0,0),
+(@GUID+35,29719,571,1,2,0,0,8373.952,2828.15039,717.741638,2.66342187,120,0,0,1,0,0,0),
+(@GUID+36,29719,571,1,2,0,0,8419.114,2731.20874,656.828064,3.8397243,120,0,0,1,0,0,0),
+(@GUID+37,29719,571,1,2,0,0,8419.519,2697.39771,760.0408,4.81710863,120,0,0,1,0,0,0),
+(@GUID+38,29719,571,1,2,0,0,8424.577,2652.73364,759.9575,1.02128124,120,0,0,1,0,0,0),
+(@GUID+39,29719,571,1,2,0,0,8439.591,2734.11157,759.9575,4.00091362,120,0,0,1,0,0,0),
+(@GUID+40,29719,571,1,2,0,0,8481.104,2684.45435,652.436646,2.75762,120,0,0,1,0,0,0),
+(@GUID+41,29719,571,1,2,0,0,8485.137,2563.694,759.9575,0.482697248,120,0,0,1,0,0,0),
+(@GUID+42,29719,571,1,2,0,0,8551.035,2716.2085,652.3534,0.739110649,120,0,0,1,0,0,0),
+(@GUID+43,29719,571,1,2,0,0,8576.94,2706.49927,652.3534,0.875271261,120,0,0,1,0,0,0),
+(@GUID+44,29719,571,1,2,0,0,8603.393,2743.799,759.9575,2.06062126,120,0,0,1,0,0,0),
+(@GUID+45,29719,571,1,2,0,0,8614.454,2711.10767,652.4367,3.52556515,120,0,0,1,0,0,0),
+(@GUID+46,29719,571,1,2,0,0,8626.026,2682.54761,764.3245,3.37955,120,0,0,1,0,0,0),
+-- Vault Geist PHASEMASK '0x00000002'
+(@GUID+47,29720,571,1,2,0,0,8271.127,2722.98315,647.9443,4.702879,120,0,0,1,0,0,0),
+(@GUID+48,29720,571,1,2,0,0,8313.714,2730.06567,666.274048,1.41371667,120,0,0,1,0,0,0),
+(@GUID+49,29720,571,1,2,0,0,8323.991,2775.6377,655.4387,0.820304751,120,0,0,1,0,0,0),
+(@GUID+50,29720,571,1,2,0,0,8332.92,2771.744,655.195068,4.373434,120,0,0,1,0,0,0),
+(@GUID+51,29720,571,1,2,0,0,8357.752,2723.99731,662.515747,1.15191734,120,0,0,1,0,0,0),
+(@GUID+52,29720,571,1,2,0,0,8404.075,2751.15625,666.435547,3.59537816,120,0,0,1,0,0,0),
+(@GUID+53,29720,571,1,2,0,0,8405.231,2798.09473,717.7043,2.73629141,120,0,0,1,0,0,0),
+(@GUID+54,29720,571,1,2,0,0,8413.143,2643.30151,760.040833,3.281219,120,0,0,1,0,0,0),
+(@GUID+55,29720,571,1,2,0,0,8439.822,2744.45386,759.9607,5.875154,120,0,0,1,0,0,0),
+(@GUID+56,29720,571,1,2,0,0,8477.97,2558.73364,759.9575,5.86126,120,0,0,1,0,0,0),
+(@GUID+57,29720,571,1,2,0,0,8497.8,2665.35474,653.9178,1.16937053,120,0,0,1,0,0,0),
+(@GUID+58,29720,571,1,2,0,0,8503.94,2690.78564,653.9437,2.72271371,120,0,0,1,0,0,0),
+(@GUID+59,29720,571,1,2,0,0,8518.637,2650.9563,653.9734,2.72271371,120,0,0,1,0,0,0),
+(@GUID+60,29720,571,1,2,0,0,8525.105,2553.115,759.9575,2.747424,120,0,0,1,0,0,0),
+(@GUID+61,29720,571,1,2,0,0,8530.889,2679.33374,654.1611,2.72271371,120,0,0,1,0,0,0),
+(@GUID+62,29720,571,1,2,0,0,8534.625,2547.15869,759.9575,0.228721559,120,0,0,1,0,0,0),
+(@GUID+63,29720,571,1,2,0,0,8536.244,2602.14526,652.3534,1.24435687,120,0,0,1,0,0,0),
+(@GUID+64,29720,571,1,2,0,0,8581.542,2581.62085,765.5597,2.29454422,120,0,0,1,0,0,0),
+(@GUID+65,29720,571,1,2,0,0,8603.618,2744.43042,759.9575,5.913211,120,0,0,1,0,0,0),
+(@GUID+66,29720,571,1,2,0,0,8640.634,2686.18237,760.040833,1.2566371,120,0,0,1,0,0,0),
+-- The Ocular (Phase='0x00000002')
+(@GUID+67,29747,571,1,2,0,0,8526.228,2665.08521,1045.03979,2.67035365,120,0,0,1,0,0,0),
+-- The Ocular - Eye of Acherus Exterior Shell
+(@GUID+68,29790,571,1,2,0,0,8526.228,2665.08521,1037.08838,2.67035365,120,0,0,1,0,0,0), 
+-- Captain Ellis 
+(@GUID+69,24910,571,1,1,0,0,101.368256,-3645.39087,21.6450329,4.067803,120,0,0,1,0,0,0);
+
+
+UPDATE creature_template SET `baseattacktime`=2500,`faction_A`=974,`faction_H`=974,`rangeattacktime`= 1069547520,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE entry = 29747;     -- The Ocular
+UPDATE `creature_template` SET `baseattacktime`=2500,`faction_A`=974,`faction_H`=974,`rangeattacktime`=1073804739,`scale`=1,`speed_run`=1,`speed_walk`=1 WHERE entry = 29790; -- The Ocular - Eye of Archerus Exterior Shell
+UPDATE `creature_template` SET `baseattacktime`=1000,`faction_A`=21,`faction_H`=21,`rangeattacktime`= 1055790203,`scale`=1,`speed_run`=1.428571,`speed_walk`=1 WHERE `entry`=29720; -- Vault Geist
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=21,`faction_H`=21,`rangeattacktime`= 1063256064,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE `entry`=29719; -- Morbid Carcass
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=14,`faction_H`=14,`minlevel`=79,`maxlevel`=79,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE `entry`=33499; -- Skelettal Woodcutter
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=1,`maxlevel`=1,`scale`=1,`speed_run`=1,`speed_walk`=1.6 WHERE `entry`= 33211; -- Lake Frog
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=775,`faction_H`=775,`minlevel`=65,`maxlevel`=65,`npcflag`=`npcflag`|1|2|128,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|256|512|32768 WHERE `entry`=24495; -- Blix Fixwidget
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=2080,`faction_H`=2080,`minlevel`=77,`maxlevel`=78,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE `entry`= 28602; -- Death's Hand Acolyte
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=1771,`faction_H`=1771,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.071429,`speed_walk`=1 WHERE `entry`=26266; -- Heigarr the Horrible
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=80,`maxlevel`=80,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE `entry`=29563; -- Injured Icemaw Matriarch
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=1954,`faction_H`=1954,`minlevel`=79,`maxlevel`=79,`scale`=1,`speed_run`=0.9920629,`speed_walk`=1 WHERE entry = 29695; -- Tracker Thulin
+UPDATE creature_template SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`npcflag`=`npcflag`|2,`scale`=1,`speed_run`=1.142857,`speed_walk`=1 WHERE entry = 24910; -- Captain Ellis