josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core:

Browse Source 
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+4 -4
View File
@@ -955,11 +955,11 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
{-910.14f,-229.959f,72.9279f,0.27677f},
{-851.563f,-88.6527f,68.5983f,3.61896f},
//boss
{-848.902f,-92.931f,68.6325f,3.33350},
{-848.902f,-92.931f,68.6325f,3.33350f},
//herald
{-48.459f,-288.802f,55.47f,1.0},
{-48.459f,-288.802f,55.47f,1.0f},
//triggers
{637.083,-32.6603,45.9715,1.14353}, //firstaid_station
{637.083f,-32.6603f,45.9715f,1.14353f}, //firstaid_station
{669.007f,-294.078f,30.2909f,2.77507f}, //stormpike_grave
{77.8013f,-404.7f,46.7549f,-0.872665f}, //stoneheart_grave
{-202.581f,-112.73f,78.4876f,-0.715585f}, //snowfall_grave
@@ -968,7 +968,7 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
{-1402.21f,-307.431f,89.4424f,0.191986f}, //frostwolf_hut
{553.779f,-78.6566f,51.9378f,-1.22173f}, //dunbaldar_south
{674.001f,-143.125f,63.6615f,0.994838f}, //dunbaldar_north
{203.281f,-360.366f,56.3869f,-0.925024}, //icewing_bunker
{203.281f,-360.366f,56.3869f,-0.925024f}, //icewing_bunker
{-152.437f,-441.758f,40.3982f,-1.95477f}, //stoneheart_bunker
{-571.88f,-262.777f,75.0087f,-0.802851f}, //iceblood_tower
{-768.907f,-363.71f,90.8949f,1.07991f}, //tower_point
src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ void BattlegroundBE::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundBE::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),6238.930176,262.963470,0.889519,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),6238.930176f,262.963470f,0.889519f,player->GetOrientation(),false);
return true;
}
src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
+7 -7
View File
@@ -145,7 +145,7 @@ void BattlegroundDS::HandleAreaTrigger(Player *Source, uint32 Trigger)
bool BattlegroundDS::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(), 1299.046, 784.825, 9.338, 2.422, false);
player->TeleportTo(GetMapId(), 1299.046f, 784.825f, 9.338f, 2.422f, false);
return true;
}
@@ -165,14 +165,14 @@ void BattlegroundDS::Reset()
bool BattlegroundDS::SetupBattleground()
{
// gates
if (!AddObject(BG_DS_OBJECT_DOOR_1, BG_DS_OBJECT_TYPE_DOOR_1, 1350.95, 817.2, 20.8096, 3.15, 0, 0, 0.99627, 0.0862864, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_DS_OBJECT_DOOR_2, BG_DS_OBJECT_TYPE_DOOR_2, 1232.65, 764.913, 20.0729, 6.3, 0, 0, 0.0310211, -0.999519, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_DS_OBJECT_DOOR_1, BG_DS_OBJECT_TYPE_DOOR_1, 1350.95f, 817.2f, 20.8096f, 3.15f, 0, 0, 0.99627f, 0.0862864f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_DS_OBJECT_DOOR_2, BG_DS_OBJECT_TYPE_DOOR_2, 1232.65f, 764.913f, 20.0729f, 6.3f, 0, 0, 0.0310211f, -0.999519f, RESPAWN_IMMEDIATELY)
// water
|| !AddObject(BG_DS_OBJECT_WATER_1, BG_DS_OBJECT_TYPE_WATER_1, 1291.56, 790.837, 7.1, 3.14238, 0, 0, 0.694215, -0.719768, 120)
|| !AddObject(BG_DS_OBJECT_WATER_2, BG_DS_OBJECT_TYPE_WATER_2, 1291.56, 790.837, 7.1, 3.14238, 0, 0, 0.694215, -0.719768, 120)
|| !AddObject(BG_DS_OBJECT_WATER_1, BG_DS_OBJECT_TYPE_WATER_1, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120)
|| !AddObject(BG_DS_OBJECT_WATER_2, BG_DS_OBJECT_TYPE_WATER_2, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120)
// buffs
|| !AddObject(BG_DS_OBJECT_BUFF_1, BG_DS_OBJECT_TYPE_BUFF_1, 1291.7, 813.424, 7.11472, 4.64562, 0, 0, 0.730314, -0.683111, 120)
|| !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7, 768.911, 7.11472, 1.55194, 0, 0, 0.700409, 0.713742, 120))
|| !AddObject(BG_DS_OBJECT_BUFF_1, BG_DS_OBJECT_TYPE_BUFF_1, 1291.7f, 813.424f, 7.11472f, 4.64562f, 0, 0, 0.730314f, -0.683111f, 120)
|| !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7f, 768.911f, 7.11472f, 1.55194f, 0, 0, 0.700409f, 0.713742f, 120))
{
sLog.outErrorDb("BatteGroundDS: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
+7 -7
View File
@@ -110,7 +110,7 @@ void BattlegroundNA::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundNA::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),4055.504395,2919.660645,13.611241,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),4055.504395f,2919.660645f,13.611241f,player->GetOrientation(),false);
return true;
}
@@ -151,13 +151,13 @@ void BattlegroundNA::Reset()
bool BattlegroundNA::SetupBattleground()
{
// gates
if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854, 2966.833, 12.6462, -2.648788, 0, 0, 0.9697962, -0.2439165, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179, 2874.97, 12.39171, 0.4928045, 0, 0, 0.2439165, 0.9697962, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709, 2981.777, 10.70117, -2.648788, 0, 0, 0.9697962, -0.2439165, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064, 2858.438, 10.23631, 0.4928045, 0, 0, 0.2439165, 0.9697962, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.6462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179f, 2874.97f, 12.39171f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709f, 2981.777f, 10.70117f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064f, 2858.438f, 10.23631f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_NA_OBJECT_BUFF_1, BG_NA_OBJECT_TYPE_BUFF_1, 4009.189941, 2895.250000, 13.052700, -1.448624, 0, 0, 0.6626201, -0.7489557, 120)
|| !AddObject(BG_NA_OBJECT_BUFF_2, BG_NA_OBJECT_TYPE_BUFF_2, 4103.330078, 2946.350098, 13.051300, -0.06981307, 0, 0, 0.03489945, -0.9993908, 120))
|| !AddObject(BG_NA_OBJECT_BUFF_1, BG_NA_OBJECT_TYPE_BUFF_1, 4009.189941f, 2895.250000f, 13.052700f, -1.448624f, 0, 0, 0.6626201f, -0.7489557f, 120)
|| !AddObject(BG_NA_OBJECT_BUFF_2, BG_NA_OBJECT_TYPE_BUFF_2, 4103.330078f, 2946.350098f, 13.051300f, -0.06981307f, 0, 0, 0.03489945f, -0.9993908f, 120))
{
sLog.outErrorDb("BatteGroundNA: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
+5 -5
View File
@@ -110,7 +110,7 @@ void BattlegroundRL::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundRL::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),1285.810547,1667.896851,39.957642,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),1285.810547f,1667.896851f,39.957642f,player->GetOrientation(),false);
return true;
}
@@ -152,11 +152,11 @@ void BattlegroundRL::Reset()
bool BattlegroundRL::SetupBattleground()
{
// gates
if (!AddObject(BG_RL_OBJECT_DOOR_1, BG_RL_OBJECT_TYPE_DOOR_1, 1293.561, 1601.938, 31.60557, -1.457349, 0, 0, -0.6658813, 0.7460576, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RL_OBJECT_DOOR_2, BG_RL_OBJECT_TYPE_DOOR_2, 1278.648, 1730.557, 31.60557, 1.684245, 0, 0, 0.7460582, 0.6658807, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_RL_OBJECT_DOOR_1, BG_RL_OBJECT_TYPE_DOOR_1, 1293.561f, 1601.938f, 31.60557f, -1.457349f, 0, 0, -0.6658813f, 0.7460576f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RL_OBJECT_DOOR_2, BG_RL_OBJECT_TYPE_DOOR_2, 1278.648f, 1730.557f, 31.60557f, 1.684245f, 0, 0, 0.7460582f, 0.6658807f, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_RL_OBJECT_BUFF_1, BG_RL_OBJECT_TYPE_BUFF_1, 1328.719971, 1632.719971, 36.730400, -1.448624, 0, 0, 0.6626201, -0.7489557, 120)
|| !AddObject(BG_RL_OBJECT_BUFF_2, BG_RL_OBJECT_TYPE_BUFF_2, 1243.300049, 1699.170044, 34.872601, -0.06981307, 0, 0, 0.03489945, -0.9993908, 120))
|| !AddObject(BG_RL_OBJECT_BUFF_1, BG_RL_OBJECT_TYPE_BUFF_1, 1328.719971f, 1632.719971f, 36.730400f, -1.448624f, 0, 0, 0.6626201f, -0.7489557f, 120)
|| !AddObject(BG_RL_OBJECT_BUFF_2, BG_RL_OBJECT_TYPE_BUFF_2, 1243.300049f, 1699.170044f, 34.872601f, -0.06981307f, 0, 0, 0.03489945f, -0.9993908f, 120))
{
sLog.outErrorDb("BatteGroundRL: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+23 -23
View File
@@ -156,7 +156,7 @@ void BattlegroundRV::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundRV::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(), 763.5, -284, 28.276, 2.422, false);
player->TeleportTo(GetMapId(), 763.5f, -284, 28.276f, 2.422f, false);
return true;
}
@@ -194,36 +194,36 @@ void BattlegroundRV::Reset()
bool BattlegroundRV::SetupBattleground()
{
// Fence
if (!AddObject(BG_RV_OBJECT_FENCE_1, BG_RV_OBJECT_TYPE_FENCE_1, 763.432373, -274.058197, 28.276695, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FENCE_2, BG_RV_OBJECT_TYPE_FENCE_2, 763.432373, -294.419464, 28.276684, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_RV_OBJECT_FENCE_1, BG_RV_OBJECT_TYPE_FENCE_1, 763.432373f, -274.058197f, 28.276695f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FENCE_2, BG_RV_OBJECT_TYPE_FENCE_2, 763.432373f, -294.419464f, 28.276684f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// elevators
|| !AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377, -294.535767, 0.505383, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_2, BG_RV_OBJECT_TYPE_ELEVATOR_2, 763.506348, -273.873352, 0.505383, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377f, -294.535767f, 0.505383f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_2, BG_RV_OBJECT_TYPE_ELEVATOR_2, 763.506348f, -273.873352f, 0.505383f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_RV_OBJECT_BUFF_1, BG_RV_OBJECT_TYPE_BUFF_1, 735.551819, -284.794678, 28.276682, 0.034906, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_2, BG_RV_OBJECT_TYPE_BUFF_2, 791.224487, -284.794464, 28.276682, 2.600535, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_1, BG_RV_OBJECT_TYPE_BUFF_1, 735.551819f, -284.794678f, 28.276682f, 0.034906f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_2, BG_RV_OBJECT_TYPE_BUFF_2, 791.224487f, -284.794464f, 28.276682f, 2.600535f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// fire
|| !AddObject(BG_RV_OBJECT_FIRE_1, BG_RV_OBJECT_TYPE_FIRE_1, 743.543457, -283.799469, 28.286655, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_2, BG_RV_OBJECT_TYPE_FIRE_2, 782.971802, -283.799469, 28.286655, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_1, BG_RV_OBJECT_TYPE_FIREDOOR_1, 743.711060, -284.099609, 27.542587, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_2, BG_RV_OBJECT_TYPE_FIREDOOR_2, 783.221252, -284.133362, 27.535686, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_1, BG_RV_OBJECT_TYPE_FIRE_1, 743.543457f, -283.799469f, 28.286655f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_2, BG_RV_OBJECT_TYPE_FIRE_2, 782.971802f, -283.799469f, 28.286655f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_1, BG_RV_OBJECT_TYPE_FIREDOOR_1, 743.711060f, -284.099609f, 27.542587f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_2, BG_RV_OBJECT_TYPE_FIREDOOR_2, 783.221252f, -284.133362f, 27.535686f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Gear
|| !AddObject(BG_RV_OBJECT_GEAR_1, BG_RV_OBJECT_TYPE_GEAR_1, 763.664551, -261.872986, 26.686588, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_2, BG_RV_OBJECT_TYPE_GEAR_2, 763.578979, -306.146149, 26.665222, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_1, BG_RV_OBJECT_TYPE_GEAR_1, 763.664551f, -261.872986f, 26.686588f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_2, BG_RV_OBJECT_TYPE_GEAR_2, 763.578979f, -306.146149f, 26.665222f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Pulley
|| !AddObject(BG_RV_OBJECT_PULLEY_1, BG_RV_OBJECT_TYPE_PULLEY_1, 700.722290, -283.990662, 39.517582, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_2, BG_RV_OBJECT_TYPE_PULLEY_2, 826.303833, -283.996429, 39.517582, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_1, BG_RV_OBJECT_TYPE_PULLEY_1, 700.722290f, -283.990662f, 39.517582f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_2, BG_RV_OBJECT_TYPE_PULLEY_2, 826.303833f, -283.996429f, 39.517582f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Pilars
|| !AddObject(BG_RV_OBJECT_PILAR_1, BG_RV_OBJECT_TYPE_PILAR_1, 763.632385, -306.162384, 25.909504, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_2, BG_RV_OBJECT_TYPE_PILAR_2, 723.644287, -284.493256, 24.648525, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_3, BG_RV_OBJECT_TYPE_PILAR_3, 763.611145, -261.856750, 25.909504, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_4, BG_RV_OBJECT_TYPE_PILAR_4, 802.211609, -284.493256, 24.648525, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_1, BG_RV_OBJECT_TYPE_PILAR_1, 763.632385f, -306.162384f, 25.909504f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_2, BG_RV_OBJECT_TYPE_PILAR_2, 723.644287f, -284.493256f, 24.648525f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_3, BG_RV_OBJECT_TYPE_PILAR_3, 763.611145f, -261.856750f, 25.909504f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_4, BG_RV_OBJECT_TYPE_PILAR_4, 802.211609f, -284.493256f, 24.648525f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
/*
// Pilars Collision - Fixme: Use the collision pilars - should make u break LoS
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_1, BG_RV_OBJECT_TYPE_PILAR_COLLISION_1, 763.632385, -306.162384, 30.639660, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_2, BG_RV_OBJECT_TYPE_PILAR_COLLISION_2, 723.644287, -284.493256, 32.382710, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_3, BG_RV_OBJECT_TYPE_PILAR_COLLISION_3, 763.611145, -261.856750, 30.639660, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_4, BG_RV_OBJECT_TYPE_PILAR_COLLISION_4, 802.211609, -284.493256, 32.382710, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_1, BG_RV_OBJECT_TYPE_PILAR_COLLISION_1, 763.632385f, -306.162384f, 30.639660f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_2, BG_RV_OBJECT_TYPE_PILAR_COLLISION_2, 723.644287f, -284.493256f, 32.382710f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_3, BG_RV_OBJECT_TYPE_PILAR_COLLISION_3, 763.611145f, -261.856750f, 30.639660f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_4, BG_RV_OBJECT_TYPE_PILAR_COLLISION_4, 802.211609f, -284.493256f, 32.382710f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
*/
)
{
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
+96 -96
View File
@@ -162,24 +162,24 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] =
{ 1236.213f, 92.287f, 64.965f, 5.751f },
{ 1215.11f, 57.772f, 64.739f, 5.78f } ,
//Demolishers
{ 1611.597656,-117.270073,8.719355,2.513274},
{ 1575.562500,-158.421875,5.024450,2.129302},
{ 1618.047729,61.424641,7.248210,3.979351},
{ 1575.103149,98.873344,2.830360,3.752458},
{ 1611.597656f,-117.270073f,8.719355f,2.513274f},
{ 1575.562500f,-158.421875f,5.024450f,2.129302f},
{ 1618.047729f,61.424641f,7.248210f,3.979351f},
{ 1575.103149f,98.873344f,2.830360f,3.752458f},
//trigger
{ 1453.49, -250.453, 30.896, 4.2883},
{ 1377.05, 97.036, 30.8605, 2.46539},
{ 1186.05, 58.8048, 56.5491, 2.75992},
{ 1042.83, -72.839, 84.8145, 3.58615},
{ 1233.62, -250.49, 55.4036, 3.7016},
{ 1453.49f, -250.453f, 30.896f, 4.2883f},
{ 1377.05f, 97.036f, 30.8605f, 2.46539f},
{ 1186.05f, 58.8048f, 56.5491f, 2.75992f},
{ 1042.83f, -72.839f, 84.8145f, 3.58615f},
{ 1233.62f, -250.49f, 55.4036f, 3.7016f},
//Npcs
{ 1348.644165, -298.786469, 31.080130, 1.710423},
{ 1358.191040, 195.527786, 31.018187, 4.171337},
{ 1348.644165f, -298.786469f, 31.080130f, 1.710423f},
{ 1358.191040f, 195.527786f, 31.018187f, 4.171337f},
//Demolishers2
{ 1371.055786, -317.071136, 35.007359, 1.947460},
{ 1424.034912, -260.195190, 31.084425, 2.820013},
{ 1353.139893, 223.745438, 35.265411, 4.343684},
{ 1404.809570, 197.027237, 32.046032, 3.605401}
{ 1371.055786f, -317.071136f, 35.007359f, 1.947460f},
{ 1424.034912f, -260.195190f, 31.084425f, 2.820013f},
{ 1353.139893f, 223.745438f, 35.265411f, 4.343684f},
{ 1404.809570f, 197.027237f, 32.046032f, 3.605401f}
};
enum BG_SA_Objects
@@ -223,8 +223,8 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 878.555f, -108.2f, 117.845f, 0.0f },
{ 836.5f, -108.8f, 120.219f, 0.0f },
//Ships
{ 2679.696777, -826.891235, 3.712860, 5.78367f}, //rot2 1 rot3 0.0002
{ 2574.003662, 981.261475, 2.603424, 0.807696},
{ 2679.696777f, -826.891235f, 3.712860f, 5.78367f}, //rot2 1 rot3 0.0002f
{ 2574.003662f, 981.261475f, 2.603424f, 0.807696f},
//Sigils
{ 1414.054f, 106.72f, 41.442f, 5.441f },
{ 1060.63f, -107.8f, 94.7f, 0.034f },
@@ -232,88 +232,88 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 1230.75f, -210.724f, 67.611f, 0.5023f },
{ 1217.8f, 79.532f, 66.58f, 5.745f },
//Flagpoles
{ 1215.114258,-65.711861,70.084267,-3.124123},
{1338.863892,-153.336533,30.895121,-2.530723},
{1309.124268,9.410645,30.893402,-1.623156},
{ 1215.114258f,-65.711861f,70.084267f,-3.124123f},
{1338.863892f,-153.336533f,30.895121f,-2.530723f},
{1309.124268f,9.410645f,30.893402f,-1.623156f},
//Flags
{ 1215.108032,-65.715767,70.084267,-3.124123},
{ 1338.859253,-153.327316,30.895077,-2.530723},
{ 1309.192017,9.416233,30.893402,1.518436},
{ 1215.108032f,-65.715767f,70.084267f,-3.124123f},
{ 1338.859253f,-153.327316f,30.895077f,-2.530723f},
{ 1309.192017f,9.416233f,30.893402f,1.518436f},
//Portal
{1468.380005, -225.798996, 30.896200, 0.0}, //blue
{1394.270020, 72.551399, 31.054300, 0.0},//green
{1065.260010, -89.79501, 81.073402, 0.0},//yellow
{1216.069946, 47.904301, 54.278198,0.0}, //purple
{1255.569946, -233.548996, 56.43699, 0.0},//red
{1468.380005f, -225.798996f, 30.896200f, 0.0f}, //blue
{1394.270020f, 72.551399f, 31.054300f, 0.0f},//green
{1065.260010f, -89.79501f, 81.073402f, 0.0f},//yellow
{1216.069946f, 47.904301f, 54.278198f,0.0f}, //purple
{1255.569946f, -233.548996f, 56.43699f, 0.0f},//red
//Bombs
{1333.45, 211.354, 31.0538, 5.03666},
{1334.29, 209.582, 31.0532, 1.28088},
{1332.72, 210.049, 31.0532, 1.28088},
{1334.28, 210.78, 31.0538, 3.85856},
{1332.64, 211.39, 31.0532, 1.29266},
{1371.41, 194.028, 31.5107, 0.753095},
{1372.39, 194.951, 31.4679, 0.753095},
{1371.58, 196.942, 30.9349, 1.01777},
{1370.43, 196.614, 30.9349, 0.957299},
{1369.46, 196.877, 30.9351, 2.45348},
{1370.35, 197.361, 30.9349, 1.08689},
{1369.47, 197.941, 30.9349, 0.984787},
{1592.49, 47.5969, 7.52271, 4.63218},
{1593.91, 47.8036, 7.65856, 4.63218},
{1593.13, 46.8106, 7.54073, 4.63218},
{1589.22, 36.3616, 7.45975, 4.64396},
{1588.24, 35.5842, 7.55613, 4.79564},
{1588.14, 36.7611, 7.49675, 4.79564},
{1595.74, 35.5278, 7.46602, 4.90246},
{1596, 36.6475, 7.47991, 4.90246},
{1597.03, 36.2356, 7.48631, 4.90246},
{1597.93, 37.1214, 7.51725, 4.90246},
{1598.16, 35.888, 7.50018, 4.90246},
{1579.6, -98.0917, 8.48478, 1.37996},
{1581.2, -98.401, 8.47483, 1.37996},
{1580.38, -98.9556, 8.4772, 1.38781},
{1585.68, -104.966, 8.88551, 0.493246},
{1586.15, -106.033, 9.10616, 0.493246},
{1584.88, -105.394, 8.82985, 0.493246},
{1581.87, -100.899, 8.46164, 0.929142},
{1581.48, -99.4657, 8.46926, 0.929142},
{1583.2, -91.2291, 8.49227, 1.40038},
{1581.94, -91.0119, 8.49977, 1.40038},
{1582.33, -91.951, 8.49353, 1.1844},
{1342.06, -304.049, 30.9532, 5.59507},
{1340.96, -304.536, 30.9458, 1.28323},
{1341.22, -303.316, 30.9413, 0.486051},
{1342.22, -302.939, 30.986, 4.87643},
{1382.16, -287.466, 32.3063, 4.80968},
{1381, -287.58, 32.2805, 4.80968},
{1381.55, -286.536, 32.3929, 2.84225},
{1382.75, -286.354, 32.4099, 1.00442},
{1379.92, -287.34, 32.2872, 3.81615},
{1100.52, -2.41391, 70.2984, 0.131054},
{1099.35, -2.13851, 70.3375, 4.4586},
{1099.59, -1.00329, 70.238, 2.49903},
{1097.79, 0.571316, 70.159, 4.00307},
{1098.74, -7.23252, 70.7972, 4.1523},
{1098.46, -5.91443, 70.6715, 4.1523},
{1097.53, -7.39704, 70.7959, 4.1523},
{1097.32, -6.64233, 70.7424, 4.1523},
{1096.45, -5.96664, 70.7242, 4.1523},
{971.725, 0.496763, 86.8467, 2.09233},
{973.589, 0.119518, 86.7985, 3.17225},
{972.524, 1.25333, 86.8351, 5.28497},
{971.993, 2.05668, 86.8584, 5.28497},
{973.635, 2.11805, 86.8197, 2.36722},
{974.791, 1.74679, 86.7942, 1.5936},
{974.771, 3.0445, 86.8125, 0.647199},
{979.554, 3.6037, 86.7923, 1.69178},
{979.758, 2.57519, 86.7748, 1.76639},
{980.769, 3.48904, 86.7939, 1.76639},
{979.122, 2.87109, 86.7794, 1.76639},
{986.167, 4.85363, 86.8439, 1.5779},
{986.176, 3.50367, 86.8217, 1.5779},
{987.33, 4.67389, 86.8486, 1.5779},
{985.23, 4.65898, 86.8368, 1.5779},
{984.556, 3.54097, 86.8137, 1.5779},
{1333.45f, 211.354f, 31.0538f, 5.03666f},
{1334.29f, 209.582f, 31.0532f, 1.28088f},
{1332.72f, 210.049f, 31.0532f, 1.28088f},
{1334.28f, 210.78f, 31.0538f, 3.85856f},
{1332.64f, 211.39f, 31.0532f, 1.29266f},
{1371.41f, 194.028f, 31.5107f, 0.753095f},
{1372.39f, 194.951f, 31.4679f, 0.753095f},
{1371.58f, 196.942f, 30.9349f, 1.01777f},
{1370.43f, 196.614f, 30.9349f, 0.957299f},
{1369.46f, 196.877f, 30.9351f, 2.45348f},
{1370.35f, 197.361f, 30.9349f, 1.08689f},
{1369.47f, 197.941f, 30.9349f, 0.984787f},
{1592.49f, 47.5969f, 7.52271f, 4.63218f},
{1593.91f, 47.8036f, 7.65856f, 4.63218f},
{1593.13f, 46.8106f, 7.54073f, 4.63218f},
{1589.22f, 36.3616f, 7.45975f, 4.64396f},
{1588.24f, 35.5842f, 7.55613f, 4.79564f},
{1588.14f, 36.7611f, 7.49675f, 4.79564f},
{1595.74f, 35.5278f, 7.46602f, 4.90246f},
{1596, 36.6475f, 7.47991f, 4.90246f},
{1597.03f, 36.2356f, 7.48631f, 4.90246f},
{1597.93f, 37.1214f, 7.51725f, 4.90246f},
{1598.16f, 35.888f, 7.50018f, 4.90246f},
{1579.6f, -98.0917f, 8.48478f, 1.37996f},
{1581.2f, -98.401f, 8.47483f, 1.37996f},
{1580.38f, -98.9556f, 8.4772f, 1.38781f},
{1585.68f, -104.966f, 8.88551f, 0.493246f},
{1586.15f, -106.033f, 9.10616f, 0.493246f},
{1584.88f, -105.394f, 8.82985f, 0.493246f},
{1581.87f, -100.899f, 8.46164f, 0.929142f},
{1581.48f, -99.4657f, 8.46926f, 0.929142f},
{1583.2f, -91.2291f, 8.49227f, 1.40038f},
{1581.94f, -91.0119f, 8.49977f, 1.40038f},
{1582.33f, -91.951f, 8.49353f, 1.1844f},
{1342.06f, -304.049f, 30.9532f, 5.59507f},
{1340.96f, -304.536f, 30.9458f, 1.28323f},
{1341.22f, -303.316f, 30.9413f, 0.486051f},
{1342.22f, -302.939f, 30.986f, 4.87643f},
{1382.16f, -287.466f, 32.3063f, 4.80968f},
{1381, -287.58f, 32.2805f, 4.80968f},
{1381.55f, -286.536f, 32.3929f, 2.84225f},
{1382.75f, -286.354f, 32.4099f, 1.00442f},
{1379.92f, -287.34f, 32.2872f, 3.81615f},
{1100.52f, -2.41391f, 70.2984f, 0.131054f},
{1099.35f, -2.13851f, 70.3375f, 4.4586f},
{1099.59f, -1.00329f, 70.238f, 2.49903f},
{1097.79f, 0.571316f, 70.159f, 4.00307f},
{1098.74f, -7.23252f, 70.7972f, 4.1523f},
{1098.46f, -5.91443f, 70.6715f, 4.1523f},
{1097.53f, -7.39704f, 70.7959f, 4.1523f},
{1097.32f, -6.64233f, 70.7424f, 4.1523f},
{1096.45f, -5.96664f, 70.7242f, 4.1523f},
{971.725f, 0.496763f, 86.8467f, 2.09233f},
{973.589f, 0.119518f, 86.7985f, 3.17225f},
{972.524f, 1.25333f, 86.8351f, 5.28497f},
{971.993f, 2.05668f, 86.8584f, 5.28497f},
{973.635f, 2.11805f, 86.8197f, 2.36722f},
{974.791f, 1.74679f, 86.7942f, 1.5936f},
{974.771f, 3.0445f, 86.8125f, 0.647199f},
{979.554f, 3.6037f, 86.7923f, 1.69178f},
{979.758f, 2.57519f, 86.7748f, 1.76639f},
{980.769f, 3.48904f, 86.7939f, 1.76639f},
{979.122f, 2.87109f, 86.7794f, 1.76639f},
{986.167f, 4.85363f, 86.8439f, 1.5779f},
{986.176f, 3.50367f, 86.8217f, 1.5779f},
{987.33f, 4.67389f, 86.8486f, 1.5779f},
{985.23f, 4.65898f, 86.8368f, 1.5779f},
{984.556f, 3.54097f, 86.8137f, 1.5779f},
};
/* Ships: