diff options
| -rw-r--r-- | sql/updates/world/master/2022_06_08_00_world.sql | 80 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp | 109 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 35 |
3 files changed, 156 insertions, 68 deletions
diff --git a/sql/updates/world/master/2022_06_08_00_world.sql b/sql/updates/world/master/2022_06_08_00_world.sql new file mode 100644 index 00000000000..50bcf31e777 --- /dev/null +++ b/sql/updates/world/master/2022_06_08_00_world.sql @@ -0,0 +1,80 @@ +UPDATE `gameobject_template` SET `ContentTuningId`=995, `VerifiedBuild`=44015 WHERE `entry` IN (184978, 184966, 184972, 184975); -- Berserk Buff +UPDATE `gameobject_template` SET `ContentTuningId`=995, `VerifiedBuild`=44015 WHERE `entry` IN (184973, 184970, 184976, 184964); -- Speed Buff +UPDATE `gameobject_template` SET `ContentTuningId`=995, `VerifiedBuild`=44015 WHERE `entry` IN (184965, 184974, 184971, 184977); -- Restoration Buff + +SET @OGUID := 400087; + +DELETE FROM `gameobject_addon` WHERE `guid` IN (21515,21542,21541,21516,21510,21517,21512,21523,21531,21530,21544,21535,21528,21536,21533,21538,21537,21532,21539,21540,21547,21545,21534,21529,21546,21513,21519,21521,21520,21518,21514,21543) OR `guid` BETWEEN @OGUID+0 AND @OGUID+3; +DELETE FROM `gameobject` WHERE `guid` IN (21515,21542,21541,21516,21510,21517,21512,21523,21531,21530,21544,21535,21528,21536,21533,21538,21537,21532,21539,21540,21547,21545,21534,21529,21546,21513,21519,21521,21520,21518,21514,21543) OR `guid` BETWEEN @OGUID+0 AND @OGUID+3; + +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `PhaseGroup`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES +(21515, 184873, 566, 0, 0, '0', '0', 0, 2283.712646484375, 1749.2520751953125, 1200.119140625, 1.745326757431030273, 0, 0, 0.766043663024902343, 0.642788589000701904, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair01 (Area: Eye of the Storm - Difficulty: 0) +(21542, 184875, 566, 0, 0, '0', '0', 0, 2297.310546875, 1778.667236328125, 1224.29345703125, 3.996806621551513671, 0, 0, -0.90996074676513671, 0.414694398641586303, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair03 (Area: Eye of the Storm - Difficulty: 0) +(21541, 184874, 566, 0, 0, '0', '0', 0, 2295.9501953125, 1779.92333984375, 1224.29345703125, 3.996806621551513671, 0, 0, -0.90996074676513671, 0.414694398641586303, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair02 (Area: Eye of the Storm - Difficulty: 0) +(21516, 184877, 566, 0, 0, '0', '0', 0, 2268.9521484375, 1745.0325927734375, 1224.29345703125, 0.855210542678833007, 0, 0, 0.414692878723144531, 0.909961462020874023, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair05 (Area: Eye of the Storm - Difficulty: 0) +(21510, 184876, 566, 0, 0, '0', '0', 0, 2267.591796875, 1746.2886962890625, 1224.29345703125, 0.855210542678833007, 0, 0, 0.414692878723144531, 0.909961462020874023, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair04 (Area: Eye of the Storm - Difficulty: 0) +(21517, 184879, 566, 0, 0, '0', '0', 0, 2299.896484375, 1748.97900390625, 1224.29345703125, 2.426007747650146484, 0, 0, 0.936672210693359375, 0.350207358598709106, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair07 (Area: Eye of the Storm - Difficulty: 0) +(21512, 184878, 566, 0, 0, '0', '0', 0, 2298.640380859375, 1747.6185302734375, 1224.29345703125, 2.426007747650146484, 0, 0, 0.936672210693359375, 0.350207358598709106, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair06 (Area: Eye of the Storm - Difficulty: 0) +(21523, 184881, 566, 0, 0, '0', '0', 0, 2265.005859375, 1775.97705078125, 1224.29345703125, 5.567600727081298828, 0, 0, -0.35020732879638671, 0.936672210693359375, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair09 (Area: Eye of the Storm - Difficulty: 0) +(21531, 184880, 566, 0, 0, '0', '0', 0, 2266.261962890625, 1777.33740234375, 1224.29345703125, 5.567600727081298828, 0, 0, -0.35020732879638671, 0.936672210693359375, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair08 (Area: Eye of the Storm - Difficulty: 0) +(21530, 184883, 566, 0, 0, '0', '0', 0, 2264.01123046875, 1762.0145263671875, 1224.2449951171875, 0.052358884364366531, 0, 0, 0.02617645263671875, 0.999657332897186279, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair11 (Area: Eye of the Storm - Difficulty: 0) +(21544, 184882, 566, 0, 0, '0', '0', 0, 2300.44140625, 1765.9197998046875, 1224.2391357421875, 3.996806621551513671, 0, 0, -0.90996074676513671, 0.414694398641586303, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair10 (Area: Eye of the Storm - Difficulty: 0) +(21535, 184885, 566, 0, 0, '0', '0', 0, 2278.968994140625, 1780.69970703125, 1224.27392578125, 4.878195762634277343, 0, 0, -0.64612388610839843, 0.763232588768005371, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair13 (Area: Eye of the Storm - Difficulty: 0) +(21528, 184884, 566, 0, 0, '0', '0', 0, 2264.052734375, 1760.163330078125, 1224.2449951171875, 0.052358884364366531, 0, 0, 0.02617645263671875, 0.999657332897186279, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair12 (Area: Eye of the Storm - Difficulty: 0) +(21536, 184887, 566, 0, 0, '0', '0', 0, 2279.093505859375, 1754.7247314453125, 1224.17236328125, 2.740161895751953125, 0, 0, 0.979924201965332031, 0.199370384216308593, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair15 (Area: Eye of the Storm - Difficulty: 0) +(21533, 184886, 566, 0, 0, '0', '0', 0, 2282.66162109375, 1781.071044921875, 1224.27392578125, 4.625123500823974609, 0, 0, -0.73727703094482421, 0.67559051513671875, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair14 (Area: Eye of the Storm - Difficulty: 0) +(21538, 184889, 566, 0, 0, '0', '0', 0, 2278.6591796875, 1770.80712890625, 1224.17236328125, 3.577930212020874023, 0, 0, -0.97629547119140625, 0.216442063450813293, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair17 (Area: Eye of the Storm - Difficulty: 0) +(21537, 184888, 566, 0, 0, '0', '0', 0, 2276.12255859375, 1759.017578125, 1224.14013671875, 3.577930212020874023, 0, 0, -0.97629547119140625, 0.216442063450813293, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair16 (Area: Eye of the Storm - Difficulty: 0) +(21532, 184891, 566, 0, 0, '0', '0', 0, 2298.650146484375, 1766.4642333984375, 1215.41748046875, 3.45575571060180664, 0, 0, -0.98768806457519531, 0.156436234712600708, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair19 (Area: Eye of the Storm - Difficulty: 0) +(21539, 184890, 566, 0, 0, '0', '0', 0, 2277.237548828125, 1764.28955078125, 1224.126953125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair18 (Area: Eye of the Storm - Difficulty: 0) +(21540, 184893, 566, 0, 0, '0', '0', 0, 2291.0869140625, 1776.7509765625, 1215.41748046875, 4.241153717041015625, 0, 0, -0.85263919830322265, 0.522500097751617431, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair21 (Area: Eye of the Storm - Difficulty: 0) +(21547, 184892, 566, 0, 0, '0', '0', 0, 2296.726806640625, 1771.260498046875, 1215.41748046875, 3.63901376724243164, 0, 0, -0.96923065185546875, 0.246154293417930603, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair20 (Area: Eye of the Storm - Difficulty: 0) +(21545, 184895, 566, 0, 0, '0', '0', 0, 2278.465087890625, 1778.6768798828125, 1215.41748046875, 5.026549339294433593, 0, 0, -0.5877847671508789, 0.809017360210418701, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair23 (Area: Eye of the Storm - Difficulty: 0) +(21534, 184894, 566, 0, 0, '0', '0', 0, 2286.33544921875, 1778.782470703125, 1215.41748046875, 4.424411773681640625, 0, 0, -0.80125331878662109, 0.598325252532958984, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair22 (Area: Eye of the Storm - Difficulty: 0) +(21529, 184897, 566, 0, 0, '0', '0', 0, 2266.25244140625, 1758.49169921875, 1215.41748046875, 0.314158439636230468, 0, 0, 0.156434059143066406, 0.987688362598419189, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair27 (Area: Eye of the Storm - Difficulty: 0) +(21546, 184896, 566, 0, 0, '0', '0', 0, 2273.668701171875, 1776.75341796875, 1215.41748046875, 5.209809303283691406, 0, 0, -0.5112924575805664, 0.859406769275665283, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair24 (Area: Eye of the Storm - Difficulty: 0) +(21513, 184899, 566, 0, 0, '0', '0', 0, 2273.815673828125, 1748.2049560546875, 1215.41748046875, 1.099556446075439453, 0, 0, 0.522498130798339843, 0.852640450000762939, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair29 (Area: Eye of the Storm - Difficulty: 0) +(21519, 184898, 566, 0, 0, '0', '0', 0, 2268.17578125, 1753.695556640625, 1215.41748046875, 0.497418016195297241, 0, 0, 0.246152877807617187, 0.969231009483337402, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair28 (Area: Eye of the Storm - Difficulty: 0) +(21521, 184901, 566, 0, 0, '0', '0', 0, 2286.4375, 1746.2791748046875, 1215.41748046875, 1.884956240653991699, 0, 0, 0.809017181396484375, 0.587784945964813232, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair31 (Area: Eye of the Storm - Difficulty: 0) +(21520, 184900, 566, 0, 0, '0', '0', 0, 2278.567138671875, 1746.173583984375, 1215.41748046875, 1.282817363739013671, 0, 0, 0.598324775695800781, 0.801253676414489746, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair30 (Area: Eye of the Storm - Difficulty: 0) +(21518, 184903, 566, 0, 0, '0', '0', 0, 2296.724365234375, 1753.8424072265625, 1215.41748046875, 2.67034769058227539, 0, 0, 0.972369194030761718, 0.233448356389999389, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair33 (Area: Eye of the Storm - Difficulty: 0) +(21514, 184902, 566, 0, 0, '0', '0', 0, 2291.233642578125, 1748.2025146484375, 1215.41748046875, 2.068215370178222656, 0, 0, 0.859406471252441406, 0.511292934417724609, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair32 (Area: Eye of the Storm - Difficulty: 0) +(21543, 184904, 566, 0, 0, '0', '0', 0, 2298.755615234375, 1758.5938720703125, 1215.41748046875, 2.853604078292846679, 0, 0, 0.989650726318359375, 0.143497169017791748, 7200, 255, 1, 44015), -- Doodad_GeneralMedChair34 (Area: Eye of the Storm - Difficulty: 0) +(@OGUID+0, 245854, 566, 0, 0, '0', '0', 0, 2279.986083984375, 1770.157958984375, 1199.252197265625, 3.198537111282348632, 0, 0, -0.99959468841552734, 0.028468305245041847, 7200, 255, 1, 44015), -- Large Collision Wall (Area: Eye of the Storm - Difficulty: 0) +(@OGUID+1, 245854, 566, 0, 0, '0', '0', 0, 2280.15283203125, 1762.4271240234375, 1200.9840087890625, 1.823413848876953125, 0, 0, 0.79055023193359375, 0.612397193908691406, 7200, 255, 1, 44015), -- Large Collision Wall (Area: Eye of the Storm - Difficulty: 0) +(@OGUID+2, 266830, 566, 0, 0, '0', '0', 0, 2050.345458984375, 1372.0989990234375, 1203.8336181640625, 0, 0, 0, 0, 1, 7200, 255, 1, 44015), -- Collision PC Size (Area: Eye of the Storm - Difficulty: 0) +(@OGUID+3, 266832, 566, 0, 0, '0', '0', 0, 2283.994873046875, 1738.3541259765625, 1196.4007568359375, 4.799515247344970703, 0, 0, -0.67564201354980468, 0.737229883670806884, 7200, 255, 1, 44015); -- Collision PC Size (Area: Eye of the Storm - Difficulty: 0) + +INSERT INTO `gameobject_addon` (`guid`, `parent_rotation0`, `parent_rotation1`, `parent_rotation2`, `parent_rotation3`, `WorldEffectID`, `AIAnimKitID`) VALUES +(21515, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair01 +(21542, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair03 +(21541, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair02 +(21516, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair05 +(21510, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair04 +(21517, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair07 +(21512, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair06 +(21523, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair09 +(21531, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair08 +(21530, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair11 +(21544, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair10 +(21535, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair13 +(21528, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair12 +(21536, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair15 +(21533, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair14 +(21538, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair17 +(21537, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair16 +(21532, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair19 +(21539, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair18 +(21540, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair21 +(21547, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair20 +(21545, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair23 +(21534, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair22 +(21529, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair27 +(21546, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair24 +(21513, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair29 +(21519, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair28 +(21521, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair31 +(21520, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair30 +(21518, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair33 +(21514, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0), -- Doodad_GeneralMedChair32 +(21543, 0, 0, -0.67880076169967651, 0.734322547912597656, 0, 0); -- Doodad_GeneralMedChair34 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 0a0618dbc47..dd80d7fb4d6 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -464,49 +464,49 @@ void BattlegroundEY::HandleAreaTrigger(Player* player, uint32 trigger, bool ente bool BattlegroundEY::SetupBattleground() { // doors - if (!AddObject(BG_EY_OBJECT_DOOR_A, BG_OBJECT_A_DOOR_EY_ENTRY, 2527.6f, 1596.91f, 1262.13f, -3.12414f, -0.173642f, -0.001515f, 0.98477f, -0.008594f, RESPAWN_IMMEDIATELY) - || !AddObject(BG_EY_OBJECT_DOOR_H, BG_OBJECT_H_DOOR_EY_ENTRY, 1803.21f, 1539.49f, 1261.09f, 3.14159f, 0.173648f, 0, 0.984808f, 0, RESPAWN_IMMEDIATELY) + if (!AddObject(BG_EY_OBJECT_DOOR_A, BG_OBJECT_A_DOOR_EY_ENTRY, 2527.59716796875f, 1596.90625f, 1238.4544677734375f, 3.159139871597290039f, 0.173641681671142578f, 0.001514434814453125f, -0.98476982116699218f, 0.008638577535748481f, RESPAWN_IMMEDIATELY) + || !AddObject(BG_EY_OBJECT_DOOR_H, BG_OBJECT_H_DOOR_EY_ENTRY, 1803.2066650390625f, 1539.486083984375f, 1238.4544677734375f, 3.13898324966430664f, 0.173647880554199218, 0.0f, 0.984807014465332031f, 0.001244877814315259f, RESPAWN_IMMEDIATELY) // banners (alliance) - || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2057.46f, 1735.07f, 1187.91f, -0.925024f, 0, 0, 0.446198f, -0.894934f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2032.25f, 1729.53f, 1190.33f, 1.8675f, 0, 0, 0.803857f, 0.594823f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2092.35f, 1775.46f, 1187.08f, -0.401426f, 0, 0, 0.199368f, -0.979925f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2047.19f, 1349.19f, 1189.0f, -1.62316f, 0, 0, 0.725374f, -0.688354f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2074.32f, 1385.78f, 1194.72f, 0.488692f, 0, 0, 0.241922f, 0.970296f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2025.13f, 1386.12f, 1192.74f, 2.3911f, 0, 0, 0.930418f, 0.366501f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2276.8f, 1400.41f, 1196.33f, 2.44346f, 0, 0, 0.939693f, 0.34202f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2305.78f, 1404.56f, 1199.38f, 1.74533f, 0, 0, 0.766044f, 0.642788f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2245.4f, 1366.41f, 1195.28f, 2.21657f, 0, 0, 0.894934f, 0.446198f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2270.84f, 1784.08f, 1186.76f, 2.42601f, 0, 0, 0.936672f, 0.350207f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2269.13f, 1737.7f, 1186.66f, 0.994838f, 0, 0, 0.477159f, 0.878817f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2300.86f, 1741.25f, 1187.7f, -0.785398f, 0, 0, 0.382683f, -0.92388f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2057.47265625f, 1735.109130859375f, 1188.065673828125f, 5.305802345275878906f, 0.0f, 0.0f, -0.46947097778320312f, 0.882947921752929687f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2032.248291015625f, 1729.546875f, 1191.2296142578125f, 1.797688722610473632f, 0.0f, 0.0f, 0.7826080322265625f, 0.622514784336090087f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2092.338623046875f, 1775.4739990234375f, 1187.504150390625f, 5.811946868896484375f, 0.0f, 0.0f, -0.2334451675415039f, 0.972369968891143798f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2047.1910400390625f, 1349.1927490234375f, 1189.0032958984375f, 4.660029888153076171f, 0.0f, 0.0f, -0.72537422180175781f, 0.688354730606079101f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2074.319580078125f, 1385.779541015625f, 1194.7203369140625f, 0.488691210746765136f, 0.0f, 0.0f, 0.241921424865722656f, 0.970295846462249755f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2025.125f, 1386.123291015625f, 1192.7354736328125f, 2.391098499298095703f, 0.0f, 0.0f, 0.930417060852050781f, 0.366502493619918823f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2276.796875f, 1400.407958984375f, 1196.333740234375f, 2.44346022605895996f, 0.0f, 0.0f, 0.939692497253417968f, 0.34202045202255249f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2305.776123046875f, 1404.5572509765625f, 1199.384765625f, 1.745326757431030273f, 0.0f, 0.0f, 0.766043663024902343f, 0.642788589000701904f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2245.395751953125f, 1366.4132080078125f, 1195.27880859375f, 2.216565132141113281f, 0.0f, 0.0f, 0.894933700561523437f, 0.44619917869567871f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_A_BANNER_EY_ENTRY, 2270.8359375f, 1784.080322265625f, 1186.757080078125f, 2.426007747650146484f, 0.0f, 0.0f, 0.936672210693359375f, 0.350207358598709106f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_A_BANNER_EY_ENTRY, 2269.126708984375f, 1737.703125f, 1186.8145751953125f, 0.994837164878845214f, 0.0f, 0.0f, 0.477158546447753906f, 0.878817260265350341f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_A_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_A_BANNER_EY_ENTRY, 2300.85595703125f, 1741.24658203125f, 1187.793212890625f, 5.497788906097412109f, 0.0f, 0.0f, -0.38268280029296875f, 0.923879802227020263f, RESPAWN_ONE_DAY) // banners (horde) - || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2057.46f, 1735.07f, 1187.91f, -0.925024f, 0, 0, 0.446198f, -0.894934f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2032.25f, 1729.53f, 1190.33f, 1.8675f, 0, 0, 0.803857f, 0.594823f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2092.35f, 1775.46f, 1187.08f, -0.401426f, 0, 0, 0.199368f, -0.979925f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2047.19f, 1349.19f, 1189.0f, -1.62316f, 0, 0, 0.725374f, -0.688354f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2074.32f, 1385.78f, 1194.72f, 0.488692f, 0, 0, 0.241922f, 0.970296f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2025.13f, 1386.12f, 1192.74f, 2.3911f, 0, 0, 0.930418f, 0.366501f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2276.8f, 1400.41f, 1196.33f, 2.44346f, 0, 0, 0.939693f, 0.34202f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2305.78f, 1404.56f, 1199.38f, 1.74533f, 0, 0, 0.766044f, 0.642788f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2245.4f, 1366.41f, 1195.28f, 2.21657f, 0, 0, 0.894934f, 0.446198f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2270.84f, 1784.08f, 1186.76f, 2.42601f, 0, 0, 0.936672f, 0.350207f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2269.13f, 1737.7f, 1186.66f, 0.994838f, 0, 0, 0.477159f, 0.878817f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2300.86f, 1741.25f, 1187.7f, -0.785398f, 0, 0, 0.382683f, -0.92388f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2057.45654296875f, 1735.07470703125f, 1187.9063720703125f, 5.35816192626953125f, 0.0f, 0.0f, -0.446197509765625f, 0.894934535026550292f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2032.251708984375f, 1729.532958984375f, 1190.3251953125f, 1.867502212524414062f, 0.0f, 0.0f, 0.803856849670410156f, 0.594822824001312255f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2092.354248046875f, 1775.4583740234375f, 1187.079345703125f, 5.881760597229003906f, 0.0f, 0.0f, -0.19936752319335937f, 0.979924798011779785f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2047.1978759765625f, 1349.1875f, 1188.5650634765625f, 4.625123500823974609f, 0.0f, 0.0f, -0.73727703094482421f, 0.67559051513671875f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2074.3056640625f, 1385.7725830078125f, 1194.4686279296875f, 0.471238493919372558f, 0.0f, 0.0f, 0.233445167541503906f, 0.972369968891143798f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2025.09375f, 1386.12158203125f, 1192.6536865234375f, 2.373644113540649414f, 0.0f, 0.0f, 0.927183151245117187f, 0.37460830807685852f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2276.798583984375f, 1400.4410400390625f, 1196.2200927734375f, 2.495818138122558593f, 0.0f, 0.0f, 0.948323249816894531f, 0.317305892705917358f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2305.763916015625f, 1404.5972900390625f, 1199.3333740234375f, 1.640606880187988281f, 0.0f, 0.0f, 0.731352806091308593f, 0.6819993257522583f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2245.382080078125f, 1366.454833984375f, 1195.1815185546875f, 2.373644113540649414f, 0.0f, 0.0f, 0.927183151245117187f, 0.37460830807685852f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_H_BANNER_EY_ENTRY, 2270.869873046875f, 1784.0989990234375f, 1186.4384765625f, 2.356194972991943359f, 0.0f, 0.0f, 0.923879623413085937f, 0.382683247327804565f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_H_BANNER_EY_ENTRY, 2268.59716796875f, 1737.0191650390625f, 1186.75390625f, 0.942476630210876464f, 0.0f, 0.0f, 0.453989982604980468f, 0.891006767749786376f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_H_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_H_BANNER_EY_ENTRY, 2301.01904296875f, 1741.4930419921875f, 1187.48974609375f, 5.375615119934082031f, 0.0f, 0.0f, -0.4383707046508789f, 0.898794233798980712f, RESPAWN_ONE_DAY) // banners (natural) - || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2057.46f, 1735.07f, 1187.91f, -0.925024f, 0, 0, 0.446198f, -0.894934f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2032.25f, 1729.53f, 1190.33f, 1.8675f, 0, 0, 0.803857f, 0.594823f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2092.35f, 1775.46f, 1187.08f, -0.401426f, 0, 0, 0.199368f, -0.979925f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2047.19f, 1349.19f, 1189.0f, -1.62316f, 0, 0, 0.725374f, -0.688354f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2074.32f, 1385.78f, 1194.72f, 0.488692f, 0, 0, 0.241922f, 0.970296f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2025.13f, 1386.12f, 1192.74f, 2.3911f, 0, 0, 0.930418f, 0.366501f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2276.8f, 1400.41f, 1196.33f, 2.44346f, 0, 0, 0.939693f, 0.34202f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2305.78f, 1404.56f, 1199.38f, 1.74533f, 0, 0, 0.766044f, 0.642788f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2245.4f, 1366.41f, 1195.28f, 2.21657f, 0, 0, 0.894934f, 0.446198f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2270.84f, 1784.08f, 1186.76f, 2.42601f, 0, 0, 0.936672f, 0.350207f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2269.13f, 1737.7f, 1186.66f, 0.994838f, 0, 0, 0.477159f, 0.878817f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2300.86f, 1741.25f, 1187.7f, -0.785398f, 0, 0, 0.382683f, -0.92388f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2057.4931640625f, 1735.111083984375f, 1187.675537109375f, 5.340708732604980468f, 0.0f, 0.0f, -0.45398998260498046f, 0.891006767749786376f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2032.2569580078125f, 1729.5572509765625f, 1191.0802001953125f, 1.797688722610473632f, 0.0f, 0.0f, 0.7826080322265625f, 0.622514784336090087f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_FEL_REAVER_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2092.395751953125f, 1775.451416015625f, 1186.965576171875f, 5.89921426773071289f, 0.0f, 0.0f, -0.19080829620361328f, 0.981627285480499267f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2047.1875f, 1349.1944580078125f, 1188.5731201171875f, 4.642575740814208984f, 0.0f, 0.0f, -0.731353759765625f, 0.681998312473297119f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2074.3212890625f, 1385.76220703125f, 1194.362060546875f, 0.488691210746765136f, 0.0f, 0.0f, 0.241921424865722656f, 0.970295846462249755f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_BLOOD_ELF_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2025.13720703125f, 1386.1336669921875f, 1192.5482177734375f, 2.391098499298095703f, 0.0f, 0.0f, 0.930417060852050781f, 0.366502493619918823f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2276.833251953125f, 1400.4375f, 1196.146728515625f, 2.478367090225219726f, 0.0f, 0.0f, 0.94551849365234375f, 0.325568377971649169f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2305.77783203125f, 1404.5364990234375f, 1199.246337890625f, 1.570795774459838867f, 0.0f, 0.0f, 0.707106590270996093f, 0.707106947898864746f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2245.40966796875f, 1366.4410400390625f, 1195.1107177734375f, 2.356194972991943359f, 0.0f, 0.0f, 0.923879623413085937f, 0.382683247327804565f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_CENTER, BG_OBJECT_N_BANNER_EY_ENTRY, 2270.84033203125f, 1784.1197509765625f, 1186.1473388671875f, 2.303830623626708984f, 0.0f, 0.0f, 0.913544654846191406f, 0.406738430261611938f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_LEFT, BG_OBJECT_N_BANNER_EY_ENTRY, 2268.46533203125f, 1736.8385009765625f, 1186.742919921875f, 0.942476630210876464f, 0.0f, 0.0f, 0.453989982604980468f, 0.891006767749786376f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_RIGHT, BG_OBJECT_N_BANNER_EY_ENTRY, 2300.9931640625f, 1741.5504150390625f, 1187.10693359375f, 5.375615119934082031f, 0.0f, 0.0f, -0.4383707046508789f, 0.898794233798980712f, RESPAWN_ONE_DAY) // flags - || !AddObject(BG_EY_OBJECT_FLAG_NETHERSTORM, BG_OBJECT_FLAG2_EY_ENTRY, 2174.782227f, 1569.054688f, 1160.361938f, -1.448624f, 0, 0, 0.662620f, -0.748956f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_FLAG_NETHERSTORM, BG_OBJECT_FLAG2_EY_ENTRY, 2174.444580078125f, 1569.421875f, 1159.852783203125f, 4.625123500823974609f, 0.0f, 0.0f, -0.73727703094482421f, 0.67559051513671875f, RESPAWN_ONE_DAY) || !AddObject(BG_EY_OBJECT_FLAG_FEL_REAVER, BG_OBJECT_FLAG1_EY_ENTRY, 2044.28f, 1729.68f, 1189.96f, -0.017453f, 0, 0, 0.008727f, -0.999962f, RESPAWN_ONE_DAY) || !AddObject(BG_EY_OBJECT_FLAG_BLOOD_ELF, BG_OBJECT_FLAG1_EY_ENTRY, 2048.83f, 1393.65f, 1194.49f, 0.20944f, 0, 0, 0.104528f, 0.994522f, RESPAWN_ONE_DAY) || !AddObject(BG_EY_OBJECT_FLAG_DRAENEI_RUINS, BG_OBJECT_FLAG1_EY_ENTRY, 2286.56f, 1402.36f, 1197.11f, 3.72381f, 0, 0, 0.957926f, -0.287016f, RESPAWN_ONE_DAY) @@ -516,28 +516,25 @@ bool BattlegroundEY::SetupBattleground() || !AddObject(BG_EY_OBJECT_TOWER_CAP_BLOOD_ELF, BG_OBJECT_BE_TOWER_CAP_EY_ENTRY, 2050.493164f, 1372.235962f, 1194.563477f, 1.710423f, 0, 0, 0.754710f, 0.656059f, RESPAWN_ONE_DAY) || !AddObject(BG_EY_OBJECT_TOWER_CAP_DRAENEI_RUINS, BG_OBJECT_DR_TOWER_CAP_EY_ENTRY, 2301.010498f, 1386.931641f, 1197.183472f, 1.570796f, 0, 0, 0.707107f, 0.707107f, RESPAWN_ONE_DAY) || !AddObject(BG_EY_OBJECT_TOWER_CAP_MAGE_TOWER, BG_OBJECT_HU_TOWER_CAP_EY_ENTRY, 2282.121582f, 1760.006958f, 1189.707153f, 1.919862f, 0, 0, 0.819152f, 0.573576f, RESPAWN_ONE_DAY) -) + // buffs + || !AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER, BG_OBJECT_SPEED_BUFF_FEL_REAVER_EY_ENTRY, 2046.462646484375f, 1749.1666259765625f, 1190.010498046875f, 5.410521507263183593f, 0.0f, 0.0f, -0.42261791229248046f, 0.906307935714721679f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_REGENBUFF_FEL_REAVER, BG_OBJECT_RESTORATION_BUFF_FEL_REAVER_EY_ENTRY, 2046.462646484375f, 1749.1666259765625f, 1190.010498046875f, 5.410521507263183593f, 0.0f, 0.0f, -0.42261791229248046f, 0.906307935714721679f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_BERSERKBUFF_FEL_REAVER, BG_OBJECT_BERSERK_BUFF_FEL_REAVER_EY_ENTRY, 2046.462646484375f, 1749.1666259765625f, 1190.010498046875f, 5.410521507263183593f, 0.0f, 0.0f, -0.42261791229248046f, 0.906307935714721679f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_SPEEDBUFF_BLOOD_ELF, BG_OBJECT_SPEED_BUFF_BLOOD_ELF_EY_ENTRY, 2050.46826171875f, 1372.2020263671875f, 1194.5634765625f, 1.675513744354248046f, 0.0f, 0.0f, 0.743144035339355468f, 0.669131457805633544f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_REGENBUFF_BLOOD_ELF, BG_OBJECT_RESTORATION_BUFF_BLOOD_ELF_EY_ENTRY, 2050.46826171875f, 1372.2020263671875f, 1194.5634765625f, 1.675513744354248046f, 0.0f, 0.0f, 0.743144035339355468f, 0.669131457805633544f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_BERSERKBUFF_BLOOD_ELF, BG_OBJECT_BERSERK_BUFF_BLOOD_ELF_EY_ENTRY, 2050.46826171875f, 1372.2020263671875f, 1194.5634765625f, 1.675513744354248046f, 0.0f, 0.0f, 0.743144035339355468f, 0.669131457805633544f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_SPEEDBUFF_DRAENEI_RUINS, BG_OBJECT_SPEED_BUFF_DRAENEI_RUINS_EY_ENTRY, 2302.4765625f, 1391.244873046875f, 1197.7364501953125f, 1.762782454490661621f, 0.0f, 0.0f, 0.771624565124511718f, 0.636078238487243652f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_REGENBUFF_DRAENEI_RUINS, BG_OBJECT_RESTORATION_BUFF_DRAENEI_RUINS_EY_ENTRY, 2302.4765625f, 1391.244873046875f, 1197.7364501953125f, 1.762782454490661621f, 0.0f, 0.0f, 0.771624565124511718f, 0.636078238487243652f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_BERSERKBUFF_DRAENEI_RUINS, BG_OBJECT_BERSERK_BUFF_DRAENEI_RUINS_EY_ENTRY, 2302.4765625f, 1391.244873046875f, 1197.7364501953125f, 1.762782454490661621f, 0.0f, 0.0f, 0.771624565124511718f, 0.636078238487243652f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_SPEEDBUFF_MAGE_TOWER, BG_OBJECT_SPEED_BUFF_MAGE_TOWER_EY_ENTRY, 2283.7099609375f, 1748.8699951171875f, 1189.7071533203125f, 4.782202720642089843f, 0.0f, 0.0f, -0.68199825286865234f, 0.731353819370269775f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_REGENBUFF_MAGE_TOWER, BG_OBJECT_RESTORATION_BUFF_MAGE_TOWER_EY_ENTRY, 2283.7099609375f, 1748.8699951171875f, 1189.7071533203125f, 4.782202720642089843f, 0.0f, 0.0f, -0.68199825286865234f, 0.731353819370269775f, RESPAWN_ONE_DAY) + || !AddObject(BG_EY_OBJECT_BERSERKBUFF_MAGE_TOWER, BG_OBJECT_BERSERK_BUFF_MAGE_TOWER_EY_ENTRY, 2283.7099609375f, 1748.8699951171875f, 1189.7071533203125f, 4.782202720642089843f, 0.0f, 0.0f, -0.68199825286865234f, 0.731353819370269775f, RESPAWN_ONE_DAY) + ) { TC_LOG_ERROR("sql.sql", "BatteGroundEY: Failed to spawn some objects. The battleground was not created."); return false; } - //buffs - for (int i = 0; i < EY_POINTS_MAX; ++i) - { - AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(m_Points_Trigger[i]); - if (!at) - { - TC_LOG_ERROR("bg.battleground", "BattlegroundEY: Unknown trigger: %u", m_Points_Trigger[i]); - continue; - } - if (!AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3, Buff_Entries[0], at->Pos.X, at->Pos.Y, at->Pos.Z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3 + 1, Buff_Entries[1], at->Pos.X, at->Pos.Y, at->Pos.Z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY) - || !AddObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REAVER + i * 3 + 2, Buff_Entries[2], at->Pos.X, at->Pos.Y, at->Pos.Z, 0.907571f, 0, 0, 0.438371f, 0.898794f, RESPAWN_ONE_DAY) -) - TC_LOG_ERROR("bg.battleground", "BattlegroundEY: Could not spawn Speedbuff Fel Reaver."); - } - WorldSafeLocsEntry const* sg = sObjectMgr->GetWorldSafeLoc(EY_GRAVEYARD_MAIN_ALLIANCE); if (!sg || !AddSpiritGuide(EY_SPIRIT_MAIN_ALLIANCE, sg->Loc.GetPositionX(), sg->Loc.GetPositionY(), sg->Loc.GetPositionZ(), 3.124139f, TEAM_ALLIANCE)) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 5e53904d1bd..a11383c5659 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -98,18 +98,29 @@ enum BG_EY_Spells enum EYBattlegroundObjectEntry { - BG_OBJECT_A_DOOR_EY_ENTRY = 184719, //Alliance door - BG_OBJECT_H_DOOR_EY_ENTRY = 184720, //Horde door - BG_OBJECT_FLAG1_EY_ENTRY = 184493, //Netherstorm flag (generic) - BG_OBJECT_FLAG2_EY_ENTRY = 184141, //Netherstorm flag (flagstand) - BG_OBJECT_FLAG3_EY_ENTRY = 184142, //Netherstorm flag (flagdrop) - BG_OBJECT_A_BANNER_EY_ENTRY = 184381, //Visual Banner (Alliance) - BG_OBJECT_H_BANNER_EY_ENTRY = 184380, //Visual Banner (Horde) - BG_OBJECT_N_BANNER_EY_ENTRY = 184382, //Visual Banner (Neutral) - BG_OBJECT_BE_TOWER_CAP_EY_ENTRY = 184080, //BE Tower Cap Pt - BG_OBJECT_FR_TOWER_CAP_EY_ENTRY = 184081, //Fel Reaver Cap Pt - BG_OBJECT_HU_TOWER_CAP_EY_ENTRY = 184082, //Human Tower Cap Pt - BG_OBJECT_DR_TOWER_CAP_EY_ENTRY = 184083 //Draenei Tower Cap Pt + BG_OBJECT_A_DOOR_EY_ENTRY = 184719, //Alliance door + BG_OBJECT_H_DOOR_EY_ENTRY = 184720, //Horde door + BG_OBJECT_FLAG1_EY_ENTRY = 184493, //Netherstorm flag (generic) + BG_OBJECT_FLAG2_EY_ENTRY = 208977, //Netherstorm flag (flagstand) + BG_OBJECT_A_BANNER_EY_ENTRY = 184381, //Visual Banner (Alliance) + BG_OBJECT_H_BANNER_EY_ENTRY = 184380, //Visual Banner (Horde) + BG_OBJECT_N_BANNER_EY_ENTRY = 184382, //Visual Banner (Neutral) + BG_OBJECT_BE_TOWER_CAP_EY_ENTRY = 184080, //BE Tower Cap Pt + BG_OBJECT_FR_TOWER_CAP_EY_ENTRY = 184081, //Fel Reaver Cap Pt + BG_OBJECT_HU_TOWER_CAP_EY_ENTRY = 184082, //Human Tower Cap Pt + BG_OBJECT_DR_TOWER_CAP_EY_ENTRY = 184083, //Draenei Tower Cap Pt + BG_OBJECT_SPEED_BUFF_FEL_REAVER_EY_ENTRY = 184970, + BG_OBJECT_RESTORATION_BUFF_FEL_REAVER_EY_ENTRY = 184971, + BG_OBJECT_BERSERK_BUFF_FEL_REAVER_EY_ENTRY = 184972, + BG_OBJECT_SPEED_BUFF_BLOOD_ELF_EY_ENTRY = 184964, + BG_OBJECT_RESTORATION_BUFF_BLOOD_ELF_EY_ENTRY = 184965, + BG_OBJECT_BERSERK_BUFF_BLOOD_ELF_EY_ENTRY = 184966, + BG_OBJECT_SPEED_BUFF_DRAENEI_RUINS_EY_ENTRY = 184976, + BG_OBJECT_RESTORATION_BUFF_DRAENEI_RUINS_EY_ENTRY = 184977, + BG_OBJECT_BERSERK_BUFF_DRAENEI_RUINS_EY_ENTRY = 184978, + BG_OBJECT_SPEED_BUFF_MAGE_TOWER_EY_ENTRY = 184973, + BG_OBJECT_RESTORATION_BUFF_MAGE_TOWER_EY_ENTRY = 184974, + BG_OBJECT_BERSERK_BUFF_MAGE_TOWER_EY_ENTRY = 184975, }; enum EYBattlegroundPointsTrigger |