diff options
| -rw-r--r-- | sql/updates/world/2015_09_23_05_world.sql | 9 | ||||
| -rw-r--r-- | sql/updates/world/2015_09_24_00_world.sql | 209 | ||||
| -rw-r--r-- | sql/updates/world/2015_09_24_01_world.sql | 24 | ||||
| -rw-r--r-- | sql/updates/world/2015_09_24_02_world.sql | 19 | ||||
| -rw-r--r-- | sql/updates/world/2015_09_24_03_world.sql | 24 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Grids/GridDefines.h | 1 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 20 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
9 files changed, 308 insertions, 9 deletions
diff --git a/sql/updates/world/2015_09_23_05_world.sql b/sql/updates/world/2015_09_23_05_world.sql new file mode 100644 index 00000000000..1347b79a61b --- /dev/null +++ b/sql/updates/world/2015_09_23_05_world.sql @@ -0,0 +1,9 @@ +-- +UPDATE `creature_formations` SET `point_1`=2, `point_2`=8 WHERE `leaderGUID`=126083 AND `memberGUID`<>126083; +UPDATE `creature_formations` SET `point_1`=1, `point_2`=5 WHERE `leaderGUID`=201700 AND `memberGUID`<>201700; +UPDATE `creature_formations` SET `point_1`=5, `point_2`=11 WHERE `leaderGUID`=202823 AND `memberGUID`<>202823; +UPDATE `creature_formations` SET `point_1`=1, `point_2`=8 WHERE `leaderGUID`=126981 AND `memberGUID`<>126981; +UPDATE `creature_formations` SET `point_1`=3, `point_2`=7 WHERE `leaderGUID`=131931 AND `memberGUID`<>131931; +UPDATE `creature_formations` SET `point_1`=1, `point_2`=5 WHERE `leaderGUID`=131920 AND `memberGUID`<>131920; +UPDATE `creature_formations` SET `point_1`=1, `point_2`=5 WHERE `leaderGUID`=131926 AND `memberGUID`<>131926; +UPDATE `creature_formations` SET `point_1`=1, `point_2`=10 WHERE `leaderGUID`=202231 AND `memberGUID`<>202231; diff --git a/sql/updates/world/2015_09_24_00_world.sql b/sql/updates/world/2015_09_24_00_world.sql new file mode 100644 index 00000000000..5047e4c44b7 --- /dev/null +++ b/sql/updates/world/2015_09_24_00_world.sql @@ -0,0 +1,209 @@ +-- Pathing for Death Knight Captain Entry: 16145 'TDB FORMAT' +SET @NPC := 127640; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2556.952,`position_y`=-3294.904,`position_z`=267.5933 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2556.952,`position_y`=-3294.904,`position_z`=267.5933 WHERE `guid` IN (127685,127686,127656,127657); +DELETE FROM `creature_addon` WHERE `guid` IN (127685,127686,127656,127657); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(127685,@PATH,0,0,1,0, ''), (127686,@PATH,0,0,1,0, ''), (127656,@PATH,0,0,1,0, ''), (127657,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2556.952,-3294.904,267.5933,0,0,0,0,100,0), +(@PATH,2,2556.655,-3273.629,266.7731,0,0,0,0,100,0), +(@PATH,3,2556.505,-3258.446,260.2637,0,0,0,0,100,0), +(@PATH,4,2556.29,-3229.774,245.2207,0,0,0,0,100,0), +(@PATH,5,2555.99,-3205.854,240.5267,0,0,0,0,100,0), +(@PATH,6,2555.881,-3183.735,240.5253,0,0,0,0,100,0), +(@PATH,7,2556.055,-3164.447,240.5253,0,0,0,0,100,0), +(@PATH,8,2556.121,-3141.804,240.5253,0,0,0,0,100,0), +(@PATH,9,2556.055,-3164.447,240.5253,0,0,0,0,100,0), +(@PATH,10,2555.881,-3183.735,240.5253,0,0,0,0,100,0), +(@PATH,11,2555.99,-3205.854,240.5267,0,0,0,0,100,0), +(@PATH,12,2556.29,-3229.774,245.2207,0,0,0,0,100,0), +(@PATH,13,2556.505,-3258.446,260.2637,0,0,0,0,100,0), +(@PATH,14,2556.655,-3273.629,266.7731,0,0,0,0,100,0), +(@PATH,15,2556.952,-3294.904,267.5933,0,0,0,0,100,0), +(@PATH,16,2556.716,-3318.195,267.593,0,0,0,0,100,0), +(@PATH,17,2556.767,-3335.356,267.593,0,0,0,0,100,0), +(@PATH,18,2556.716,-3318.195,267.593,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127640); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127640,127640,0,0,2,0,0), +(127640,127685,3,360,2,8,17), +(127640,127686,3,40,2,8,17), +(127640,127656,3,320,2,8,17), +(127640,127657,3,260,2,8,17); + +-- Pathing for Death Knight Captain Entry: 16145 'TDB FORMAT' +SET @NPC := 127641; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2540.547,`position_y`=-3209.821,`position_z`=240.5256 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2540.547,`position_y`=-3209.821,`position_z`=240.5256 WHERE `guid` IN (127687,127688,127658,127659); +DELETE FROM `creature_addon` WHERE `guid` IN (127687,127688,127658,127659); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(127687,@PATH,0,0,1,0, ''), (127688,@PATH,0,0,1,0, ''), (127658,@PATH,0,0,1,0, ''), (127659,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2540.547,-3209.821,240.5256,0,0,0,0,100,0), +(@PATH,2,2550.174,-3195.296,240.5253,0,0,0,0,100,0), +(@PATH,3,2550.015,-3178.325,240.5252,0,0,0,0,100,0), +(@PATH,4,2542.807,-3161.292,240.5246,0,0,0,0,100,0), +(@PATH,5,2531.76,-3145.814,240.5244,0,0,0,0,100,0), +(@PATH,6,2526.761,-3124.435,240.5252,0,0,0,0,100,0), +(@PATH,7,2535.071,-3107.707,240.5244,0,0,0,0,100,0), +(@PATH,8,2553.146,-3099.002,240.5252,0,0,0,0,100,0), +(@PATH,9,2568.556,-3098.702,240.5253,0,0,0,0,100,0), +(@PATH,10,2586.523,-3091.121,240.5253,0,0,0,0,100,0), +(@PATH,11,2599.675,-3076.474,240.5264,0,0,0,0,100,0), +(@PATH,12,2599.267,-3055.494,240.5239,0,0,0,0,100,0), +(@PATH,13,2618.495,-3035.821,240.5235,0,0,0,0,100,0), +(@PATH,14,2634.81,-3052.702,240.5237,0,0,0,0,100,0), +(@PATH,15,2651.288,-3069.151,240.5216,0,0,0,0,100,0), +(@PATH,16,2628.244,-3086.696,240.5232,0,0,0,0,100,0), +(@PATH,17,2608.684,-3085.287,240.5264,0,0,0,0,100,0), +(@PATH,18,2595.005,-3098.484,240.5253,0,0,0,0,100,0), +(@PATH,19,2587.623,-3116.573,240.5246,0,0,0,0,100,0), +(@PATH,20,2586.39,-3131.935,240.525,0,0,0,0,100,0), +(@PATH,21,2577.873,-3150.335,240.524,0,0,0,0,100,0), +(@PATH,22,2565.028,-3163.529,240.5253,0,0,0,0,100,0), +(@PATH,23,2559.751,-3177.576,240.5253,0,0,0,0,100,0), +(@PATH,24,2559.432,-3195.028,240.5254,0,0,0,0,100,0), +(@PATH,25,2570.551,-3210.158,240.5293,0,0,0,0,100,0), +(@PATH,26,2555.933,-3210.18,240.5274,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127641); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127641,127641,0,0,2,0,0), +(127641,127687,3,360,2,0,0), +(127641,127688,3,40,2,0,0), +(127641,127658,3,320,2,0,0), +(127641,127659,3,260,2,0,0); + +-- Pathing for Death Knight Captain Entry: 16145 'TDB FORMAT' +SET @NPC := 127642; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2781.675,`position_y`=-2973.126,`position_z`=240.5271 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2781.675,`position_y`=-2973.126,`position_z`=240.5271 WHERE `guid` IN (127689,127690,127660,127661); +DELETE FROM `creature_addon` WHERE `guid` IN (127689,127690,127660,127661); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(127689,@PATH,0,0,1,0, ''), (127690,@PATH,0,0,1,0, ''), (127660,@PATH,0,0,1,0, ''), (127661,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2781.675,-2973.126,240.5271,0,0,0,0,100,0), +(@PATH,2,2781.545,-2987.27,240.5265,0,0,0,0,100,0), +(@PATH,3,2781.296,-2999.196,240.5251,0,0,0,0,100,0), +(@PATH,4,2761.818,-2991.876,240.525,0,0,0,0,100,0), +(@PATH,5,2741.577,-2996.512,240.5255,0,0,0,0,100,0), +(@PATH,6,2720.587,-3007.503,240.5255,0,0,0,0,100,0), +(@PATH,7,2702.402,-3013.772,240.5244,0,0,0,0,100,0), +(@PATH,8,2678.602,-3021.83,240.5253,0,0,0,0,100,0), +(@PATH,9,2662.359,-3033.787,240.5253,0,0,0,0,100,0), +(@PATH,10,2656.579,-3044.628,240.5232,0,0,0,0,100,0), +(@PATH,11,2654.518,-3070.607,240.5216,0,0,0,0,100,0), +(@PATH,12,2642.806,-3082.523,240.5241,0,0,0,0,100,0), +(@PATH,13,2625.915,-3067.382,240.5231,0,0,0,0,100,0), +(@PATH,14,2613.159,-3055.652,240.5243,0,0,0,0,100,0), +(@PATH,15,2603.647,-3046.96,240.5242,0,0,0,0,100,0), +(@PATH,16,2613.084,-3036.567,240.5217,0,0,0,0,100,0), +(@PATH,17,2640.296,-3028.944,240.525,0,0,0,0,100,0), +(@PATH,18,2652.006,-3024.45,240.5253,0,0,0,0,100,0), +(@PATH,19,2664.795,-3009.59,240.5253,0,0,0,0,100,0), +(@PATH,20,2670.619,-2990.552,240.5244,0,0,0,0,100,0), +(@PATH,21,2679.347,-2964.029,240.5253,0,0,0,0,100,0), +(@PATH,22,2697.98,-2955.501,240.5241,0,0,0,0,100,0), +(@PATH,23,2719.132,-2962.616,240.5251,0,0,0,0,100,0), +(@PATH,24,2741.907,-2976.874,240.5253,0,0,0,0,100,0), +(@PATH,25,2760.453,-2981.653,240.5253,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127642); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127642,127642,0,0,2,0,0), +(127642,127689,3,360,2,0,0), +(127642,127690,3,40,2,0,0), +(127642,127660,3,320,2,0,0), +(127642,127661,3,260,2,0,0); + +-- Pathing for Death Knight Captain Entry: 16145 'TDB FORMAT' +SET @NPC := 127645; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2584.613,`position_y`=-3100.685,`position_z`=240.5253 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2584.613,`position_y`=-3100.685,`position_z`=240.5253 WHERE `guid` IN (127691,127692,127664,127665); +DELETE FROM `creature_addon` WHERE `guid` IN (127691,127692,127664,127665); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(127691,@PATH,0,0,1,0, ''), (127692,@PATH,0,0,1,0, ''), (127664,@PATH,0,0,1,0, ''), (127665,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2584.613,-3100.685,240.5253,0,0,0,0,100,0), +(@PATH,2,2601.56,-3083.452,240.5258,0,0,0,0,100,0), +(@PATH,3,2629.143,-3055.421,240.5237,0,0,0,0,100,0), +(@PATH,4,2650.178,-3034.592,240.526,0,0,0,0,100,0), +(@PATH,5,2667.962,-3017.14,240.5253,0,0,0,0,100,0), +(@PATH,6,2680.883,-3004.51,240.5252,0,0,0,0,100,0), +(@PATH,7,2699.352,-2986.865,240.5253,0,0,0,0,100,0), +(@PATH,8,2680.883,-3004.51,240.5252,0,0,0,0,100,0), +(@PATH,9,2667.962,-3017.14,240.5253,0,0,0,0,100,0), +(@PATH,10,2650.178,-3034.592,240.526,0,0,0,0,100,0), +(@PATH,11,2629.143,-3055.421,240.5237,0,0,0,0,100,0), +(@PATH,12,2601.56,-3083.452,240.5258,0,0,0,0,100,0), +(@PATH,13,2584.613,-3100.685,240.5253,0,0,0,0,100,0), +(@PATH,14,2570.169,-3114.794,240.5253,0,0,0,0,100,0), +(@PATH,15,2556.747,-3128.429,240.5253,0,0,0,0,100,0), +(@PATH,16,2570.169,-3114.794,240.5253,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127645); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127645,127645,0,0,2,0,0), +(127645,127691,3,360,2,7,15), +(127645,127692,3,40,2,7,15), +(127645,127664,3,320,2,7,15), +(127645,127665,3,260,2,7,15); + +-- Pathing for Death Knight Captain Entry: 16145 'TDB FORMAT' +SET @NPC := 127649; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2871.322,`position_y`=-2985.748,`position_z`=267.593 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, ''); +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2871.322,`position_y`=-2985.748,`position_z`=267.593 WHERE `guid` IN (127701,127702,127670,127671); +DELETE FROM `creature_addon` WHERE `guid` IN (127701,127702,127670,127671); +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES +(127701,@PATH,0,0,1,0, ''), (127702,@PATH,0,0,1,0, ''), (127670,@PATH,0,0,1,0, ''), (127671,@PATH,0,0,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2871.322,-2985.748,267.593,0,0,0,0,100,0), +(@PATH,2,2852.31,-2985.821,267.593,0,0,0,0,100,0), +(@PATH,3,2838.662,-2985.802,264.0277,0,0,0,0,100,0), +(@PATH,4,2807.427,-2985.919,248.8516,0,0,0,0,100,0), +(@PATH,5,2784.644,-2986.206,240.5265,0,0,0,0,100,0), +(@PATH,6,2760.957,-2986.261,240.5249,0,0,0,0,100,0), +(@PATH,7,2735.987,-2986.227,240.5253,0,0,0,0,100,0), +(@PATH,8,2716.594,-2986.268,240.5253,0,0,0,0,100,0), +(@PATH,9,2700.477,-2986.242,240.525,0,0,0,0,100,0), +(@PATH,10,2716.594,-2986.268,240.5253,0,0,0,0,100,0), +(@PATH,11,2735.987,-2986.227,240.5253,0,0,0,0,100,0), +(@PATH,12,2760.708,-2986.261,240.5253,0,0,0,0,100,0), +(@PATH,13,2784.644,-2986.206,240.5265,0,0,0,0,100,0), +(@PATH,14,2807.427,-2985.919,248.8516,0,0,0,0,100,0), +(@PATH,15,2838.662,-2985.802,264.0277,0,0,0,0,100,0), +(@PATH,16,2852.31,-2985.821,267.593,0,0,0,0,100,0), +(@PATH,17,2871.322,-2985.748,267.593,0,0,0,0,100,0), +(@PATH,18,2893.314,-2985.45,267.593,0,0,0,0,100,0), +(@PATH,19,2908.467,-2985.152,267.5937,0,0,0,0,100,0), +(@PATH,20,2893.314,-2985.45,267.593,0,0,0,0,100,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127649); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127649,127649,0,0,2,0,0), +(127649,127701,3,360,2,9,19), +(127649,127702,3,40,2,9,19), +(127649,127670,3,320,2,9,19), +(127649,127671,3,260,2,9,19); diff --git a/sql/updates/world/2015_09_24_01_world.sql b/sql/updates/world/2015_09_24_01_world.sql new file mode 100644 index 00000000000..9bf41b75a70 --- /dev/null +++ b/sql/updates/world/2015_09_24_01_world.sql @@ -0,0 +1,24 @@ +-- +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127640); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127640,127640,0,0,2,0,0), +(127640,127685,3,360,2,0,0), +(127640,127686,3,40,2,0,0), +(127640,127656,3,320,2,0,0), +(127640,127657,3,260,2,0,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127645); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127645,127645,0,0,2,0,0), +(127645,127691,3,360,2,0,0), +(127645,127692,3,40,2,0,0), +(127645,127664,3,320,2,0,0), +(127645,127665,3,260,2,0,0); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127649); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127649,127649,0,0,2,0,0), +(127649,127701,3,360,2,0,0), +(127649,127702,3,40,2,0,0), +(127649,127670,3,320,2,0,0), +(127649,127671,3,260,2,0,0); diff --git a/sql/updates/world/2015_09_24_02_world.sql b/sql/updates/world/2015_09_24_02_world.sql new file mode 100644 index 00000000000..a02d7b25d85 --- /dev/null +++ b/sql/updates/world/2015_09_24_02_world.sql @@ -0,0 +1,19 @@ +-- +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `Entry` IN (29698, 26043); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (29698, 26043) 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 +(29698,0,0,0,4,0,100,0,0,0,0,0,11,54487,0,0,0,0,0,2,0,0,0,0,0,0,0,'Drakuru Raptor - On aggro - Cast Jump Attack'), +(26043,0,0,0,1,0,100,0,2000,8000,8000,15000,11,46400,0,0,0,0,0,1,0,0,0,0,0,0,0,'Steam Burst - OOC - Cast Steam Weapon'); + +UPDATE `creature_equip_template` SET `ItemID1`=21573, `ItemID2`=143 WHERE `creatureid`=27160; +UPDATE `creature_template` SET `InhabitType`=4 WHERE `Entry`=27375; + +DELETE FROM `creature_template_addon` WHERE `entry`= 27268; +INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES (27268,0,0,1,48553); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (13) AND `SourceEntry`=48551; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES +(13, 1, 48551, 0, 31, 3, 27375, 0, 0, '', 'Vengeful Stormhammer only on Risen Gryphon Rider Target', 0); + +DELETE FROM `creature_addon` WHERE `guid`= 86097; +DELETE FROM `waypoint_data` WHERE `id`= 860970; diff --git a/sql/updates/world/2015_09_24_03_world.sql b/sql/updates/world/2015_09_24_03_world.sql new file mode 100644 index 00000000000..ea71a59cf1e --- /dev/null +++ b/sql/updates/world/2015_09_24_03_world.sql @@ -0,0 +1,24 @@ +-- +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127649); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127649,127649,0,0,2,0,0), +(127649,127701,3,360,2,9,19), +(127649,127702,3,40,2,9,19), +(127649,127670,3,320,2,9,19), +(127649,127671,3,260,2,9,19); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127645); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127645,127645,0,0,2,0,0), +(127645,127691,3,360,2,7,15), +(127645,127692,3,40,2,7,15), +(127645,127664,3,320,2,7,15), +(127645,127665,3,260,2,7,15); + +DELETE FROM `creature_formations` WHERE `leaderGUID` IN (127640); +INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`,`point_1`,`point_2`) VALUES +(127640,127640,0,0,2,0,0), +(127640,127685,3,360,2,8,17), +(127640,127686,3,40,2,8,17), +(127640,127656,3,320,2,8,17), +(127640,127657,3,260,2,8,17); diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index b622618de53..f29e896f050 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -227,15 +227,8 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) continue; if (itr->second->point_1) - { if (m_leader->GetCurrentWaypointID() == itr->second->point_1 - 1 || m_leader->GetCurrentWaypointID() == itr->second->point_2 - 1) - { - if (itr->second->follow_angle > float(M_PI)) - itr->second->follow_angle = itr->second->follow_angle - float(M_PI); - else - itr->second->follow_angle = itr->second->follow_angle + float(M_PI); - } - } + itr->second->follow_angle = float(M_PI) * 2 - itr->second->follow_angle; float angle = itr->second->follow_angle; float dist = itr->second->follow_dist; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 3572fff63dd..8eae906ba87 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -20,6 +20,7 @@ #define TRINITY_GRIDDEFINES_H #include "Common.h" +#include "ObjectGuid.h" #include "NGrid.h" #include <cmath> diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 22cc1f1bbd0..b50099b9787 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -678,6 +678,26 @@ void Map::Update(const uint32 t_diff) player->Update(t_diff); VisitNearbyCellsOf(player, grid_object_update, world_object_update); + + // Handle updates for creatures in combat with player and are more than 60 yards away + if (player->IsInCombat()) + { + std::vector<Creature*> updateList; + HostileReference* ref = player->getHostileRefManager().getFirst(); + + while (ref) + { + if (Unit* unit = ref->GetSource()->GetOwner()) + if (unit->ToCreature() && unit->GetMapId() == player->GetMapId() && !unit->IsWithinDistInMap(player, GetVisibilityRange(), false)) + updateList.push_back(unit->ToCreature()); + + ref = ref->next(); + } + + // Process deferred update list for player + for (Creature* c : updateList) + VisitNearbyCellsOf(c, grid_object_update, world_object_update); + } } // non-player active objects, increasing iterator in the loop in case of object removal diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 022c38a6ff0..b4a7e7a4864 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2997,7 +2997,7 @@ AuctionHouseBot.Items.Amount.Orange = 0 AuctionHouseBot.Items.Amount.Yellow = 0 # -# AustionHouseBot.Class.* +# AuctionHouseBot.Class.* # Description: Here you can set the class of items you prefer to be show on AH # These value are sorted by preference, from 0 (disabled) to 10 (max. preference) # Default: Consumable: 6 |