mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-13 09:17:18 +00:00
fix(Core/BattlegroundAV): Add Hallow's End decorations to Alterac Valley (#20317)
This commit is contained in:
sudlud
@@ -1328,6 +1328,27 @@ bool BattlegroundAV::SetupBattleground()
|
||||
return false;
|
||||
}
|
||||
|
||||
// Hallow's End decorations
|
||||
if (IsHolidayActive(HOLIDAY_HALLOWS_END))
|
||||
for (uint16 i = 0; i <= (BG_AV_OBJECT_HALLOWS_END_MAX - BG_AV_OBJECT_HALLOWS_END_MIN); i++)
|
||||
{
|
||||
if (!AddObject(BG_AV_OBJECT_HALLOWS_END_MIN + i,
|
||||
std::get<0>(BG_AV_HallowsEndObjectPos[i]),
|
||||
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionX(),
|
||||
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionY(),
|
||||
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionZ(),
|
||||
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetOrientation(),
|
||||
std::get<2>(BG_AV_HallowsEndObjectPos[i])[0],
|
||||
std::get<2>(BG_AV_HallowsEndObjectPos[i])[1],
|
||||
std::get<2>(BG_AV_HallowsEndObjectPos[i])[2],
|
||||
std::get<2>(BG_AV_HallowsEndObjectPos[i])[3],
|
||||
RESPAWN_ONE_DAY))
|
||||
{
|
||||
LOG_ERROR("bg.battleground", "BatteGroundAV: Failed to spawn some object Battleground not created!11.{}", i);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Generic gameobjects
|
||||
for (uint16 i = 0; i <= (BG_AV_OBJECT_GENERIC_MAX - BG_AV_OBJECT_GENERIC_MIN); i++)
|
||||
{
|
||||
@@ -1403,6 +1424,11 @@ bool BattlegroundAV::SetupBattleground()
|
||||
for (i = BG_AV_OBJECT_HANDPACKED_SNOWDRIFT_MIN ; i <= BG_AV_OBJECT_HANDPACKED_SNOWDRIFT_MAX; i++)
|
||||
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
|
||||
|
||||
// Hallow's End decorations
|
||||
if (IsHolidayActive(HOLIDAY_HALLOWS_END))
|
||||
for (uint16 i = BG_AV_OBJECT_HALLOWS_END_MIN; i <= BG_AV_OBJECT_HALLOWS_END_MAX; i++)
|
||||
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
|
||||
|
||||
// Generic gameobjects
|
||||
for (uint16 i = BG_AV_OBJECT_GENERIC_MIN; i <= BG_AV_OBJECT_GENERIC_MAX; i++)
|
||||
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
|
||||
|
||||
@@ -326,8 +326,10 @@ enum BG_AV_ObjectTypes
|
||||
BG_AV_OBJECT_STORMPIKE_BANNER = 248,
|
||||
BG_AV_OBJECT_GENERIC_MIN = 249,
|
||||
BG_AV_OBJECT_GENERIC_MAX = 323,
|
||||
BG_AV_OBJECT_HALLOWS_END_MIN = 324,
|
||||
BG_AV_OBJECT_HALLOWS_END_MAX = 403,
|
||||
|
||||
BG_AV_OBJECT_MAX = 324
|
||||
BG_AV_OBJECT_MAX = 404
|
||||
};
|
||||
|
||||
enum BG_AV_OBJECTS
|
||||
@@ -658,6 +660,96 @@ std::tuple<uint32, Position, std::array<float, 4>> const BG_AV_GenericObjectPos[
|
||||
{ 179438, { -1181.10f, -370.747f, 53.6246f, 2.68781f }, { 0.0f, 0.0f, 0.974370f, 0.224951f } }, // 46248
|
||||
};
|
||||
|
||||
// GO template ID, Position, rotation0-3, VerifiedBuild
|
||||
std::tuple<uint32, Position, std::array<float, 4>> const BG_AV_HallowsEndObjectPos[BG_AV_OBJECT_HALLOWS_END_MAX - BG_AV_OBJECT_HALLOWS_END_MIN + 1] =
|
||||
{
|
||||
// G_Pumpkin_01
|
||||
{ 180405, { -1158.97f, -357.826f, 52.0172f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
|
||||
{ 180405, { -126.302f, -453.835f, 36.749f, 1.97222f }, { 0.0f, 0.0f, 0.833885f, 0.551938f } }, // 46248
|
||||
{ 180405, { -1305.91f, -299.92f, 92.6384f, 3.85718f }, { 0.0f, 0.0f, -0.936671f, 0.35021f } }, // 46248
|
||||
{ 180405, { -1357.74f, -283.203f, 95.7139f, 1.309f }, { 0.0f, 0.0f, 0.608761f, 0.793354f } }, // 46248
|
||||
{ 180405, { -500.524f, -192.561f, 57.4784f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
|
||||
{ 180405, { -766.615f, -343.542f, 67.8594f, 2.32129f }, { 0.0f, 0.0f, 0.91706f, 0.39875f } }, // 46248
|
||||
{ 180405, { 14.5434f, -288.689f, 18.6031f, 1.309f }, { 0.0f, 0.0f, 0.608761f, 0.793354f } }, // 46248
|
||||
{ 180405, { 15.1771f, -417.266f, 45.4566f, 4.64258f }, { 0.0f, 0.0f, -0.731354f, 0.681998f } }, // 46248
|
||||
{ 180405, { 233.097f, -339.278f, 45.7862f, 1.18682f }, { 0.0f, 0.0f, 0.559193f, 0.829038f } }, // 46248
|
||||
{ 180405, { 587.37f, -82.283f, 48.2967f, 2.32129f }, { 0.0f, 0.0f, 0.91706f, 0.39875f } }, // 46248
|
||||
{ 180405, { 607.686f, -18.3559f, 49.127f, 0.837757f }, { 0.0f, 0.0f, 0.406736f, 0.913546f } }, // 46248
|
||||
{ 180405, { 615.03f, -192.127f, 41.8927f, 0.59341f }, { 0.0f, 0.0f, 0.292371f, 0.956305f } }, // 46248
|
||||
{ 180405, { 629.882f, -153.54f, 42.6296f, 0.558504f }, { 0.0f, 0.0f, 0.275637f, 0.961262f } }, // 46248
|
||||
{ 180405, { 644.681f, -121.622f, 53.0553f, 3.50812f }, { 0.0f, 0.0f, -0.983254f, 0.182238f } }, // 46248
|
||||
{ 180405, { 646.655f, -265.535f, 39.2146f, 0.279252f }, { 0.0f, 0.0f, 0.139173f, 0.990268f } }, // 46248
|
||||
{ 180405, { 666.656f, -16.0868f, 53.9853f, 5.81195f }, { 0.0f, 0.0f, -0.233445f, 0.97237f } }, // 46248
|
||||
// G_Pumpkin_02
|
||||
{ 180406, { -115.708f, -559.182f, 46.4159f, 3.3685f }, { 0.0f, 0.0f, -0.993571f, 0.113208f } }, // 46248
|
||||
{ 180406, { -1208.5f, -248.34f, 73.0666f, 1.6057f }, { 0.0f, 0.0f, 0.719339f, 0.694659f } }, // 46248
|
||||
{ 180406, { -1227.88f, -372.741f, 57.9504f, 2.51327f }, { 0.0f, 0.0f, 0.951056f, 0.309017f } }, // 46248
|
||||
{ 180406, { -1315.84f, -266.819f, 91.5945f, 6.14356f }, { 0.0f, 0.0f, -0.0697556f, 0.997564f } }, // 46248
|
||||
{ 180406, { -132.559f, -469.016f, 36.7525f, 1.53589f }, { 0.0f, 0.0f, 0.694658f, 0.71934f } }, // 46248
|
||||
{ 180406, { -1343.9f, -278.906f, 95.8878f, 0.157079f }, { 0.0f, 0.0f, 0.0784588f, 0.996917f } }, // 46248
|
||||
{ 180406, { -1359.55f, -275.984f, 97.4804f, 1.25664f }, { 0.0f, 0.0f, 0.587785f, 0.809017f } }, // 46248
|
||||
{ 180406, { -494.535f, -177.293f, 57.4655f, 0.820303f }, { 0.0f, 0.0f, 0.398748f, 0.91706f } }, // 46248
|
||||
{ 180406, { -563.554f, -277.615f, 51.8459f, 1.25664f }, { 0.0f, 0.0f, 0.587785f, 0.809017f } }, // 46248
|
||||
{ 180406, { 11.2743f, -309.234f, 18.5687f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
|
||||
{ 180406, { 226.415f, -343.573f, 52.7243f, 2.65289f }, { 0.0f, 0.0f, 0.970295f, 0.241925f } }, // 46248
|
||||
{ 180406, { 4.625f, -287.089f, 18.9285f, 1.53589f }, { 0.0f, 0.0f, 0.694658f, 0.71934f } }, // 46248
|
||||
{ 180406, { 580.425f, -67.8611f, 48.2671f, 1.79769f }, { 0.0f, 0.0f, 0.782608f, 0.622515f } }, // 46248
|
||||
{ 180406, { 602.411f, -20.1337f, 49.127f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
|
||||
{ 180406, { 609.092f, -156.634f, 42.63f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
|
||||
{ 180406, { 626.033f, -268.701f, 39.2121f, 0.471238f }, { 0.0f, 0.0f, 0.233445f, 0.97237f } }, // 46248
|
||||
{ 180406, { 640.854f, -230.306f, 40.6572f, 0.349065f }, { 0.0f, 0.0f, 0.173648f, 0.984808f } }, // 46248
|
||||
{ 180406, { 657.406f, -19.0451f, 53.6367f, 5.70723f }, { 0.0f, 0.0f, -0.284015f, 0.95882f } }, // 46248
|
||||
{ 180406, { 659.373f, -113.127f, 59.9997f, 4.85202f }, { 0.0f, 0.0f, -0.656058f, 0.75471f } }, // 46248
|
||||
{ 180406, { 672.715f, -36.0156f, 53.9853f, 5.00909f }, { 0.0f, 0.0f, -0.594823f, 0.803857f } }, // 46248
|
||||
// G_Pumpkin_03
|
||||
{ 180407, { -1160.13f, -348.217f, 52.0004f, 1.8675f }, { 0.0f, 0.0f, 0.803857f, 0.594823f } }, // 46248
|
||||
{ 180407, { -119.587f, -457.271f, 29.7838f, 1.71042f }, { 0.0f, 0.0f, 0.754709f, 0.656059f } }, // 46248
|
||||
{ 180407, { -1209.86f, -258.707f, 72.7768f, 1.8675f }, { 0.0f, 0.0f, 0.803857f, 0.594823f } }, // 46248
|
||||
{ 180407, { -1346.58f, -271.594f, 97.4922f, 0.209439f }, { 0.0f, 0.0f, 0.104528f, 0.994522f } }, // 46248
|
||||
{ 180407, { -1362.37f, -309.545f, 91.7044f, 2.46091f }, { 0.0f, 0.0f, 0.942641f, 0.333808f } }, // 46248
|
||||
{ 180407, { -556.349f, -269.62f, 52.3396f, 0.90757f }, { 0.0f, 0.0f, 0.438371f, 0.898794f } }, // 46248
|
||||
{ 180407, { -756.531f, -349.429f, 67.5058f, 3.47321f }, { 0.0f, 0.0f, -0.986285f, 0.16505f } }, // 46248
|
||||
{ 180407, { 1.51215f, -307.455f, 18.9285f, 2.14675f }, { 0.0f, 0.0f, 0.878817f, 0.47716f } }, // 46248
|
||||
{ 180407, { 236.859f, -356.431f, 52.7499f, 2.26893f }, { 0.0f, 0.0f, 0.906307f, 0.422619f } }, // 46248
|
||||
{ 180407, { 587.264f, -64.75f, 41.3224f, 1.71042f }, { 0.0f, 0.0f, 0.754709f, 0.656059f } }, // 46248
|
||||
{ 180407, { 621.241f, -233.352f, 40.6083f, 0.663223f }, { 0.0f, 0.0f, 0.325567f, 0.945519f } }, // 46248
|
||||
{ 180407, { 634.472f, -189.106f, 41.8665f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
|
||||
{ 180407, { 650.7f, -126.259f, 59.9983f, 3.94445f }, { 0.0f, 0.0f, -0.920505f, 0.390732f } }, // 46248
|
||||
{ 180407, { 663.257f, -38.8993f, 53.6307f, 4.92183f }, { 0.0f, 0.0f, -0.62932f, 0.777146f } }, // 46248
|
||||
// Bat01
|
||||
{ 180426, { -1329.83f, -300.214f, 107.965f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { -1332.54f, -294.962f, 117.904f, 1.51844f }, { 0.0f, 0.0f, 0.688354f, 0.725374f } }, // 46248
|
||||
{ 180426, { -1336.12f, -293.71f, 109.14f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { -1338.41f, -299.877f, 111.3f, 0.767944f }, { 0.0f, 0.0f, 0.374606f, 0.927184f } }, // 46248
|
||||
{ 180426, { -247.924f, -289.095f, 43.7022f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { -250.307f, -294.67f, 51.5083f, 1.51844f }, { 0.0f, 0.0f, 0.688354f, 0.725374f } }, // 46248
|
||||
{ 180426, { -255.208f, -305.076f, 47.9254f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { -263.672f, -294.012f, 66.9219f, 3.4383f }, { 0.0f, 0.0f, -0.989016f, 0.147811f } }, // 46248
|
||||
{ 180426, { -268.958f, -286.128f, 65.7266f, 5.28835f }, { 0.0f, 0.0f, -0.477159f, 0.878817f } }, // 46248
|
||||
{ 180426, { -269.526f, -278.163f, 65.567f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { -270.384f, -292.399f, 57.8192f, 5.14872f }, { 0.0f, 0.0f, -0.537299f, 0.843392f } }, // 46248
|
||||
{ 180426, { 617.543f, -72.4375f, 61.5847f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
{ 180426, { 622.451f, -62.4271f, 70.3966f, 2.70526f }, { 0.0f, 0.0f, 0.976295f, 0.216442f } }, // 46248
|
||||
{ 180426, { 627.418f, -47.6285f, 58.8142f, 0.890117f }, { 0.0f, 0.0f, 0.430511f, 0.902586f } }, // 46248
|
||||
{ 180426, { 630.523f, -44.9826f, 69.864f, 3.24635f }, { 0.0f, 0.0f, -0.998629f, 0.0523532f } }, // 46248
|
||||
{ 180426, { 632.502f, -67.3333f, 65.444f, 3.14159f }, { 0.0f, 0.0f, -1.0f, 0.0f } }, // 46248
|
||||
{ 180426, { 635.186f, -45.3333f, 55.8426f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
|
||||
// Bat02
|
||||
{ 180427, { -1336.3f, -295.644f, 116.531f, 3.45576f }, { 0.0f, 0.0f, -0.987688f, 0.156436f } }, // 46248
|
||||
{ 180427, { -1338.58f, -296.351f, 117.126f, 4.13643f }, { 0.0f, 0.0f, -0.878817f, 0.47716f } }, // 46248
|
||||
{ 180427, { -1341.88f, -298.439f, 119.023f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
|
||||
{ 180427, { -1347.11f, -291.332f, 110.968f, 3.45576f }, { 0.0f, 0.0f, -0.987688f, 0.156436f } }, // 46248
|
||||
{ 180427, { -258.149f, -300.316f, 52.5291f, 2.80998f }, { 0.0f, 0.0f, 0.986285f, 0.16505f } }, // 46248
|
||||
{ 180427, { -263.734f, -304.363f, 41.6929f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
|
||||
{ 180427, { -265.972f, -290.925f, 73.3895f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
|
||||
{ 180427, { -267.002f, -291.997f, 68.8963f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
|
||||
{ 180427, { -273.811f, -288.575f, 50.9076f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
|
||||
{ 180427, { 618.34f, -55.8924f, 73.4326f, 2.70526f }, { 0.0f, 0.0f, 0.976295f, 0.216442f } }, // 46248
|
||||
{ 180427, { 625.45f, -53.5191f, 60.4743f, 2.74016f }, { 0.0f, 0.0f, 0.979924f, 0.19937f } }, // 46248
|
||||
{ 180427, { 627.179f, -43.5382f, 72.6337f, 2.65289f }, { 0.0f, 0.0f, 0.970295f, 0.241925f } }, // 46248
|
||||
{ 180427, { 636.71f, -62.2118f, 69.4788f, 2.19911f }, { 0.0f, 0.0f, 0.891006f, 0.453991f } }, // 46248
|
||||
};
|
||||
|
||||
const float BG_AV_DoorPositons[2][4] =
|
||||
{
|
||||
{780.487f, -493.024f, 99.9553f, 3.0976f}, //alliance
|
||||
|
||||
Reference in New Issue
Block a user