diff options
| author | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
| commit | 399e35f8f53aeabcda8af513a37bb855340663e5 (patch) | |
| tree | 7beb6bf445bd0fd46e3341039b6d712bb08bbe2e /src | |
| parent | d38135d1fd9417f90ee6f9decc37767f95035596 (diff) | |
Core:
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there
--HG--
branch : trunk
Diffstat (limited to 'src')
189 files changed, 2873 insertions, 2848 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index cec778e770f..f2397dc083c 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -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 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp index 1ce0ebb25ee..b8bd2b48d23 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp @@ -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; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index 6a5e37ea647..c2145a4e019 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -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; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp index 2c1c4025e07..91c2d9ae66d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp @@ -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; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp index b18145b2f63..3a321f75d81 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp @@ -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; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index 66a8a8050d4..85a54fa8b18 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -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) */ ) { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index d50756e0ad7..bc4c7d2f52c 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -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: diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 48f36ca8c07..6a7d43e6913 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -116,7 +116,7 @@ typedef std::vector<uint32> AutoSpellList; #define ACTIVE_SPELLS_MAX 4 -#define PET_FOLLOW_DIST 1 +#define PET_FOLLOW_DIST 1.0f #define PET_FOLLOW_ANGLE (M_PI/2) #define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILLISECONDS diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3b99c9ada1c..f8ee370ad93 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2624,7 +2624,7 @@ void Player::GiveXP(uint32 xp, Unit *victim, float group_rate) uint32 zone = GetZoneId(); float favored_exp_mult = 0; if ((HasAura(32096) || HasAura(32098)) && (zone == 3483 || zone == 3562 || zone == 3836 || zone == 3713 || zone == 3714)) - favored_exp_mult = 0.05; // Thrallmar's Favor and Honor Hold's Favor + favored_exp_mult = 0.05f; // Thrallmar's Favor and Honor Hold's Favor xp *= (1 + favored_exp_mult); // Favored experience increase END diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 496e509c18b..dc002b63f2d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13905,7 +13905,7 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit * pTarget, uint32 procFlag, } // Update defence if player is victim and parry/dodge/block else if (isVictim && procExtra&(PROC_EX_DODGE|PROC_EX_PARRY|PROC_EX_BLOCK)) - this->ToPlayer()->UpdateCombatSkills(pTarget, attType, MELEE_HIT_DODGE); + this->ToPlayer()->UpdateCombatSkills(pTarget, attType, true); } // If exist crit/parry/dodge/block need update aura state (for victim and attacker) if (procExtra & (PROC_EX_CRITICAL_HIT|PROC_EX_PARRY|PROC_EX_DODGE|PROC_EX_BLOCK)) @@ -14613,21 +14613,21 @@ float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized) Item *Weapon = this->ToPlayer()->GetWeaponForAttack(attType, true); if (!Weapon) - return 2.4; // fist attack + return 2.4f; // fist attack switch (Weapon->GetProto()->InventoryType) { case INVTYPE_2HWEAPON: - return 3.3; + return 3.3f; case INVTYPE_RANGED: case INVTYPE_RANGEDRIGHT: case INVTYPE_THROWN: - return 2.8; + return 2.8f; case INVTYPE_WEAPON: case INVTYPE_WEAPONMAINHAND: case INVTYPE_WEAPONOFFHAND: default: - return Weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER ? 1.7 : 2.4; + return Weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER ? 1.7f : 2.4f; } } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index f7768608090..ed6ffb4dd51 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1549,13 +1549,12 @@ void Spell::EffectDummy(uint32 i) // Life Tap if (m_spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG_WARLOCK_LIFETAP) { - float spFactor = 0; + float spFactor = 0.0f; switch (m_spellInfo->Id) { - case 11689: spFactor = 0.2; break; + case 11689: spFactor = 0.2f; break; case 27222: - case 57946: spFactor = 0.5; break; - default: spFactor = 0; break; + case 57946: spFactor = 0.5f; break; } int32 damage = m_spellInfo->EffectBasePoints[0] + (6.3875 * m_spellInfo->baseLevel); int32 mana = damage + (m_caster->ToPlayer()->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+SPELL_SCHOOL_SHADOW) * spFactor); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index ac1475b3097..77719cc80a2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -114,7 +114,7 @@ public: return false; pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); - pPlayer->SummonCreature(NPC_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0); + pPlayer->SummonCreature(NPC_GRIMSTONE,625.559f,-205.618f,-52.735f,2.609f,TEMPSUMMON_DEAD_DESPAWN,0); return false; } @@ -191,7 +191,7 @@ public: //TODO: move them to center void SummonRingMob() { - if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960,-235.322,-53.907,1.857,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingMob[MobSpawnId],608.960f,-235.322f,-53.907f,1.857f,TEMPSUMMON_DEAD_DESPAWN,0)) RingMobGUID[MobCount] = tmp->GetGUID(); ++MobCount; @@ -203,7 +203,7 @@ public: //TODO: move them to center void SummonRingBoss() { - if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300,-175.989,-53.739,3.418,TEMPSUMMON_DEAD_DESPAWN,0)) + if (Creature* tmp = me->SummonCreature(RingBoss[rand()%6],644.300f,-175.989f,-53.739f,3.418f,TEMPSUMMON_DEAD_DESPAWN,0)) RingBossGUID = tmp->GetGUID(); MobDeath_Timer = 2500; @@ -626,9 +626,9 @@ public: { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(pCreature); - dughal_stormwingAI->AddWaypoint(0, 280.42,-82.86, -77.12,0); - dughal_stormwingAI->AddWaypoint(1, 287.64,-87.01, -76.79,0); - dughal_stormwingAI->AddWaypoint(2, 354.63,-64.95, -67.53,0); + dughal_stormwingAI->AddWaypoint(0, 280.42f,-82.86f, -77.12f,0); + dughal_stormwingAI->AddWaypoint(1, 287.64f,-87.01f, -76.79f,0); + dughal_stormwingAI->AddWaypoint(2, 354.63f,-64.95f, -67.53f,0); return dughal_stormwingAI; } @@ -736,26 +736,26 @@ public: { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(pCreature); - marshal_windsorAI->AddWaypoint(0, 316.336,-225.528, -77.7258,7000); - marshal_windsorAI->AddWaypoint(1, 316.336,-225.528, -77.7258,2000); - marshal_windsorAI->AddWaypoint(2, 322.96,-207.13, -77.87,0); - marshal_windsorAI->AddWaypoint(3, 281.05,-172.16, -75.12,0); - marshal_windsorAI->AddWaypoint(4, 272.19,-139.14, -70.61,0); - marshal_windsorAI->AddWaypoint(5, 283.62,-116.09, -70.21,0); - marshal_windsorAI->AddWaypoint(6, 296.18,-94.30, -74.08,0); - marshal_windsorAI->AddWaypoint(7, 294.57,-93.11, -74.08,0); - marshal_windsorAI->AddWaypoint(8, 314.31,-74.31, -76.09,0); - marshal_windsorAI->AddWaypoint(9, 360.22,-62.93, -66.77,0); - marshal_windsorAI->AddWaypoint(10, 383.38,-69.40, -63.25,0); - marshal_windsorAI->AddWaypoint(11, 389.99,-67.86, -62.57,0); - marshal_windsorAI->AddWaypoint(12, 400.98,-72.01, -62.31,0); - marshal_windsorAI->AddWaypoint(13, 404.22,-62.30, -63.50,2300); - marshal_windsorAI->AddWaypoint(14, 404.22,-62.30, -63.50,1500); - marshal_windsorAI->AddWaypoint(15, 407.65,-51.86, -63.96,0); - marshal_windsorAI->AddWaypoint(16, 403.61,-51.71, -63.92,1000); - marshal_windsorAI->AddWaypoint(17, 403.61,-51.71, -63.92,2000); - marshal_windsorAI->AddWaypoint(18, 403.61,-51.71, -63.92,1000); - marshal_windsorAI->AddWaypoint(19, 403.61,-51.71, -63.92,0); + marshal_windsorAI->AddWaypoint(0, 316.336f,-225.528f, -77.7258f,7000); + marshal_windsorAI->AddWaypoint(1, 316.336f,-225.528f, -77.7258f,2000); + marshal_windsorAI->AddWaypoint(2, 322.96f,-207.13f, -77.87f,0); + marshal_windsorAI->AddWaypoint(3, 281.05f,-172.16f, -75.12f,0); + marshal_windsorAI->AddWaypoint(4, 272.19f,-139.14f, -70.61f,0); + marshal_windsorAI->AddWaypoint(5, 283.62f,-116.09f, -70.21f,0); + marshal_windsorAI->AddWaypoint(6, 296.18f,-94.30f, -74.08f,0); + marshal_windsorAI->AddWaypoint(7, 294.57f,-93.11f, -74.08f,0); + marshal_windsorAI->AddWaypoint(8, 314.31f,-74.31f, -76.09f,0); + marshal_windsorAI->AddWaypoint(9, 360.22f,-62.93f, -66.77f,0); + marshal_windsorAI->AddWaypoint(10, 383.38f,-69.40f, -63.25f,0); + marshal_windsorAI->AddWaypoint(11, 389.99f,-67.86f, -62.57f,0); + marshal_windsorAI->AddWaypoint(12, 400.98f,-72.01f, -62.31f,0); + marshal_windsorAI->AddWaypoint(13, 404.22f,-62.30f, -63.50f,2300); + marshal_windsorAI->AddWaypoint(14, 404.22f,-62.30f, -63.50f,1500); + marshal_windsorAI->AddWaypoint(15, 407.65f,-51.86f, -63.96f,0); + marshal_windsorAI->AddWaypoint(16, 403.61f,-51.71f, -63.92f,1000); + marshal_windsorAI->AddWaypoint(17, 403.61f,-51.71f, -63.92f,2000); + marshal_windsorAI->AddWaypoint(18, 403.61f,-51.71f, -63.92f,1000); + marshal_windsorAI->AddWaypoint(19, 403.61f,-51.71f, -63.92f,0); return marshal_windsorAI; } @@ -821,7 +821,7 @@ public: me->SetVisibility(VISIBILITY_OFF); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR,403.61,-51.71,-63.92,3.600434,TEMPSUMMON_DEAD_DESPAWN ,0); + me->SummonCreature(MOB_ENTRY_REGINALD_WINDSOR,403.61f,-51.71f,-63.92f,3.600434f,TEMPSUMMON_DEAD_DESPAWN ,0); pInstance->SetData(DATA_SUPPLY_ROOM, ENCOUNTER_STATE_ENDED); break; } @@ -910,41 +910,41 @@ public: { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(pCreature); - marshal_reginald_windsorAI->AddWaypoint(0, 403.61,-52.71, -63.92,4000); - marshal_reginald_windsorAI->AddWaypoint(1, 403.61,-52.71, -63.92,4000); - marshal_reginald_windsorAI->AddWaypoint(2, 406.33,-54.87, -63.95,0); - marshal_reginald_windsorAI->AddWaypoint(3, 407.99,-73.91, -62.26,0); - marshal_reginald_windsorAI->AddWaypoint(4, 557.03,-119.71, -61.83,0); - marshal_reginald_windsorAI->AddWaypoint(5, 573.40,-124.39, -65.07,0); - marshal_reginald_windsorAI->AddWaypoint(6, 593.91,-130.29, -69.25,0); - marshal_reginald_windsorAI->AddWaypoint(7, 593.21,-132.16, -69.25,0); - marshal_reginald_windsorAI->AddWaypoint(8, 593.21,-132.16, -69.25,3000); - marshal_reginald_windsorAI->AddWaypoint(9, 622.81,-135.55, -71.92,0); - marshal_reginald_windsorAI->AddWaypoint(10, 634.68,-151.29, -70.32,0); - marshal_reginald_windsorAI->AddWaypoint(11, 635.06,-153.25, -70.32,0); - marshal_reginald_windsorAI->AddWaypoint(12, 635.06,-153.25, -70.32,3000); - marshal_reginald_windsorAI->AddWaypoint(13, 635.06,-153.25, -70.32,1500); - marshal_reginald_windsorAI->AddWaypoint(14, 655.25,-172.39, -73.72,0); - marshal_reginald_windsorAI->AddWaypoint(15, 654.79,-226.30, -83.06,0); - marshal_reginald_windsorAI->AddWaypoint(16, 622.85,-268.85, -83.96,0); - marshal_reginald_windsorAI->AddWaypoint(17, 579.45,-275.56, -80.44,0); - marshal_reginald_windsorAI->AddWaypoint(18, 561.19,-266.85, -75.59,0); - marshal_reginald_windsorAI->AddWaypoint(19, 547.91,-253.92, -70.34,0); - marshal_reginald_windsorAI->AddWaypoint(20, 549.20,-252.40, -70.34,0); - marshal_reginald_windsorAI->AddWaypoint(21, 549.20,-252.40, -70.34,4000); - marshal_reginald_windsorAI->AddWaypoint(22, 555.33,-269.16, -74.40,0); - marshal_reginald_windsorAI->AddWaypoint(23, 554.31,-270.88, -74.40,0); - marshal_reginald_windsorAI->AddWaypoint(24, 554.31,-270.88, -74.40,4000); - marshal_reginald_windsorAI->AddWaypoint(25, 536.10,-249.60, -67.47,0); - marshal_reginald_windsorAI->AddWaypoint(26, 520.94,-216.65, -59.28,0); - marshal_reginald_windsorAI->AddWaypoint(27, 505.99,-148.74, -62.17,0); - marshal_reginald_windsorAI->AddWaypoint(28, 484.21,-56.24, -62.43,0); - marshal_reginald_windsorAI->AddWaypoint(29, 470.39,-6.01, -70.10,0); - marshal_reginald_windsorAI->AddWaypoint(30, 451.27,30.85, -70.07,0); - marshal_reginald_windsorAI->AddWaypoint(31, 452.45,29.85, -70.37,1500); - marshal_reginald_windsorAI->AddWaypoint(32, 452.45,29.85, -70.37,7000); - marshal_reginald_windsorAI->AddWaypoint(33, 452.45,29.85, -70.37,10000); - marshal_reginald_windsorAI->AddWaypoint(34, 451.27,31.85, -70.07,0); + marshal_reginald_windsorAI->AddWaypoint(0, 403.61f,-52.71f, -63.92f,4000); + marshal_reginald_windsorAI->AddWaypoint(1, 403.61f,-52.71f, -63.92f,4000); + marshal_reginald_windsorAI->AddWaypoint(2, 406.33f,-54.87f, -63.95f,0); + marshal_reginald_windsorAI->AddWaypoint(3, 407.99f,-73.91f, -62.26f,0); + marshal_reginald_windsorAI->AddWaypoint(4, 557.03f,-119.71f, -61.83f,0); + marshal_reginald_windsorAI->AddWaypoint(5, 573.40f,-124.39f, -65.07f,0); + marshal_reginald_windsorAI->AddWaypoint(6, 593.91f,-130.29f, -69.25f,0); + marshal_reginald_windsorAI->AddWaypoint(7, 593.21f,-132.16f, -69.25f,0); + marshal_reginald_windsorAI->AddWaypoint(8, 593.21f,-132.16f, -69.25f,3000); + marshal_reginald_windsorAI->AddWaypoint(9, 622.81f,-135.55f, -71.92f,0); + marshal_reginald_windsorAI->AddWaypoint(10, 634.68f,-151.29f, -70.32f,0); + marshal_reginald_windsorAI->AddWaypoint(11, 635.06f,-153.25f, -70.32f,0); + marshal_reginald_windsorAI->AddWaypoint(12, 635.06f,-153.25f, -70.32f,3000); + marshal_reginald_windsorAI->AddWaypoint(13, 635.06f,-153.25f, -70.32f,1500); + marshal_reginald_windsorAI->AddWaypoint(14, 655.25f,-172.39f, -73.72f,0); + marshal_reginald_windsorAI->AddWaypoint(15, 654.79f,-226.30f, -83.06f,0); + marshal_reginald_windsorAI->AddWaypoint(16, 622.85f,-268.85f, -83.96f,0); + marshal_reginald_windsorAI->AddWaypoint(17, 579.45f,-275.56f, -80.44f,0); + marshal_reginald_windsorAI->AddWaypoint(18, 561.19f,-266.85f, -75.59f,0); + marshal_reginald_windsorAI->AddWaypoint(19, 547.91f,-253.92f, -70.34f,0); + marshal_reginald_windsorAI->AddWaypoint(20, 549.20f,-252.40f, -70.34f,0); + marshal_reginald_windsorAI->AddWaypoint(21, 549.20f,-252.40f, -70.34f,4000); + marshal_reginald_windsorAI->AddWaypoint(22, 555.33f,-269.16f, -74.40f,0); + marshal_reginald_windsorAI->AddWaypoint(23, 554.31f,-270.88f, -74.40f,0); + marshal_reginald_windsorAI->AddWaypoint(24, 554.31f,-270.88f, -74.40f,4000); + marshal_reginald_windsorAI->AddWaypoint(25, 536.10f,-249.60f, -67.47f,0); + marshal_reginald_windsorAI->AddWaypoint(26, 520.94f,-216.65f, -59.28f,0); + marshal_reginald_windsorAI->AddWaypoint(27, 505.99f,-148.74f, -62.17f,0); + marshal_reginald_windsorAI->AddWaypoint(28, 484.21f,-56.24f, -62.43f,0); + marshal_reginald_windsorAI->AddWaypoint(29, 470.39f,-6.01f, -70.10f,0); + marshal_reginald_windsorAI->AddWaypoint(30, 451.27f,30.85f, -70.07f,0); + marshal_reginald_windsorAI->AddWaypoint(31, 452.45f,29.85f, -70.37f,1500); + marshal_reginald_windsorAI->AddWaypoint(32, 452.45f,29.85f, -70.37f,7000); + marshal_reginald_windsorAI->AddWaypoint(33, 452.45f,29.85f, -70.37f,10000); + marshal_reginald_windsorAI->AddWaypoint(34, 451.27f,31.85f, -70.07f,0); return marshal_reginald_windsorAI; } @@ -1022,7 +1022,7 @@ public: { if (CAST_PLR(who)->GetQuestStatus(4322) == QUEST_STATUS_INCOMPLETE) { - float Radius = 10.0; + float Radius = 10.0f; if (me->IsWithinDistInMap(who, Radius)) { SetEscortPaused(false); @@ -1113,11 +1113,11 @@ public: { npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(pCreature); - tobias_seecherAI->AddWaypoint(0, 549.21, -281.07, -75.27); - tobias_seecherAI->AddWaypoint(1, 554.39, -267.39, -73.68); - tobias_seecherAI->AddWaypoint(2, 533.59, -249.38, -67.04); - tobias_seecherAI->AddWaypoint(3, 519.44, -217.02, -59.34); - tobias_seecherAI->AddWaypoint(4, 506.55, -153.49, -62.34); + tobias_seecherAI->AddWaypoint(0, 549.21f, -281.07f, -75.27f); + tobias_seecherAI->AddWaypoint(1, 554.39f, -267.39f, -73.68f); + tobias_seecherAI->AddWaypoint(2, 533.59f, -249.38f, -67.04f); + tobias_seecherAI->AddWaypoint(3, 519.44f, -217.02f, -59.34f); + tobias_seecherAI->AddWaypoint(4, 506.55f, -153.49f, -62.34f); return tobias_seecherAI; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp index 5268ee11430..42031639071 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp @@ -28,10 +28,10 @@ EndScriptData */ #define SPELL_CROWDPUMMEL 10887 #define SPELL_MIGHTYBLOW 14099 -#define ADD_1X -169.839203 -#define ADD_1Y -324.961395 -#define ADD_1Z 64.401443 -#define ADD_1O 3.124724 +#define ADD_1X -169.839203f +#define ADD_1Y -324.961395f +#define ADD_1Z 64.401443f +#define ADD_1O 3.124724f class boss_halycon : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 8a304d4fc00..1ec09bdf429 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -30,15 +30,15 @@ EndScriptData */ #define SPELL_CLEAVE 20691 #define SPELL_KNOCKAWAY 20686 -#define ADD_1X -39.355381 -#define ADD_1Y -513.456482 -#define ADD_1Z 88.472046 -#define ADD_1O 4.679872 - -#define ADD_2X -49.875881 -#define ADD_2Y -511.896942 -#define ADD_2Z 88.195160 -#define ADD_2O 4.613114 +#define ADD_1X -39.355381f +#define ADD_1Y -513.456482f +#define ADD_1Z 88.472046f +#define ADD_1O 4.679872f + +#define ADD_2X -49.875881f +#define ADD_2Y -511.896942f +#define ADD_2Z 88.195160f +#define ADD_2O 4.613114f class boss_overlord_wyrmthalak : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 155b6b962bb..b4684a01f92 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -42,12 +42,12 @@ EndScriptData */ #define CREATURE_CHROMATIC_DRAKANOID 14302 #define CREATURE_NEFARIAN 11583 -#define ADD_X1 -7591.151855 -#define ADD_X2 -7514.598633 -#define ADD_Y1 -1204.051880 -#define ADD_Y2 -1150.448853 -#define ADD_Z1 476.800476 -#define ADD_Z2 476.796570 +#define ADD_X1 -7591.151855f +#define ADD_X2 -7514.598633f +#define ADD_Y1 -1204.051880f +#define ADD_Y2 -1150.448853f +#define ADD_Z1 476.800476f +#define ADD_Z2 476.796570f #define NEF_X -7445 #define NEF_Y -1332 @@ -300,7 +300,7 @@ public: ++SpawnedAdds; //Spawn Creature and force it to start attacking a random target - Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { @@ -316,7 +316,7 @@ public: ++SpawnedAdds; - Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + Spawned = me->SummonCreature(CreatureID,ADD_X2,ADD_Y2,ADD_Z2,5.000f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget && Spawned) { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 9216274b287..5bf7012f897 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -157,7 +157,7 @@ class instance_deadmines : public InstanceMapScript void MoveCreatureInside(Creature* pCreature) { pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pCreature->GetMotionMaster()->MovePoint(0, -102.7,-655.9, pCreature->GetPositionZ()); + pCreature->GetMotionMaster()->MovePoint(0, -102.7f,-655.9f, pCreature->GetPositionZ()); } void ShootCannon() diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index a89454038ee..f6c7e180afa 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -66,23 +66,23 @@ enum eBlastmasterEmiShortfuse const Position SpawnPosition[] = { - {-557.630,-114.514,-152.209,0.641}, - {-555.263,-113.802,-152.737,0.311}, - {-552.154,-112.476,-153.349,0.621}, - {-548.692,-111.089,-154.090,0.621}, - {-546.905,-108.340,-154.877,0.729}, - {-547.736,-105.154,-155.176,0.372}, - {-547.274,-114.109,-153.952,0.735}, - {-552.534,-110.012,-153.577,0.747}, - {-550.708,-116.436,-153.103,0.679}, - {-554.030,-115.983,-152.635,0.695}, - {-494.595,-87.516,149.116,3.344}, - {-493.349,-90.845,-148.882,3.717}, - {-491.995,-87.619,-148.197,3.230}, - {-490.732,-90.739,-148.091,3.230}, - {-490.554,-89.114,-148.055,3.230}, - {-495.240,-90.808,-149.493,3.238}, - {-494.195,-89.553,-149.131,3.254} + {-557.630f,-114.514f,-152.209f,0.641f}, + {-555.263f,-113.802f,-152.737f,0.311f}, + {-552.154f,-112.476f,-153.349f,0.621f}, + {-548.692f,-111.089f,-154.090f,0.621f}, + {-546.905f,-108.340f,-154.877f,0.729f}, + {-547.736f,-105.154f,-155.176f,0.372f}, + {-547.274f,-114.109f,-153.952f,0.735f}, + {-552.534f,-110.012f,-153.577f,0.747f}, + {-550.708f,-116.436f,-153.103f,0.679f}, + {-554.030f,-115.983f,-152.635f,0.695f}, + {-494.595f,-87.516f,149.116f,3.344f}, + {-493.349f,-90.845f,-148.882f,3.717f}, + {-491.995f,-87.619f,-148.197f,3.230f}, + {-490.732f,-90.739f,-148.091f,3.230f}, + {-490.554f,-89.114f,-148.055f,3.230f}, + {-495.240f,-90.808f,-149.493f,3.238f}, + {-494.195f,-89.553f,-149.131f,3.254f} }; class npc_blastmaster_emi_shortfuse : public CreatureScript @@ -353,7 +353,7 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[9], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 2: - if (GameObject* pGo = me->SummonGameObject(183410, -533.140,-105.322,-156.016, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -533.140f,-105.322f,-156.016f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! @@ -368,7 +368,7 @@ public: DoScriptText(SAY_BLASTMASTER_19,me); break; case 4: - if (GameObject* pGo = me->SummonGameObject(183410, -542.199,-96.854,-155.790, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -542.199f,-96.854f,-155.790f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); @@ -388,7 +388,7 @@ public: me->SummonCreature(NPC_CAVERNDEEP_AMBUSHER, SpawnPosition[14], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1800000); break; case 7: - if (GameObject* pGo = me->SummonGameObject(183410, -507.820,-103.333,-151.353, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -507.820f,-103.333f,-151.353f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! @@ -396,7 +396,7 @@ public: } break; case 8: - if (GameObject* pGo = me->SummonGameObject(183410, -511.829,-86.249,-151.431, 0, 0, 0, 0, 0, 1000)) + if (GameObject* pGo = me->SummonGameObject(183410, -511.829f,-86.249f,-151.431f, 0, 0, 0, 0, 0, 1000)) { GoSummonList.push_back(pGo->GetGUID()); pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); //We can't use it! diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 5a3d8805870..78391612fd7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -40,14 +40,14 @@ EndScriptData */ #define SPELL_GOUGE 29425 #define SPELL_FRENZY 37023 -#define POS_Z 81.73 +#define POS_Z 81.73f float Locations[4][3]= { - {-10991.0, -1884.33, 0.614315}, - {-10989.4, -1885.88, 0.904913}, - {-10978.1, -1887.07, 2.035550}, - {-10975.9, -1885.81, 2.253890}, + {-10991.0f, -1884.33f, 0.614315f}, + {-10989.4f, -1885.88f, 0.904913f}, + {-10978.1f, -1887.07f, 2.035550f}, + {-10975.9f, -1885.81f, 2.253890f}, }; const uint32 Adds[6]= diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index a5dcf11fc1f..983fd44f5de 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -40,9 +40,9 @@ EndScriptData */ const float PortalCoord[3][3] = { - {-11195.353516, -1613.237183, 278.237258}, // Left side - {-11137.846680, -1685.607422, 278.239258}, // Right side - {-11094.493164, -1591.969238, 279.949188} // Back side + {-11195.353516f, -1613.237183f, 278.237258f}, // Left side + {-11137.846680f, -1685.607422f, 278.239258f}, // Right side + {-11094.493164f, -1591.969238f, 279.949188f} // Back side }; enum Netherspite_Portal{ diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index e30efa68a28..886853663be 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -48,14 +48,14 @@ EndScriptData */ float IntroWay[8][3] = { - {-11053.37,-1794.48,149}, - {-11141.07,-1841.40,125}, - {-11187.28,-1890.23,125}, - {-11189.20,-1931.25,125}, - {-11153.76,-1948.93,125}, - {-11128.73,-1929.75,125}, - {-11140 , -1915 ,122}, - {-11163 , -1903 ,91.473} + {-11053.37f,-1794.48f,149.00f}, + {-11141.07f,-1841.40f,125.00f}, + {-11187.28f,-1890.23f,125.00f}, + {-11189.20f,-1931.25f,125.00f}, + {-11153.76f,-1948.93f,125.00f}, + {-11128.73f,-1929.75f,125.00f}, + {-11140.00f,-1915.00f,122.00f}, + {-11163.00f,-1903.00f,91.473f} }; class boss_nightbane : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index bf50030a189..a84da32fb03 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -45,28 +45,28 @@ struct InfernalPoint float x,y; }; -#define INFERNAL_Z 275.5 +#define INFERNAL_Z 275.5f static InfernalPoint InfernalPoints[] = { - {-10922.8, -1985.2}, - {-10916.2, -1996.2}, - {-10932.2, -2008.1}, - {-10948.8, -2022.1}, - {-10958.7, -1997.7}, - {-10971.5, -1997.5}, - {-10990.8, -1995.1}, - {-10989.8, -1976.5}, - {-10971.6, -1973.0}, - {-10955.5, -1974.0}, - {-10939.6, -1969.8}, - {-10958.0, -1952.2}, - {-10941.7, -1954.8}, - {-10943.1, -1988.5}, - {-10948.8, -2005.1}, - {-10984.0, -2019.3}, - {-10932.8, -1979.6}, - {-10935.7, -1996.0} + {-10922.8f, -1985.2f}, + {-10916.2f, -1996.2f}, + {-10932.2f, -2008.1f}, + {-10948.8f, -2022.1f}, + {-10958.7f, -1997.7f}, + {-10971.5f, -1997.5f}, + {-10990.8f, -1995.1f}, + {-10989.8f, -1976.5f}, + {-10971.6f, -1973.0f}, + {-10955.5f, -1974.0f}, + {-10939.6f, -1969.8f}, + {-10958.0f, -1952.2f}, + {-10941.7f, -1954.8f}, + {-10943.1f, -1988.5f}, + {-10948.8f, -2005.1f}, + {-10984.0f, -2019.3f}, + {-10932.8f, -1979.6f}, + {-10935.7f, -1996.0f} }; #define TOTAL_INFERNAL_POINTS 18 diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 2dc40e931cc..f95437dd83b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -94,7 +94,7 @@ void SummonCroneIfReady(InstanceScript* pInstance, Creature* pCreature) if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4) { - if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) + if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96f, -1755.95f, pCreature->GetPositionZ(), 4.64f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS)) { if (pCreature->getVictim()) pCrone->AI()->AttackStart(pCreature->getVictim()); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 852de18bb75..01945df877e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -98,9 +98,9 @@ float Spawns[6][2]= #define SPELL_SPOTLIGHT 25824 #define SPELL_TUXEDO 32616 -#define SPAWN_Z 90.5 +#define SPAWN_Z 90.5f #define SPAWN_Y -1758 -#define SPAWN_O 4.738 +#define SPAWN_O 4.738f class npc_barnes : public CreatureScript { @@ -460,8 +460,8 @@ public: #define SPELL_CONFLAGRATION_BLAST 30977 #define SPELL_MANA_SHIELD 31635 -static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94}; -static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83}; +static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f}; +static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f}; class npc_image_of_medivh : public CreatureScript { @@ -582,7 +582,7 @@ public: CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL); return 5000; case 12: - arca->GetMotionMaster()->MovePoint(0, -11010.82,-1761.18, 156.47); + arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f); arca->setActive(true); arca->InterruptNonMeleeSpells(true); arca->SetSpeed(MOVE_FLIGHT, 2.0f); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 505f0f1db6c..56117dd4733 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -70,12 +70,12 @@ EndScriptData */ /** Locations **/ float KaelLocations[3][2]= { - {148.744659, 181.377426}, - {140.823883, 195.403046}, - {156.574188, 195.650482}, + {148.744659f, 181.377426f}, + {140.823883f, 195.403046f}, + {156.574188f, 195.650482f}, }; -#define LOCATION_Z -16.727455 +#define LOCATION_Z -16.727455f class boss_felblood_kaelthas : public CreatureScript { @@ -175,7 +175,7 @@ public: void MoveInLineOfSight(Unit *who) { - if (!HasTaunted && me->IsWithinDistInMap(who, 40.0)) + if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) { DoScriptText(SAY_AGGRO, me); HasTaunted = true; @@ -334,7 +334,7 @@ public: } else FlameStrikeTimer -= diff; // Below 50% - if (me->GetMaxHealth() * 0.5 > me->GetHealth()) + if (me->GetMaxHealth() * 0.5f > me->GetHealth()) { me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true); me->StopMoving(); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 09811fd73f8..c4c63c038a0 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -64,15 +64,15 @@ enum eEnums MAX_ACTIVE_LACKEY = 4 }; -const float fOrientation = 4.98; -const float fZLocation = -19.921; +const float fOrientation = 4.98f; +const float fZLocation = -19.921f; float LackeyLocations[4][2]= { - {123.77, 17.6007}, - {131.731, 15.0827}, - {121.563, 15.6213}, - {129.988, 17.2355}, + {123.77f, 17.6007f}, + {131.731f, 15.0827f}, + {121.563f, 15.6213f}, + {129.988f, 17.2355f}, }; const uint32 m_auiAddEntries[] = diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 43d5876c1d9..0172c302a40 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -41,7 +41,7 @@ enum eEnums POINT_ID_LAND = 1 }; -const float afKaelLandPoint[] = {225.045, -276.236, -5.434}; +const float afKaelLandPoint[] = {225.045f, -276.236f, -5.434f}; #define GOSSIP_ITEM_KAEL_1 "Who are you?" #define GOSSIP_ITEM_KAEL_2 "What can we do to assist you?" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 47e13c07e3d..5eaa74a5211 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -957,34 +957,34 @@ public: void InitWaypoint() { - AddWaypoint(1, 2389.03, -5902.74, 109.014, 5000); - AddWaypoint(2, 2341.812012, -5900.484863, 102.619743); - AddWaypoint(3, 2306.561279, -5901.738281, 91.792419); - AddWaypoint(4, 2300.098389, -5912.618652, 86.014885); - AddWaypoint(5, 2294.142090, -5927.274414, 75.316849); - AddWaypoint(6, 2286.984375, -5944.955566, 63.714966); - AddWaypoint(7, 2280.001709, -5961.186035, 54.228283); - AddWaypoint(8, 2259.389648, -5974.197754, 42.359348); - AddWaypoint(9, 2242.882812, -5984.642578, 32.827850); - AddWaypoint(10, 2217.265625, -6028.959473, 7.675705); - AddWaypoint(11, 2202.595947, -6061.325684, 5.882018); - AddWaypoint(12, 2188.974609, -6080.866699, 3.370027); + AddWaypoint(1, 2389.03f, -5902.74f, 109.014f, 5000); + AddWaypoint(2, 2341.812012f, -5900.484863f, 102.619743f); + AddWaypoint(3, 2306.561279f, -5901.738281f, 91.792419f); + AddWaypoint(4, 2300.098389f, -5912.618652f, 86.014885f); + AddWaypoint(5, 2294.142090f, -5927.274414f, 75.316849f); + AddWaypoint(6, 2286.984375f, -5944.955566f, 63.714966f); + AddWaypoint(7, 2280.001709f, -5961.186035f, 54.228283f); + AddWaypoint(8, 2259.389648f, -5974.197754f, 42.359348f); + AddWaypoint(9, 2242.882812f, -5984.642578f, 32.827850f); + AddWaypoint(10, 2217.265625f, -6028.959473f, 7.675705f); + AddWaypoint(11, 2202.595947f, -6061.325684f, 5.882018f); + AddWaypoint(12, 2188.974609f, -6080.866699f, 3.370027f); if (urand(0,1)) { - AddWaypoint(13, 2176.483887, -6110.407227, 1.855181); - AddWaypoint(14, 2172.516602, -6146.752441, 1.074235); - AddWaypoint(15, 2138.918457, -6158.920898, 1.342926); - AddWaypoint(16, 2129.866699, -6174.107910, 4.380779); - AddWaypoint(17, 2117.709473, -6193.830078, 13.3542, 10000); + AddWaypoint(13, 2176.483887f, -6110.407227f, 1.855181f); + AddWaypoint(14, 2172.516602f, -6146.752441f, 1.074235f); + AddWaypoint(15, 2138.918457f, -6158.920898f, 1.342926f); + AddWaypoint(16, 2129.866699f, -6174.107910f, 4.380779f); + AddWaypoint(17, 2117.709473f, -6193.830078f, 13.3542f, 10000); } else { - AddWaypoint(13, 2184.190186, -6166.447266, 0.968877); - AddWaypoint(14, 2234.265625, -6163.741211, 0.916021); - AddWaypoint(15, 2268.071777, -6158.750977, 1.822252); - AddWaypoint(16, 2270.028320, -6176.505859, 6.340538); - AddWaypoint(17, 2271.739014, -6195.401855, 13.3542, 10000); + AddWaypoint(13, 2184.190186f, -6166.447266f, 0.968877f); + AddWaypoint(14, 2234.265625f, -6163.741211f, 0.916021f); + AddWaypoint(15, 2268.071777f, -6158.750977f, 1.822252f); + AddWaypoint(16, 2270.028320f, -6176.505859f, 6.340538f); + AddWaypoint(17, 2271.739014f, -6195.401855f, 13.3542f, 10000); } } @@ -1073,7 +1073,7 @@ public: if (pPlayer->GetQuestStatus(12701) == QUEST_STATUS_INCOMPLETE) { // Hack Why Trinity Dont Support Custom Summon Location - if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629, -5900.312500, 107.996086, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) + if (Creature *miner = pPlayer->SummonCreature(28841, 2383.869629f, -5900.312500f, 107.996086f, pPlayer->GetOrientation(),TEMPSUMMON_DEAD_DESPAWN, 1)) { pPlayer->CastSpell(pPlayer, SPELL_CART_SUMM, true); if (Creature *car = pPlayer->GetVehicleCreatureBase()) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 98193741d77..cad8e009c8c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -271,7 +271,7 @@ public: void SummonAcolyte(uint32 uiAmount) { for (uint32 i = 0; i < uiAmount; ++i) - me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); } void UpdateAI(const uint32 uiDiff) @@ -301,7 +301,7 @@ public: break; case 3: DoScriptText(SAY_BREAKOUT6, me); - me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); + me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); m_uiWave_Timer = 1000; break; case 4: diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 25d82a2b9c2..2ae6512fcdb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -251,36 +251,36 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state) static Locations LightofDawnLoc[]= { - {2281.335, -5300.409, 85.170, 0}, // 0 Tirion Fordring loc - {2283.896, -5287.914, 83.066, 1.55}, // 1 Tirion Fordring loc2 - {2281.461, -5263.014, 81.164, 0}, // 2 Tirion charges - {2262.277, -5293.477, 82.167, 0}, // 3 Tirion run - {2270.286, -5287.73, 82.262, 0}, // 4 Tirion relocate - {2269.511, -5288.289, 82.225, 0}, // 5 Tirion forward - {2262.277, -5293.477, 82.167, 0}, // 6 Tirion runs to Darion - {2270.286, -5287.73, 82.262, 0}, - {2269.511, -5288.289, 82.225, 0}, - {2273.205, -5288.848, 82.617, 0}, // 9 Korfax loc1 - {2274.739, -5287.926, 82.684, 0}, // 10 Korfax loc2 - {2253.673, -5318.004, 81.724, 0}, // 11 Korfax kicked - {2287.028, -5309.644, 87.253, 0}, // 12 Maxwell loc1 - {2286.978, -5308.025, 86.83, 0}, // 13 Maxwell loc2 - {2248.877, -5307.586, 82.166, 0}, // 14 maxwell kicked - {2278.58, -5316.933, 88.319, 0}, // 15 Eligor loc1 - {2278.535, -5315.479, 88.08, 0}, // 16 Eligor loc2 - {2259.416, -5304.505, 82.149, 0}, // 17 eligor kicked - {2289.259, -5280.355, 82.112, 0}, // 18 Koltira loc1 - {2289.02, -5281.985, 82.207, 0}, // 19 Koltira loc2 - {2273.289, -5273.675, 81.701, 0}, // 20 Thassarian loc1 - {2273.332, -5275.544, 81.849, 0}, // 21 Thassarian loc2 - {2281.198, -5257.397, 80.224, 4.66}, // 22 Alexandros loc1 - {2281.156, -5259.934, 80.647, 0}, // 23 Alexandros loc2 - {2281.294, -5281.895, 82.445, 1.35}, // 24 Darion loc1 - {2281.093, -5263.013, 81.125, 0}, // 25 Darion loc1 - {2281.313, -5250.282, 79.322, 4.69}, // 26 Lich King spawns - {2281.523, -5261.058, 80.877, 0}, // 27 Lich king move forwards - {2272.709, -5255.552, 78.226, 0}, // 28 Lich king kicked - {2273.972, -5257.676, 78.862, 0} // 29 Lich king moves forward + {2281.335f, -5300.409f, 85.170f, 0}, // 0 Tirion Fordring loc + {2283.896f, -5287.914f, 83.066f, 1.55f}, // 1 Tirion Fordring loc2 + {2281.461f, -5263.014f, 81.164f, 0}, // 2 Tirion charges + {2262.277f, -5293.477f, 82.167f, 0}, // 3 Tirion run + {2270.286f, -5287.73f, 82.262f, 0}, // 4 Tirion relocate + {2269.511f, -5288.289f, 82.225f, 0}, // 5 Tirion forward + {2262.277f, -5293.477f, 82.167f, 0}, // 6 Tirion runs to Darion + {2270.286f, -5287.73f, 82.262f, 0}, + {2269.511f, -5288.289f, 82.225f, 0}, + {2273.205f, -5288.848f, 82.617f, 0}, // 9 Korfax loc1 + {2274.739f, -5287.926f, 82.684f, 0}, // 10 Korfax loc2 + {2253.673f, -5318.004f, 81.724f, 0}, // 11 Korfax kicked + {2287.028f, -5309.644f, 87.253f, 0}, // 12 Maxwell loc1 + {2286.978f, -5308.025f, 86.83f, 0}, // 13 Maxwell loc2 + {2248.877f, -5307.586f, 82.166f, 0}, // 14 maxwell kicked + {2278.58f, -5316.933f, 88.319f, 0}, // 15 Eligor loc1 + {2278.535f, -5315.479f, 88.08f, 0}, // 16 Eligor loc2 + {2259.416f, -5304.505f, 82.149f, 0}, // 17 eligor kicked + {2289.259f, -5280.355f, 82.112f, 0}, // 18 Koltira loc1 + {2289.02f, -5281.985f, 82.207f, 0}, // 19 Koltira loc2 + {2273.289f, -5273.675f, 81.701f, 0}, // 20 Thassarian loc1 + {2273.332f, -5275.544f, 81.849f, 0}, // 21 Thassarian loc2 + {2281.198f, -5257.397f, 80.224f, 4.66f}, // 22 Alexandros loc1 + {2281.156f, -5259.934f, 80.647f, 0}, // 23 Alexandros loc2 + {2281.294f, -5281.895f, 82.445f, 1.35f}, // 24 Darion loc1 + {2281.093f, -5263.013f, 81.125f, 0}, // 25 Darion loc1 + {2281.313f, -5250.282f, 79.322f, 4.69f}, // 26 Lich King spawns + {2281.523f, -5261.058f, 80.877f, 0}, // 27 Lich king move forwards + {2272.709f, -5255.552f, 78.226f, 0}, // 28 Lich king kicked + {2273.972f, -5257.676f, 78.862f, 0} // 29 Lich king moves forward }; class npc_highlord_darion_mograine : public CreatureScript @@ -1133,7 +1133,7 @@ public: case 48: // Show the cleansing effect (dawn of light) //if (GameObject* pGo = me->GetMap()->GetGameObject(uiDawnofLightGUID)) // pGo->SetPhaseMask(128, true); - me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896, -5287.914, 83.066, 0, 0, 0, 0, 0, 30000); + me->SummonGameObject(GO_LIGHT_OF_DAWN, 2283.896f, -5287.914f, 83.066f, 0, 0, 0, 0, 0, 30000); if (Creature* pTemp = Unit::GetCreature(*me, uiTirionGUID)) { if (pTemp->HasAura(SPELL_REBIRTH_OF_THE_ASHBRINGER, 0)) @@ -1411,7 +1411,7 @@ public: if (uiFight_duration <= diff + 5000) { if (!uiTirionGUID) - if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) + if (Unit* pTemp = me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING, LightofDawnLoc[0].x, LightofDawnLoc[0].y, LightofDawnLoc[0].z, 1.528f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 600000)) { pTemp->setFaction(me->getFaction()); pTemp->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(EQUIP_UNEQUIP)); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index c98481f9a18..ca36128561e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -89,33 +89,33 @@ struct Locations static Locations FlightPoint[]= { - {1754.00,1346.00,17.50}, - {1765.00,1347.00,19.00}, - {1784.00,1346.80,25.40}, - {1803.30,1347.60,33.00}, - {1824.00,1350.00,42.60}, - {1838.80,1353.20,49.80}, - {1852.00,1357.60,55.70}, - {1861.30,1364.00,59.40}, - {1866.30,1374.80,61.70}, - {1864.00,1387.30,63.20}, - {1854.80,1399.40,64.10}, - {1844.00,1406.90,64.10}, - {1824.30,1411.40,63.30}, - {1801.00,1412.30,60.40}, - {1782.00,1410.10,55.50}, - {1770.50,1405.20,50.30}, - {1765.20,1400.70,46.60}, - {1761.40,1393.40,41.70}, - {1759.10,1386.70,36.60}, - {1757.80,1378.20,29.00}, - {1758.00,1367.00,19.51} + {1754.00f,1346.00f,17.50f}, + {1765.00f,1347.00f,19.00f}, + {1784.00f,1346.80f,25.40f}, + {1803.30f,1347.60f,33.00f}, + {1824.00f,1350.00f,42.60f}, + {1838.80f,1353.20f,49.80f}, + {1852.00f,1357.60f,55.70f}, + {1861.30f,1364.00f,59.40f}, + {1866.30f,1374.80f,61.70f}, + {1864.00f,1387.30f,63.20f}, + {1854.80f,1399.40f,64.10f}, + {1844.00f,1406.90f,64.10f}, + {1824.30f,1411.40f,63.30f}, + {1801.00f,1412.30f,60.40f}, + {1782.00f,1410.10f,55.50f}, + {1770.50f,1405.20f,50.30f}, + {1765.20f,1400.70f,46.60f}, + {1761.40f,1393.40f,41.70f}, + {1759.10f,1386.70f,36.60f}, + {1757.80f,1378.20f,29.00f}, + {1758.00f,1367.00f,19.51f} }; static Locations Spawn[]= { - {1776.27,1348.74,19.20}, //spawn point for pumpkin shrine mob - {1765.28,1347.46,17.55} //spawn point for smoke + {1776.27f,1348.74f,19.20f}, //spawn point for pumpkin shrine mob + {1765.28f,1347.46f,17.55f} //spawn point for smoke }; static const char* Text[]= @@ -194,7 +194,7 @@ public: if (!who || Creaturetype != 1 || !who->isTargetableForAttack()) return; - if (me->IsWithinDist(who, 0.1, false) && !who->HasAura(SPELL_SQUASH_SOUL)) + if (me->IsWithinDist(who, 0.1f, false) && !who->HasAura(SPELL_SQUASH_SOUL)) DoCast(who, SPELL_SQUASH_SOUL); } @@ -718,7 +718,7 @@ public: if (cleave <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); - cleave = urand(2000,6000); //1 cleave per 2.0-6.0sec + cleave = urand(2000,6000); //1 cleave per 2.0f-6.0fsec } else cleave -= diff; } } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index cd6ba9a9f18..d94ece456c0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -80,7 +80,7 @@ public: void JustDied(Unit* /*killer*/) { for (uint8 i = 0; i < 20; ++i) - me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18, -431.58, 17.09, 6.22, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); + me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18f, -431.58f, 17.09f, 6.22f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index ec2041049f1..7ae7311b4eb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -133,7 +133,7 @@ public: { m_pInstance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, IN_PROGRESS); - Whitemane->GetMotionMaster()->MovePoint(1,1163.113370,1398.856812,32.527786); + Whitemane->GetMotionMaster()->MovePoint(1,1163.113370f,1398.856812f,32.527786f); me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MoveIdle(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 847989829ea..677a02b0187 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -30,25 +30,25 @@ EndScriptData */ #define SPELL_SHADOWSHIELD 22417 //Not right ID. But 12040 is wrong either. #define SPELL_CURSE 18702 -#define ADD_1X 170.205 -#define ADD_1Y 99.413 -#define ADD_1Z 104.733 -#define ADD_1O 3.16 - -#define ADD_2X 170.813 -#define ADD_2Y 97.857 -#define ADD_2Z 104.713 -#define ADD_2O 3.16 - -#define ADD_3X 170.720 -#define ADD_3Y 100.900 -#define ADD_3Z 104.739 -#define ADD_3O 3.16 - -#define ADD_4X 171.866 -#define ADD_4Y 99.373 -#define ADD_4Z 104.732 -#define ADD_4O 3.16 +#define ADD_1X 170.205f +#define ADD_1Y 99.413f +#define ADD_1Z 104.733f +#define ADD_1O 3.16f + +#define ADD_2X 170.813f +#define ADD_2Y 97.857f +#define ADD_2Z 104.713f +#define ADD_2O 3.16f + +#define ADD_3X 170.720f +#define ADD_3Y 100.900f +#define ADD_3Z 104.739f +#define ADD_3O 3.16f + +#define ADD_4X 171.866f +#define ADD_4Y 99.373f +#define ADD_4Z 104.732f +#define ADD_4O 3.16f class boss_darkmaster_gandling : public CreatureScript { @@ -135,80 +135,80 @@ public: switch(rand()%6) { case 0: - DoTeleportPlayer(pTarget, 250.0696,0.3921,84.8408,3.149); - Summoned = me->SummonCreature(16119,254.2325,0.3417,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f,0.3921f,84.8408f,3.149f); + Summoned = me->SummonCreature(16119,254.2325f,0.3417f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133,4.0226,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,257.7133f,4.0226f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702,-2.60656,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,258.6702f,-2.60656f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, 181.4220,-91.9481,84.8410,1.608); - Summoned = me->SummonCreature(16119,184.0519,-73.5649,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,84.8410f,1.608f); + Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951,-73.7045,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452,-78.2143,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274,-78.1518,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,84.8407f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget, 95.1547,-1.8173,85.2289,0.043); - Summoned = me->SummonCreature(16119,100.9404,-1.8016,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 95.1547f,-1.8173f,85.2289f,0.043f); + Summoned = me->SummonCreature(16119,100.9404f,-1.8016f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.3729,0.4882,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,101.3729f,0.4882f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,101.4596,-4.4740,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,101.4596f,-4.4740f,85.2289f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 3: - DoTeleportPlayer(pTarget, 250.0696,0.3921,72.6722,3.149); - Summoned = me->SummonCreature(16119,240.34481,0.7368,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 250.0696f,0.3921f,72.6722f,3.149f); + Summoned = me->SummonCreature(16119,240.34481f,0.7368f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.3633,-2.9520,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,240.3633f,-2.9520f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,240.6702,3.34949,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,240.6702f,3.34949f,72.6722f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 4: - DoTeleportPlayer(pTarget, 181.4220,-91.9481,70.7734,1.608); - Summoned = me->SummonCreature(16119,184.0519,-73.5649,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 181.4220f,-91.9481f,70.7734f,1.608f); + Summoned = me->SummonCreature(16119,184.0519f,-73.5649f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,179.5951,-73.7045,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,179.5951f,-73.7045f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,180.6452,-78.2143,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,180.6452f,-78.2143f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,283.2274,-78.1518,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,283.2274f,-78.1518f,70.7734f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; case 5: - DoTeleportPlayer(pTarget, 106.1541,-1.8994,75.3663,0.043); - Summoned = me->SummonCreature(16119,115.3945,-1.5555,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + DoTeleportPlayer(pTarget, 106.1541f,-1.8994f,75.3663f,0.043f); + Summoned = me->SummonCreature(16119,115.3945f,-1.5555f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,257.7133,1.8066,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,257.7133f,1.8066f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); - Summoned = me->SummonCreature(16119,258.6702,-5.1001,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + Summoned = me->SummonCreature(16119,258.6702f,-5.1001f,75.3663f,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); if (Summoned) Summoned->AI()->AttackStart(pTarget); break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index ec3a220d6cf..0bac76be60b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -68,7 +68,7 @@ public: pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 5cd253a4fd8..0eb2733dfa5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -66,7 +66,7 @@ public: pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 61206eeb0ac..abe7dc9252d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -73,7 +73,7 @@ public: pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 0cd36027788..e986f351f04 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -62,7 +62,7 @@ public: pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index 35c0b77bd20..45af5639f7a 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -66,7 +66,7 @@ public: pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 2e0ab8ce201..676de9461bd 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -68,7 +68,7 @@ public: pInstance->SetData(DATA_THERAVENIAN_DEATH, 0); if (pInstance->GetData(TYPE_GANDLING) == IN_PROGRESS) - me->SummonCreature(1853, 180.73, -9.43856, 75.507, 1.61399, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(1853, 180.73f, -9.43856f, 75.507f, 1.61399f, TEMPSUMMON_DEAD_DESPAWN, 0); } } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 89d6979e084..b2a893971dd 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -48,11 +48,11 @@ enum eEnums const Position SpawnLocation[] = { - {-148.199,2165.647,128.448,1.026}, - {-153.110,2168.620,128.448,1.026}, - {-145.905,2180.520,128.448,4.183}, - {-140.794,2178.037,128.448,4.090}, - {-138.640,2170.159,136.577,2.737} + {-148.199f,2165.647f,128.448f,1.026f}, + {-153.110f,2168.620f,128.448f,1.026f}, + {-145.905f,2180.520f,128.448f,4.183f}, + {-140.794f,2178.037f,128.448f,4.090f}, + {-138.640f,2170.159f,136.577f,2.737f} }; class instance_shadowfang_keep : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 845c61afa39..b0587250154 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -33,35 +33,35 @@ EndScriptData */ #define SAY_4 "So you see fit to toy with the Lich King's creations? Ramstein, be sure to give the intruders a proper greeting." #define SAY_5 "Time to take matters into my own hands. Come. Enter my domain and challenge the might of the Scourge!" -#define ADD_1X 4017.403809 -#define ADD_1Y -3339.703369 -#define ADD_1Z 115.057655 -#define ADD_1O 5.487860 - -#define ADD_2X 4013.189209 -#define ADD_2Y -3351.808350 -#define ADD_2Z 115.052254 -#define ADD_2O 0.134280 - -#define ADD_3X 4017.738037 -#define ADD_3Y -3363.478016 -#define ADD_3Z 115.057274 -#define ADD_3O 0.723313 - -#define ADD_4X 4048.877197 -#define ADD_4Y -3363.223633 -#define ADD_4Z 115.054253 -#define ADD_4O 3.627735 - -#define ADD_5X 4051.777588 -#define ADD_5Y -3350.893311 -#define ADD_5Z 115.055351 -#define ADD_5O 3.066176 - -#define ADD_6X 4048.375977 -#define ADD_6Y -3339.966309 -#define ADD_6Z 115.055222 -#define ADD_6O 2.457497 +#define ADD_1X 4017.403809f +#define ADD_1Y -3339.703369f +#define ADD_1Z 115.057655f +#define ADD_1O 5.487860f + +#define ADD_2X 4013.189209f +#define ADD_2Y -3351.808350f +#define ADD_2Z 115.052254f +#define ADD_2O 0.134280f + +#define ADD_3X 4017.738037f +#define ADD_3Y -3363.478016f +#define ADD_3Z 115.057274f +#define ADD_3O 0.723313f + +#define ADD_4X 4048.877197f +#define ADD_4Y -3363.223633f +#define ADD_4Z 115.054253f +#define ADD_4O 3.627735f + +#define ADD_5X 4051.777588f +#define ADD_5Y -3350.893311f +#define ADD_5Z 115.055351f +#define ADD_5O 3.066176f + +#define ADD_6X 4048.375977f +#define ADD_6Y -3339.966309f +#define ADD_6Z 115.055222f +#define ADD_6O 2.457497f #define SPELL_SHADOWBOLT 17393 #define SPELL_CLEAVE 15284 diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index 151a26d1a09..280e4a57d0c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -26,50 +26,50 @@ EndScriptData */ #include "ScriptPCH.h" //front, left -#define ADD_1X 3553.851807 -#define ADD_1Y -2945.885986 -#define ADD_1Z 125.001015 -#define ADD_1O 0.592007 +#define ADD_1X 3553.851807f +#define ADD_1Y -2945.885986f +#define ADD_1Z 125.001015f +#define ADD_1O 0.592007f //front, right -#define ADD_2X 3559.206299 -#define ADD_2Y -2952.929932 -#define ADD_2Z 125.001015 -#define ADD_2O 0.592007 +#define ADD_2X 3559.206299f +#define ADD_2Y -2952.929932f +#define ADD_2Z 125.001015f +#define ADD_2O 0.592007f //mid, left -#define ADD_3X 3552.417480 -#define ADD_3Y -2948.667236 -#define ADD_3Z 125.001015 -#define ADD_3O 0.592007 +#define ADD_3X 3552.417480f +#define ADD_3Y -2948.667236f +#define ADD_3Z 125.001015f +#define ADD_3O 0.592007f //mid, right -#define ADD_4X 3555.651855 -#define ADD_4Y -2953.519043 -#define ADD_4Z 125.001015 -#define ADD_4O 0.592007 +#define ADD_4X 3555.651855f +#define ADD_4Y -2953.519043f +#define ADD_4Z 125.001015f +#define ADD_4O 0.592007f //back, left -#define ADD_5X 3547.927246 -#define ADD_5Y -2950.977295 -#define ADD_5Z 125.001015 -#define ADD_5O 0.592007 +#define ADD_5X 3547.927246f +#define ADD_5Y -2950.977295f +#define ADD_5Z 125.001015f +#define ADD_5O 0.592007f //back, mid -#define ADD_6X 3553.094697 -#define ADD_6Y -2952.123291 -#define ADD_6Z 125.001015 -#define ADD_6O 0.592007 +#define ADD_6X 3553.094697f +#define ADD_6Y -2952.123291f +#define ADD_6Z 125.001015f +#define ADD_6O 0.592007f //back, right -#define ADD_7X 3552.727539 -#define ADD_7Y -2957.776123 -#define ADD_7Z 125.001015 -#define ADD_7O 0.592007 +#define ADD_7X 3552.727539f +#define ADD_7Y -2957.776123f +#define ADD_7Z 125.001015f +#define ADD_7O 0.592007f //behind, left -#define ADD_8X 3547.156250 -#define ADD_8Y -2953.162354 -#define ADD_8Z 125.001015 -#define ADD_8O 0.592007 +#define ADD_8X 3547.156250f +#define ADD_8Y -2953.162354f +#define ADD_8Z 125.001015f +#define ADD_8O 0.592007f //behind, right -#define ADD_9X 3550.202148 -#define ADD_9Y -2957.437744 -#define ADD_9Z 125.001015 -#define ADD_9O 0.592007 +#define ADD_9X 3550.202148f +#define ADD_9Y -2957.437744f +#define ADD_9Z 125.001015f +#define ADD_9O 0.592007f #define SPELL_KNOCKAWAY 10101 #define SPELL_PUMMEL 15615 diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 733fcb8e717..baf040dbaa4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -54,15 +54,15 @@ struct SummonDef SummonDef m_aSummonPoint[]= { - {3444.156, -3090.626, 135.002, 2.240}, //G1 front, left - {3449.123, -3087.009, 135.002, 2.240}, //G1 front, right - {3446.246, -3093.466, 135.002, 2.240}, //G1 back left - {3451.160, -3089.904, 135.002, 2.240}, //G1 back, right - - {3457.995, -3080.916, 135.002, 3.784}, //G2 front, left - {3454.302, -3076.330, 135.002, 3.784}, //G2 front, right - {3460.975, -3078.901, 135.002, 3.784}, //G2 back left - {3457.338, -3073.979, 135.002, 3.784} //G2 back, right + {3444.156f, -3090.626f, 135.002f, 2.240f}, //G1 front, left + {3449.123f, -3087.009f, 135.002f, 2.240f}, //G1 front, right + {3446.246f, -3093.466f, 135.002f, 2.240f}, //G1 back left + {3451.160f, -3089.904f, 135.002f, 2.240f}, //G1 back, right + + {3457.995f, -3080.916f, 135.002f, 3.784f}, //G2 front, left + {3454.302f, -3076.330f, 135.002f, 3.784f}, //G2 front, right + {3460.975f, -3078.901f, 135.002f, 3.784f}, //G2 back left + {3457.338f, -3073.979f, 135.002f, 3.784f} //G2 back, right }; class boss_dathrohan_balnazzar : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 51f599d9167..7915cb19000 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -67,7 +67,7 @@ public: { for (uint8 i = 0; i < 30; ++i) { - if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) + if (Creature* mob = me->SummonCreature(C_MINDLESS_UNDEAD,3969.35f+irand(-10,10),-3391.87f+irand(-10,10),119.11f,5.91f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000)) mob->AI()->AttackStart(me->SelectNearestTarget(500)); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 4e55821ee4f..6aa5840b109 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -277,7 +277,7 @@ public: //a bit itchy, it should close the door after 10 secs, but it doesn't. skipping it for now. //UpdateGoState(ziggurat4GUID,0,true); if (Creature* pBaron = instance->GetCreature(baronGUID)) - pBaron->SummonCreature(C_RAMSTEIN,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); + pBaron->SummonCreature(C_RAMSTEIN,4032.84f,-3390.24f,119.73f,4.71f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); sLog.outDebug("TSCR: Instance Stratholme: Ramstein spawned."); } else @@ -442,7 +442,7 @@ public: if (Creature* pBaron = instance->GetCreature(baronGUID)) { for (uint8 i = 0; i < 4; ++i) - pBaron->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); + pBaron->SummonCreature(C_BLACK_GUARD,4032.84f,-3390.24f,119.73f,4.71f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); HandleGameObject(ziggurat4GUID, true); HandleGameObject(ziggurat5GUID, true); diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 7f230050777..d399e77ca81 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -44,7 +44,7 @@ public: if (InstanceScript* pInstance = pPlayer->GetInstanceScript()) { if (!pPlayer->FindNearestCreature(15362,15)) - pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); + pPlayer->SummonCreature(15362, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); return false; } return false; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index dc0c0ffc72c..a81c607e754 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -256,7 +256,7 @@ public: me->CastStop(SPELL_FOG_BREATH); me->RemoveAurasDueToSpell(SPELL_FOG_BREATH); me->SetUnitMovementFlags(MOVEMENTFLAG_NONE); - me->SetSpeed(MOVE_RUN, 2.0); + me->SetSpeed(MOVE_RUN, 2.0f); events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000)); events.ScheduleEvent(EVENT_CORROSION, urand(10000, 20000)); @@ -535,7 +535,7 @@ public: mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c) { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetSpeed(MOVE_RUN, 0.8); + me->SetSpeed(MOVE_RUN, 0.8f); } void Reset() {} void EnterCombat(Unit* /*who*/) @@ -570,7 +570,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_TRAIL_TRIGGER, true); me->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01); // core bug + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug } void Reset() {} void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 7dbb46ea270..78051871384 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -96,8 +96,8 @@ enum SWPActions #define CENTER_Y 930 #define RADIUS 30 -#define DRAGON_REALM_Z 53.079 -#define DEMON_REALM_Z -74.558 +#define DRAGON_REALM_Z 53.079f +#define DEMON_REALM_Z -74.558f #define MAX_PLAYERS_IN_SPECTRAL_REALM 0 //over this, teleport object won't work, 0 disables check diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index d123436d8cd..9a0ce4cca45 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -90,7 +90,7 @@ enum Spells SPELL_REBIRTH = 44200, // Emerge from the Sunwell SPELL_SOUL_FLAY = 45442, // 9k Shadow damage over 3 seconds. Spammed throughout all the fight. SPELL_SOUL_FLAY_SLOW = 47106, - SPELL_LEGION_LIGHTNING = 45664, // Chain Lightning, 4 targets, ~3k Shadow damage, 1.5k mana burn + SPELL_LEGION_LIGHTNING = 45664, // Chain Lightning, 4 targets, ~3k Shadow damage, 1.5fk mana burn SPELL_FIRE_BLOOM = 45641, // Places a debuff on 5 raid members, which causes them to deal 2k Fire damage to nearby allies and selves. MIGHT NOT WORK SPELL_DESTROY_ALL_DRAKES = 46707, // when he use it? @@ -157,8 +157,8 @@ enum Spells #define ERROR_KJ_NOT_SUMMONED "TSCR ERROR: Unable to summon Kil'Jaeden for some reason" /*** Others ***/ -#define FLOOR_Z 28.050388 -#define SHIELD_ORB_Z 45.000 +#define FLOOR_Z 28.050388f +#define SHIELD_ORB_Z 45.000f enum Phase { @@ -193,18 +193,18 @@ enum KilJaedenTimers // Locations of the Hand of Deceiver adds Position DeceiverLocations[3]= { - {1682.045, 631.299, 5.936}, - {1684.099, 618.848, 0.589}, - {1694.170, 612.272, 1.416}, + {1682.045f, 631.299f, 5.936f}, + {1684.099f, 618.848f, 0.589f}, + {1694.170f, 612.272f, 1.416f}, }; // Locations, where Shield Orbs will spawn float ShieldOrbLocations[4][2]= { - {1698.900, 627.870}, // middle pont of Sunwell - {12, 3.14}, // First one spawns northeast of KJ - {12, 3.14/0.7}, // Second one spawns southeast - {12, 3.14*3.8} // Third one spawns (?) + {1698.900f, 627.870f}, // middle pont of Sunwell + {12, 3.14f}, // First one spawns northeast of KJ + {12, 3.14f/0.7f}, // Second one spawns southeast + {12, 3.14f*3.8f} // Third one spawns (?) }; struct Speech diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index e8fd7445795..2fdc3d3b843 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -80,24 +80,24 @@ enum BossTimers{ float DarkFiends[8][4] = { - {1819.9, 609.80, 69.74, 1.94}, - {1829.39, 617.89, 69.73, 2.61}, - {1801.98, 633.62, 69.74, 5.71}, - {1830.88, 629.99, 69.73, 3.52}, - {1800.38, 621.41, 69.74, 0.22}, - {1808.3 , 612.45, 69.73, 1.02}, - {1823.9 , 639.69, 69.74, 4.12}, - {1811.85, 640.46, 69.73, 4.97} + {1819.9f, 609.80f, 69.74f, 1.94f}, + {1829.39f, 617.89f, 69.73f, 2.61f}, + {1801.98f, 633.62f, 69.74f, 5.71f}, + {1830.88f, 629.99f, 69.73f, 3.52f}, + {1800.38f, 621.41f, 69.74f, 0.22f}, + {1808.3f , 612.45f, 69.73f, 1.02f}, + {1823.9f , 639.69f, 69.74f, 4.12f}, + {1811.85f, 640.46f, 69.73f, 4.97f} }; float Humanoides[6][5] = { - {CREATURE_FURY_MAGE, 1780.16, 666.83, 71.19, 5.21}, - {CREATURE_FURY_MAGE, 1847.93, 600.30, 71.30, 2.57}, - {CREATURE_BERSERKER, 1779.97, 660.64, 71.19, 5.28}, - {CREATURE_BERSERKER, 1786.2 , 661.01, 71.19, 4.51}, - {CREATURE_BERSERKER, 1845.17, 602.63, 71.28, 2.43}, - {CREATURE_BERSERKER, 1842.91, 599.93, 71.23, 2.44} + {CREATURE_FURY_MAGE, 1780.16f, 666.83f, 71.19f, 5.21f}, + {CREATURE_FURY_MAGE, 1847.93f, 600.30f, 71.30f, 2.57f}, + {CREATURE_BERSERKER, 1779.97f, 660.64f, 71.19f, 5.28f}, + {CREATURE_BERSERKER, 1786.2f , 661.01f, 71.19f, 4.51f}, + {CREATURE_BERSERKER, 1845.17f, 602.63f, 71.28f, 2.43f}, + {CREATURE_BERSERKER, 1842.91f, 599.93f, 71.23f, 2.44f} }; uint32 EnrageTimer = 600000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 0b026ce826d..2e7598284d3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -96,11 +96,11 @@ EndScriptData */ #define SPELL_WR_WHIRLWIND 43442 #define SPELL_WR_MORTAL_STRIKE 43441 -#define ORIENT 1.5696 -#define POS_Y 921.2795 -#define POS_Z 33.8883 +#define ORIENT 1.5696f +#define POS_Y 921.2795f +#define POS_Z 33.8883f -static float Pos_X[4] = {112.8827, 107.8827, 122.8827, 127.8827}; +static float Pos_X[4] = {112.8827f, 107.8827f, 122.8827f, 127.8827f}; static uint32 AddEntryList[8]= { @@ -348,7 +348,7 @@ class boss_hexlord_malacrass : public CreatureScript if (ResetTimer <= diff) { - if (me->IsWithinDist3d(119.223, 1035.45, 29.4481, 10)) + if (me->IsWithinDist3d(119.223f, 1035.45f, 29.4481f, 10)) { EnterEvadeMode(); return; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 3604a5d3678..e5a98ee686d 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -73,32 +73,32 @@ const int area_dy = 51; float JanalainPos[1][3] = { - {-33.93, 1149.27, 19} + {-33.93f, 1149.27f, 19} }; float FireWallCoords[4][4] = { - {-10.13, 1149.27, 19, 3.1415}, - {-33.93, 1123.90, 19, 0.5*3.1415}, - {-54.80, 1150.08, 19, 0}, - {-33.93, 1175.68, 19, 1.5*3.1415} + {-10.13f, 1149.27f, 19, 3.1415f}, + {-33.93f, 1123.90f, 19, 0.5f*3.1415f}, + {-54.80f, 1150.08f, 19, 0}, + {-33.93f, 1175.68f, 19, 1.5f*3.1415f} }; float hatcherway[2][5][3] = { { - {-87.46,1170.09,6}, - {-74.41,1154.75,6}, - {-52.74,1153.32,19}, - {-33.37,1172.46,19}, - {-33.09,1203.87,19} + {-87.46f,1170.09f,6}, + {-74.41f,1154.75f,6}, + {-52.74f,1153.32f,19}, + {-33.37f,1172.46f,19}, + {-33.09f,1203.87f,19} }, { - {-86.57,1132.85,6}, - {-73.94,1146.00,6}, - {-52.29,1146.51,19}, - {-33.57,1125.72,19}, - {-34.29,1095.22,19} + {-86.57f,1132.85f,6}, + {-73.94f,1146.00f,6}, + {-52.29f,1146.51f,19}, + {-33.57f,1125.72f,19}, + {-34.29f,1095.22f,19} } }; class boss_janalai : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6bcc5553e1d..6ae25708bf9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -30,14 +30,14 @@ EndScriptData */ //Trash Waves float NalorakkWay[8][3] = { - { 18.569, 1414.512, 11.42},// waypoint 1 - {-17.264, 1419.551, 12.62}, - {-52.642, 1419.357, 27.31},// waypoint 2 - {-69.908, 1419.721, 27.31}, - {-79.929, 1395.958, 27.31}, - {-80.072, 1374.555, 40.87},// waypoint 3 - {-80.072, 1314.398, 40.87}, - {-80.072, 1295.775, 48.60} // waypoint 4 + { 18.569f, 1414.512f, 11.42f},// waypoint 1 + {-17.264f, 1419.551f, 12.62f}, + {-52.642f, 1419.357f, 27.31f},// waypoint 2 + {-69.908f, 1419.721f, 27.31f}, + {-79.929f, 1395.958f, 27.31f}, + {-80.072f, 1374.555f, 40.87f},// waypoint 3 + {-80.072f, 1314.398f, 40.87f}, + {-80.072f, 1295.775f, 48.60f} // waypoint 4 }; #define YELL_NALORAKK_WAVE1 "Get da move on, guards! It be killin' time!" @@ -317,7 +317,7 @@ class boss_nalorakk : public CreatureScript switch(MovePhase) { case 2: - me->SetOrientation(3.1415*2); + me->SetOrientation(3.1415f*2); inMove = false; return; case 1: @@ -329,11 +329,11 @@ class boss_nalorakk : public CreatureScript inMove = true; return; case 5: - me->SetOrientation(3.1415*0.5); + me->SetOrientation(3.1415f*0.5f); inMove = false; return; case 7: - me->SetOrientation(3.1415*0.5); + me->SetOrientation(3.1415f*0.5f); inMove = false; return; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 40eb40f6fcf..964ae32fb59 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -107,9 +107,9 @@ EndScriptData */ #define PHASE_TROLL 4 //coords for going for changing form -#define CENTER_X 120.148811 -#define CENTER_Y 703.713684 -#define CENTER_Z 45.111477 +#define CENTER_X 120.148811f +#define CENTER_Y 703.713684f +#define CENTER_Z 45.111477f struct SpiritInfoStruct { @@ -119,10 +119,10 @@ struct SpiritInfoStruct static SpiritInfoStruct SpiritInfo[] = { - {23878, 147.87, 706.51, 45.11, 3.04}, - {23880, 88.95, 705.49, 45.11, 6.11}, - {23877, 137.23, 725.98, 45.11, 3.71}, - {23879, 104.29, 726.43, 45.11, 5.43} + {23878, 147.87f, 706.51f, 45.11f, 3.04f}, + {23880, 88.95f, 705.49f, 45.11f, 6.11f}, + {23877, 137.23f, 725.98f, 45.11f, 3.71f}, + {23879, 104.29f, 726.43f, 45.11f, 5.43f} }; struct TransformStruct @@ -191,7 +191,7 @@ class boss_zuljin : public CreatureScript Phase = 0; - health_20 = me->GetMaxHealth()*0.2; + health_20 = me->GetMaxHealth()*0.2f; Intro_Timer = 37000; Berserk_Timer = 600000; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 58df6fb7dd4..9ff1751ffc2 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -44,10 +44,10 @@ struct SHostageInfo static SHostageInfo HostageInfo[] = { - {23790, 186648, -57, 1343, 40.77, 3.2}, // bear - {23999, 187021, 400, 1414, 74.36, 3.3}, // eagle - {24001, 186672, -35, 1134, 18.71, 1.9}, // dragonhawk - {24024, 186667, 413, 1117, 6.32, 3.1} // lynx + {23790, 186648, -57, 1343, 40.77f, 3.2f}, // bear + {23999, 187021, 400, 1414, 74.36f, 3.3f}, // eagle + {24001, 186672, -35, 1134, 18.71f, 1.9f}, // dragonhawk + {24024, 186667, 413, 1117, 6.32f, 3.1f} // lynx }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 28d21499e30..090e9193019 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -133,8 +133,8 @@ class boss_arlokk : public CreatureScript if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget); - me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998, -1649.6734, 41.4800, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.9970, -1606.4840, 41.2979, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.9970f, -1606.4840f, 41.2979f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); } void JustSummoned(Creature* pSummoned) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 0c5db040b19..26c10986ad5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -139,21 +139,21 @@ class boss_jeklik : public CreatureScript Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); Creature* Bat = NULL; - Bat = me->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12289.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); - Bat = me->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Bat = me->SummonCreature(11368,-12293.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (pTarget && Bat) Bat ->AI()->AttackStart(pTarget); SpawnBats_Timer = 60000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index fb72ad61abd..b4aab45f310 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -127,7 +127,7 @@ class boss_jindo : public CreatureScript pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoTeleportPlayer(pTarget, -11583.7783,-1249.4278,77.5471,4.745); + DoTeleportPlayer(pTarget, -11583.7783f,-1249.4278f,77.5471f,4.745f); if (DoGetThreat(me->getVictim())) DoModifyThreatPercent(pTarget,-100); diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp index 8ded637e312..521eb24cd24 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp @@ -78,8 +78,8 @@ class npc_professor_phizzlethorpe : public CreatureScript case 8:DoScriptText(EMOTE_PROGRESS_4, me);break; case 9: { - me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); + me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); break; } case 10:DoScriptText(SAY_PROGRESS_5, me, pPlayer);break; diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 904e1001dcf..cbc4c45b70c 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -38,7 +38,7 @@ public: { if (pPlayer->HasQuestForItem(21149)) { - if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16,-489.57,49.95,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) + if (Unit* TCorrupter = pPlayer->SummonCreature(15625,-10328.16f,-489.57f,49.95f,0,TEMPSUMMON_MANUAL_DESPAWN,60000)) { TCorrupter->setFaction(14); TCorrupter->SetMaxHealth(832750); diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 997f79033fb..6dab06ff8b8 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -166,10 +166,10 @@ struct Locations static Locations SpawnPosition[]= { - {5.3, -11.8, 0.361, 4.2}, - {11.2, -29.17, 0.361, 2.7}, - {-5.7, -34.85, 0.361, 1.09}, - {-11.9, -18, 0.361, 5.87} + {5.3f, -11.8f, 0.361f, 4.2f}, + {11.2f, -29.17f, 0.361f, 2.7f}, + {-5.7f, -34.85f, 0.361f, 1.09f}, + {-11.9f, -18, 0.361f, 5.87f} }; static uint32 PaladinEntry[] = {CHAMPION_BLOODWRATH, CHAMPION_LIGHTREND, CHAMPION_SWIFTBLADE, CHAMPION_SUNSTRIKER}; @@ -582,9 +582,9 @@ public: if (Summon) { - me->SummonCreature(MOB_GHARZUL, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); - me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_GHARZUL, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); + me->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32f, 35.22f, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000); Summon = false; } } @@ -608,14 +608,14 @@ struct Location static Location SpawnLocations[] = { - {8270.68, -7188.53, 139.619}, - {8284.27, -7187.78, 139.603}, - {8297.43, -7193.53, 139.603}, - {8303.5, -7201.96, 139.577}, - {8273.22, -7241.82, 139.382}, - {8254.89, -7222.12, 139.603}, - {8278.51, -7242.13, 139.162}, - {8267.97, -7239.17, 139.517} + {8270.68f, -7188.53f, 139.619f}, + {8284.27f, -7187.78f, 139.603f}, + {8297.43f, -7193.53f, 139.603f}, + {8303.5f, -7201.96f, 139.577f}, + {8273.22f, -7241.82f, 139.382f}, + {8254.89f, -7222.12f, 139.603f}, + {8278.51f, -7242.13f, 139.162f}, + {8267.97f, -7239.17f, 139.517f} }; class npc_infused_crystal : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp index 01ad05afab4..a57ededd846 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp @@ -192,13 +192,13 @@ public: DoScriptText(SAY_PROGRESS1, me, pPlayer); case 11: DoScriptText(SAY_PROGRESS2, me, pPlayer); - me->SetOrientation(4.762841); + me->SetOrientation(4.762841f); break; case 18: { DoScriptText(SAY_PROGRESS3, me, pPlayer); - Creature* Summ1 = me->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0); - Creature* Summ2 = me->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Summ1 = me->SummonCreature(16342, 7627.083984f, -7532.538086f, 152.128616f, 1.082733f, TEMPSUMMON_DEAD_DESPAWN, 0); + Creature* Summ2 = me->SummonCreature(16343, 7620.432129f, -7532.550293f, 152.454865f, 0.827478f, TEMPSUMMON_DEAD_DESPAWN, 0); if (Summ1 && Summ2) { Summ1->Attack(me, true); @@ -214,11 +214,11 @@ public: CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,me); break; case 32: - me->SetOrientation(2.978281); + me->SetOrientation(2.978281f); DoScriptText(SAY_END1, me, pPlayer); break; case 33: - me->SetOrientation(5.858011); + me->SetOrientation(5.858011f); DoScriptText(SAY_END2, me, pPlayer); Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50); if (CaptainHelios) diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp index 519172f4820..564619afeac 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp @@ -178,14 +178,14 @@ struct Location Location m_afAmbushSpawn[] = { - {191.296204, -2839.329346, 107.388}, - {70.972466, -2848.674805, 109.459} + {191.296204f, -2839.329346f, 107.388f}, + {70.972466f, -2848.674805f, 109.459f} }; Location m_afAmbushMoveTo[] = { - {166.630386, -2824.780273, 108.153}, - {70.886589, -2874.335449, 116.675} + {166.630386f, -2824.780273f, 108.153f}, + {70.886589f, -2874.335449f, 116.675f} }; class npc_rinji : public CreatureScript diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp index 8fcb10ad07f..bac35cf7898 100644 --- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp +++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp @@ -96,7 +96,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->TeleportTo(409, 1096, -467, -104.6, 3.64); + pPlayer->TeleportTo(409, 1096, -467, -104.6f, 3.64f); } return true; diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 5c53badb103..2a04a2dc413 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -211,14 +211,14 @@ static float PyrewoodSpawnPoints[3][4] = //pos_x pos_y pos_z orien //outside /* - {-400.85, 1513.64, 18.67, 0}, - {-397.32, 1514.12, 18.67, 0}, - {-397.44, 1511.09, 18.67, 0}, + {-400.85f, 1513.64f, 18.67f, 0}, + {-397.32f, 1514.12f, 18.67f, 0}, + {-397.44f, 1511.09f, 18.67f, 0}, */ //door - {-396.17, 1505.86, 19.77, 0}, - {-396.91, 1505.77, 19.77, 0}, - {-397.94, 1504.74, 19.77, 0}, + {-396.17f, 1505.86f, 19.77f, 0}, + {-396.91f, 1505.77f, 19.77f, 0}, + {-397.94f, 1504.74f, 19.77f, 0}, }; #define WAIT_SECS 6000 diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 18a1eec322a..63a7a5b7167 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -360,9 +360,9 @@ public: break; case 16: SetEscortPaused(true); - if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352, 480.069733, 123.760895, 4.941504, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature *pMarzon = me->SummonCreature(NPC_MARZON_BLADE,-8411.360352f, 480.069733f, 123.760895f, 4.941504f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) { - pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977, 468.611450, 123.759903); + pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977f, 468.611450f, 123.759903f); MarzonGUID = pMarzon->GetGUID(); } uiTimer = 2000; diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index eee9f156bc4..dcab41fbc9e 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -180,7 +180,7 @@ public: if (GameObject* pTrigger = pPlayer->FindNearestGameObject(GO_TRIGGER, 30.0f)) { pTrigger->SetGoState(GO_STATE_READY); - pPlayer->SummonCreature(NPC_ULAG, 2390.26, 336.47, 40.01, 2.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); + pPlayer->SummonCreature(NPC_ULAG, 2390.26f, 336.47f, 40.01f, 2.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000); return false; } diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 31e67d985a9..68de91533e9 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -48,14 +48,14 @@ EndContentData */ float HighborneLoc[4][3]= { - {1285.41, 312.47, 0.51}, - {1286.96, 310.40, 1.00}, - {1289.66, 309.66, 1.52}, - {1292.51, 310.50, 1.99}, + {1285.41f, 312.47f, 0.51f}, + {1286.96f, 310.40f, 1.00f}, + {1289.66f, 309.66f, 1.52f}, + {1292.51f, 310.50f, 1.99f}, }; -#define HIGHBORNE_LOC_Y -61.00 -#define HIGHBORNE_LOC_Y_NEW -55.50 +#define HIGHBORNE_LOC_Y -61.00f +#define HIGHBORNE_LOC_Y_NEW -55.50f class npc_lady_sylvanas_windrunner : public CreatureScript { @@ -105,8 +105,8 @@ public: { if (Unit *pTarget = Unit::GetUnit(*summoned,targetGUID)) { - pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0,0); - pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0, 0.0f); + pTarget->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f,0); + pTarget->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), me->GetPositionZ()+15.0f, 0.0f); summoned->CastSpell(pTarget, SPELL_RIBBON_OF_SOULS, false); } diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index b3ff1bd902d..4cca9ec423a 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -359,7 +359,7 @@ public: case 22: break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86,-1825.42 ,81.99 , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f,-1825.42f ,81.99f , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp index 6621914d789..40460a2ed2c 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/westfall.cpp @@ -113,24 +113,24 @@ public: me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE); break; case 7: - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 8: me->SetSheath(SHEATH_STATE_RANGED); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037, 1570.213, 54.961, 4.283, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 9: me->SetSheath(SHEATH_STATE_RANGED); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836, 1569.755, 54.267, 4.230, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697, 1569.124, 54.421, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237, 1568.307, 54.620, 4.206, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037, 1570.213, 54.961, 4.283, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.018, 1570.738, 54.828, 4.220, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.697f, 1569.124f, 54.421f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.237f, 1568.307f, 54.620f, 4.206f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11448.037f, 1570.213f, 54.961f, 4.283f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_DEFIAS_RAIDER, -11449.018f, 1570.738f, 54.828f, 4.220f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 10: SetRun(false); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4daf10d09cb..624d75f44e5 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -30,7 +30,7 @@ enum eSpells #define GOSSIP_ITEM_MORRIDUNE "Please port me to Darnassus" -const Position HomePosition = {-815.817,-145.299,-25.870, 0}; +const Position HomePosition = {-815.817f,-145.299f,-25.870f, 0}; class go_blackfathom_altar : public GameObjectScript { @@ -207,7 +207,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->TeleportTo(1,9952.239,2284.277,1341.394,1.595); + pPlayer->TeleportTo(1,9952.239f,2284.277f,1341.394f,1.595f); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -242,7 +242,7 @@ public: { case 4: SetEscortPaused(true); - me->SetOrientation(1.775791); + me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); DoScriptText(SAY_MORRIDUNE_2,me); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index abdab32e384..a6fbcdc9e7b 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -36,19 +36,19 @@ EndScriptData */ const Position LorgusPosition[4] = { - { -458.500610, -38.343079, -33.474445 }, - { -469.423615, -88.400513, -39.265102 }, - { -622.354980, -10.350100, -22.777000 }, - { -759.640564, 16.658913, -29.159529 } + { -458.500610f, -38.343079f, -33.474445f }, + { -469.423615f, -88.400513f, -39.265102f }, + { -622.354980f, -10.350100f, -22.777000f }, + { -759.640564f, 16.658913f, -29.159529f } }; const Position SpawnsLocation[] = { - {-775.431, -153.853, -25.871, 3.207}, - {-775.404, -174.132, -25.871, 3.185}, - {-862.430, -154.937, -25.871, 0.060}, - {-862.193, -174.251, -25.871, 6.182}, - {-863.895, -458.899, -33.891, 5.637} + {-775.431f, -153.853f, -25.871f, 3.207f}, + {-775.404f, -174.132f, -25.871f, 3.185f}, + {-862.430f, -154.937f, -25.871f, 0.060f}, + {-862.193f, -174.251f, -25.871f, 6.182f}, + {-863.895f, -458.899f, -33.891f, 5.637f} }; class instance_blackfathom_deeps : public InstanceMapScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 8a67d32b924..4acb8da5e67 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -130,7 +130,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -154,14 +154,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); + AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); + AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); + AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); + AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); + AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); + AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); + AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); + AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 2da5ff0e496..4e2bc5ecc0b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -70,9 +70,9 @@ EndScriptData */ #define CREATURE_ANCIENT_WISP 17946 #define CREATURE_CHANNEL_TARGET 22418 -#define NORDRASSIL_X 5503.713 -#define NORDRASSIL_Y -3523.436 -#define NORDRASSIL_Z 1608.781 +#define NORDRASSIL_X 5503.713f +#define NORDRASSIL_Y -3523.436f +#define NORDRASSIL_Z 1608.781f class mob_ancient_wisp : public CreatureScript { @@ -412,11 +412,11 @@ public: void SummonDoomfire(Unit *pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0,pTarget->GetPositionY()+15.0,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()+15.0f,pTarget->GetPositionY()+15.0f,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0,pTarget->GetPositionY()-15.0,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()-15.0f,pTarget->GetPositionY()-15.0f,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 57cdfb3fb54..b54f31d5036 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -123,7 +123,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -146,14 +146,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); + AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); + AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); + AddWaypoint(2, 5554.58f, -2514.66f, 1476.12f); + AddWaypoint(3, 5554.16f, -2567.23f, 1479.90f); + AddWaypoint(4, 5540.67f, -2625.99f, 1480.89f); + AddWaypoint(5, 5508.16f, -2659.2f, 1480.15f); + AddWaypoint(6, 5489.62f, -2704.05f, 1482.18f); + AddWaypoint(7, 5457.04f, -2726.26f, 1485.10f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 83428348bac..8d6e367a84f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -118,7 +118,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -141,14 +141,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); + AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); + AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); + AddWaypoint(2, 5554.58f, -2514.66f, 1476.12f); + AddWaypoint(3, 5554.16f, -2567.23f, 1479.90f); + AddWaypoint(4, 5540.67f, -2625.99f, 1480.89f); + AddWaypoint(5, 5508.16f, -2659.2f, 1480.15f); + AddWaypoint(6, 5489.62f, -2704.05f, 1482.18f); + AddWaypoint(7, 5457.04f, -2726.26f, 1485.10f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 302aaf538d2..57b3dc98b2d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -138,14 +138,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); + AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); + AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); + AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); + AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); + AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); + AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); + AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); + AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index a3045446692..1423f0dd74a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -40,274 +40,274 @@ EndScriptData */ // Locations for summoning gargoyls and frost wyrms in special cases float SpawnPointSpecial[3][3]= { - {5497.08, -2493.23, 1535.72}, //spawn point for the gargoyles near the horde gate - {5624.53, -2548.12, 1551.54}, //spawn point for the frost wyrm near the horde gate - {5604.41, -2811.98, 1547.77} //spawn point for the gargoyles and wyrms near the horde tower + {5497.08f, -2493.23f, 1535.72f}, //spawn point for the gargoyles near the horde gate + {5624.53f, -2548.12f, 1551.54f}, //spawn point for the frost wyrm near the horde gate + {5604.41f, -2811.98f, 1547.77f} //spawn point for the gargoyles and wyrms near the horde tower }; // Locations for summoning waves in Alliance base float AllianceBase[4][3]= { - {4928.48, -1526.38, 1326.83}, - {4923.54, -1514.29, 1327.98}, - {4928.41, -1510.35, 1327.99}, - {4938.35, -1521.00, 1326.69} + {4928.48f, -1526.38f, 1326.83f}, + {4923.54f, -1514.29f, 1327.98f}, + {4928.41f, -1510.35f, 1327.99f}, + {4938.35f, -1521.00f, 1326.69f} }; float JainaDummySpawn[2][4]= { - {5497.01, -2719.03, 1483.08, 2.90426}, - {5484.98, -2721.69, 1483.39, 6.00656} + {5497.01f, -2719.03f, 1483.08f, 2.90426f}, + {5484.98f, -2721.69f, 1483.39f, 6.00656f} }; // Locations for summoning waves in Horde base float HordeBase[4][3]= { - {5458.01, -2340.27, 1459.60}, - {5466.01, -2334.69, 1460.06}, - {5468.45, -2355.13, 1459.99}, - {5479.06, -2344.16, 1461.74} + {5458.01f, -2340.27f, 1459.60f}, + {5466.01f, -2334.69f, 1460.06f}, + {5468.45f, -2355.13f, 1459.99f}, + {5479.06f, -2344.16f, 1461.74f} }; // Lady Jaina's waypoints when retreathing float JainaWPs[2][3]= { - {5078.56, -1789.79, 1320.73},//next to the small stairs - {5037.38, -1778.39, 1322.61},//center of alliance base + {5078.56f, -1789.79f, 1320.73f},//next to the small stairs + {5037.38f, -1778.39f, 1322.61f},//center of alliance base }; float InfernalPos[8][3]=//spawn points for the infernals in the horde base { - {5453.59, -2764.52, 1493.50}, - {5478.4, -2781.77, 1497.52}, - {5506.09, -2780.53, 1496.32}, - {5532.1, -2763.42, 1492.37}, - {5544.16, -2733.99, 1487.14}, - {5536.19, -2708.18, 1480.01}, - {5510.16, -2691.75, 1479.66}, - {5482.39, -2689.19, 1481.09} + {5453.59f, -2764.52f, 1493.50f}, + {5478.4f, -2781.77f, 1497.52f}, + {5506.09f, -2780.53f, 1496.32f}, + {5532.1f, -2763.42f, 1492.37f}, + {5544.16f, -2733.99f, 1487.14f}, + {5536.19f, -2708.18f, 1480.01f}, + {5510.16f, -2691.75f, 1479.66f}, + {5482.39f, -2689.19f, 1481.09f} }; float InfernalSPWP[26][4]=//spawn points for the infernals in the horde base used in the cleaning wave { - {5490.96, -2718.72, 1482.96, 0.49773}, - {5449.51, -2723.32, 1485.69, 2.69685}, - {5520.83, -2624.68, 1483.82, 1.20459}, - {5558.28, -2629.26, 1485.76, 0.37992}, - {5567.97, -2758.69, 1494.10, 5.04125}, - {5384.90, -2793.47, 1503.90, 5.55412}, - {5495.33, -2814.06, 1501.56, 1.12055}, - {5472.63, -2929.39, 1538.31, 1.95777}, - {5334.72, -2952.29, 1534.34, 0.50869}, - {5398.36, -2872.46, 1512.38, 0.76787}, - {5514.39, -2768.63, 1492.30, 1.55721}, - {5598.91, -2703.75, 1495.64, 2.56644}, - {5467.80, -2655.93, 1482.27, 0.85819}, - {5399.83, -2985.24, 1545.04, 5.92559}, - {5232.13, -2967.05, 1553.09, 5.41351}, - {5272.02, -3082.52, 1567.09, 3.40681}, - {5343.26, -3120.71, 1582.92, 3.16727}, - {5371.26, -3175.24, 1587.41, 6.10466}, - {5434.67, -3177.91, 1579.25, 2.77850}, - {5237.39, -3149.25, 1593.59, 0.83855}, - {5202.15, -3016.64, 1566.28, 3.31256}, - {5302.54, -2914.37, 1528.53, 3.37146}, - {5439.04, -2834.81, 1508.80, 2.14231}, - {5421.33, -2771.04, 1494.28, 6.06223}, - {5549.76, -2692.93, 1482.68, 2.19414}, - {5459.78, -2755.71, 1490.68, 1.05139} + {5490.96f, -2718.72f, 1482.96f, 0.49773f}, + {5449.51f, -2723.32f, 1485.69f, 2.69685f}, + {5520.83f, -2624.68f, 1483.82f, 1.20459f}, + {5558.28f, -2629.26f, 1485.76f, 0.37992f}, + {5567.97f, -2758.69f, 1494.10f, 5.04125f}, + {5384.90f, -2793.47f, 1503.90f, 5.55412f}, + {5495.33f, -2814.06f, 1501.56f, 1.12055f}, + {5472.63f, -2929.39f, 1538.31f, 1.95777f}, + {5334.72f, -2952.29f, 1534.34f, 0.50869f}, + {5398.36f, -2872.46f, 1512.38f, 0.76787f}, + {5514.39f, -2768.63f, 1492.30f, 1.55721f}, + {5598.91f, -2703.75f, 1495.64f, 2.56644f}, + {5467.80f, -2655.93f, 1482.27f, 0.85819f}, + {5399.83f, -2985.24f, 1545.04f, 5.92559f}, + {5232.13f, -2967.05f, 1553.09f, 5.41351f}, + {5272.02f, -3082.52f, 1567.09f, 3.40681f}, + {5343.26f, -3120.71f, 1582.92f, 3.16727f}, + {5371.26f, -3175.24f, 1587.41f, 6.10466f}, + {5434.67f, -3177.91f, 1579.25f, 2.77850f}, + {5237.39f, -3149.25f, 1593.59f, 0.83855f}, + {5202.15f, -3016.64f, 1566.28f, 3.31256f}, + {5302.54f, -2914.37f, 1528.53f, 3.37146f}, + {5439.04f, -2834.81f, 1508.80f, 2.14231f}, + {5421.33f, -2771.04f, 1494.28f, 6.06223f}, + {5549.76f, -2692.93f, 1482.68f, 2.19414f}, + {5459.78f, -2755.71f, 1490.68f, 1.05139f} }; float VeinPos[14][8]=//spawn points of the ancient gem veins { - {5184.84, -1982.59, 1382.66, 2.58079, 0, 0, 0.960944, 0.276742}, //alliance - {5107.66, -2071.16, 1368.37, 2.65148, 0, 0, 0.970124, 0.242611}, //alliance - {5040.53, -2227.65, 1403.17, 3.35049, 0, 0, 0.99455, -0.104257}, //alliance - {5187.59, -2453.12, 1455.51, 5.87943, 0, 0, 0.20051, -0.979692}, //alliance - {5429.43, -2340.65, 1465.38, 4.7681, 0, 0, 0.687138, -0.726527}, //alliance - {5463.99, -2315.95, 1470.29, 1.52045, 0, 0, 0.689084, 0.724682}, //alliance - {5624.65, -2495.09, 1510.11, 0.0124869, 0, 0, 0.00624342, 0.999981}, //alliance - {5285.41, -3348.32, 1663.01, 1.57152, 0, 0, 0.707362, 0.706852}, //horde - {5417.69, -3372.52, 1656.31, 0.361993, 0, 0, 0.18001, 0.983665}, //horde - {5315.34, -3238.32, 1622.88, 3.03627, 0, 0, 0.998614, 0.0526347}, //horde - {5303.4, -3096.44, 1596.41, 1.72073, 0, 0, 0.758081, 0.65216}, //horde - {5265.13, -3177.27, 1616.22, 0.813604, 0, 0, 0.395674, 0.918391}, //horde - {5374.3, -3420.59, 1653.43, 1.45762, 0, 0, 0.665981, 0.745969}, //horde - {5441.54, -3321.59, 1651.55, 0.258306, 0, 0, 0.128794, 0.991671} //horde + {5184.84f, -1982.59f, 1382.66f, 2.58079f, 0, 0, 0.960944f, 0.276742f}, //alliance + {5107.66f, -2071.16f, 1368.37f, 2.65148f, 0, 0, 0.970124f, 0.242611f}, //alliance + {5040.53f, -2227.65f, 1403.17f, 3.35049f, 0, 0, 0.99455f, -0.104257f}, //alliance + {5187.59f, -2453.12f, 1455.51f, 5.87943f, 0, 0, 0.20051f, -0.979692f}, //alliance + {5429.43f, -2340.65f, 1465.38f, 4.7681f, 0, 0, 0.687138f, -0.726527f}, //alliance + {5463.99f, -2315.95f, 1470.29f, 1.52045f, 0, 0, 0.689084f, 0.724682f}, //alliance + {5624.65f, -2495.09f, 1510.11f, 0.0124869f, 0, 0, 0.00624342f, 0.999981f}, //alliance + {5285.41f, -3348.32f, 1663.01f, 1.57152f, 0, 0, 0.707362f, 0.706852f}, //horde + {5417.69f, -3372.52f, 1656.31f, 0.361993f, 0, 0, 0.18001f, 0.983665f}, //horde + {5315.34f, -3238.32f, 1622.88f, 3.03627f, 0, 0, 0.998614f, 0.0526347f}, //horde + {5303.4f, -3096.44f, 1596.41f, 1.72073f, 0, 0, 0.758081f, 0.65216f}, //horde + {5265.13f, -3177.27f, 1616.22f, 0.813604f, 0, 0, 0.395674f, 0.918391f}, //horde + {5374.3f, -3420.59f, 1653.43f, 1.45762f, 0, 0, 0.665981f, 0.745969f}, //horde + {5441.54f, -3321.59f, 1651.55f, 0.258306f, 0, 0, 0.128794f, 0.991671f} //horde }; float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun { - {5279.94, -2049.68, 1311.38, 0},//garg1 - {5289.15, -2219.06, 1291.12, 0},//garg2 - {5202.07, -2136.10, 1305.07, 2.8},//garg3 - {5071.52, -2425.63, 1454.48, 5.54},//garg4 - {5120.65, -2467.92, 1463.93, 2.54}//garg5 + {5279.94f, -2049.68f, 1311.38f, 0},//garg1 + {5289.15f, -2219.06f, 1291.12f, 0},//garg2 + {5202.07f, -2136.10f, 1305.07f, 2.8f},//garg3 + {5071.52f, -2425.63f, 1454.48f, 5.54f},//garg4 + {5120.65f, -2467.92f, 1463.93f, 2.54f}//garg5 }; float AllianceFirePos[92][8]=//spawn points for the fire visuals (GO) in the alliance base { - {5039.9, -1796.84, 1323.88, 2.59222, 0, 0, 0.962511, 0.271243}, - {5087.2, -1795.2, 1320.68, 1.03946, 0, 0, 0.496644, 0.867954}, - {5112.68, -1806.66, 1359.93, 1.37799, 0, 0, 0.63576, 0.771887}, - {5095.61, -1793.27, 1359.78, 0.580806, 0, 0, 0.286338, 0.958129}, - {5090.43, -1784.45, 1360.44, 0.796784, 0, 0, 0.387937, 0.921686}, - {5139.25, -1783.11, 1359.39, 3.30849, 0, 0, 0.99652, -0.0833509}, - {5112.16, -1763.72, 1361.35, 5.10312, 0, 0, 0.556388, -0.830922}, - {4981.18, -1793.98, 1335.7, 3.23072, 0, 0, 0.999007, -0.0445498}, - {4996.57, -1766.75, 1341.62, 3.5331, 0, 0, 0.980902, -0.194505}, - {4983.74, -1769.25, 1345.75, 3.79228, 0, 0, 0.947541, -0.319635}, - {4996.01, -1774.43, 1330.71, 3.07364, 0, 0, 0.999423, 0.0339693}, - {5094.2, -1726.13, 1330.55, 1.56175, 0, 0, 0.703901, 0.710298}, - {5079.82, -1721.24, 1336.26, 1.18868, 0, 0, 0.559964, 0.828517}, - {5077.68, -1717.15, 1327.78, 0.0145145, 0, 0, 0.00725717, 0.999974}, - {5122.27, -1738.22, 1341.67, 0.835256, 0, 0, 0.405593, 0.914054}, - {5131.88, -1741.15, 1335.25, 2.15472, 0, 0, 0.880712, 0.473653}, - {5196.93, -1772.99, 1345.2, 0.128397, 0, 0, 0.0641544, 0.99794}, - {5225.33, -1756.06, 1344.17, 3.04223, 0, 0, 0.998766, 0.0496599}, - {5224.84, -1767.05, 1360.06, 3.19538, 0, 0, 0.999638, -0.0268922}, - {5202.05, -1763.47, 1361.68, 2.59455, 0, 0, 0.962826, 0.270122}, - {5194.74, -1766.66, 1356.94, 0.0734191, 0, 0, 0.0367013, 0.999326}, - {5159.67, -1832.97, 1344.5, 5.17457, 0, 0, 0.526356, -0.850264}, - {5096.17, -1858.73, 1332.46, 5.30021, 0, 0, 0.471939, -0.881631}, - {5110.7, -1856.59, 1342.84, 5.97564, 0, 0, 0.153167, -0.9882}, - {5109.76, -1855.3, 1332.38, 4.89572, 0, 0, 0.639411, -0.768865}, - {5068.95, -1837.37, 1328.81, 2.61569, 0, 0, 0.965628, 0.25993}, - {5064.4, -1824.77, 1329.02, 2.16409, 0, 0, 0.88292, 0.469524}, - {5059.89, -1848.79, 1329.59, 0.0709955, 0, 0, 0.0354903, 0.99937}, - {5014.37, -1851.39, 1322.56, 4.66949, 0, 0, 0.722111, -0.691777}, - {5025.1, -1848.27, 1323.39, 4.44565, 0, 0, 0.794854, -0.606801}, - {4942.63, -1890.13, 1326.59, 3.28719, 0, 0, 0.997351, -0.0727343}, - {4937.95, -1888.71, 1352.41, 3.41678, 0, 0, 0.990549, -0.13716}, - {4922.48, -1881.92, 1352.41, 5.03077, 0, 0, 0.586075, -0.810257}, - {4915.35, -1894.32, 1351.24, 6.22457, 0, 0, 0.0293048, -0.999571}, - {4922.71, -1904.84, 1352.56, 1.37866, 0, 0, 0.63602, 0.771672}, - {4932.89, -1905.49, 1352.56, 1.89702, 0, 0, 0.812549, 0.582893}, - {5011.83, -1861.05, 1345.86, 4.43777, 0, 0, 0.797239, -0.603664}, - {5011.83, -1861.05, 1363.26, 4.748, 0, 0, 0.694406, -0.719583}, - {5021.46, -1858.35, 1342.17, 4.86188, 0, 0, 0.652329, -0.757936}, - {4995.02, -1698.3, 1370.38, 6.15779, 0, 0, 0.0626579, -0.998035}, - {5119.85, -1728.9, 1336.04, 5.87112, 0, 0, 0.204579, -0.97885}, - {5214.75, -1751.02, 1342.5, 5.08965, 0, 0, 0.561972, -0.827156}, - {5075.04, -1822.43, 1328.87, 3.99951, 0, 0, 0.9094, -0.415924}, - {5057.09, -1823.32, 1350.35, 3.88169, 0, 0, 0.93231, -0.361659}, - {4984.6, -1816.99, 1329.21, 3.05308, 0, 0, 0.999021, 0.0442417}, - {4983.35, -1811.55, 1356.82, 3.33975, 0, 0, 0.995096, -0.098917}, - {4984.11, -1825.73, 1350.76, 2.26375, 0, 0, 0.905211, 0.424962}, - {4968.47, -1786.46, 1354.09, 3.07663, 0, 0, 0.999473, 0.0324733}, - {5061.82, -1751.16, 1339.07, 5.94727, 0, 0, 0.167171, -0.985928}, - {5063.75, -1763, 1351.91, 0.759707, 0, 0, 0.370784, 0.928719}, - {5078.65, -1708.26, 1353.9, 1.27022, 0, 0, 0.593264, 0.805008}, - {4983.19, -1755.96, 1331.13, 4.28221, 0, 0, 0.841733, -0.539894}, - {4972.76, -1755.3, 1332.5, 4.21938, 0, 0, 0.858276, -0.513188}, - {4961.65, -1760.82, 1351.69, 3.56515, 0, 0, 0.977659, -0.210198}, - {5086.45, -1779.83, 1321.62, 6.23157, 0, 0, 0.0258051, -0.999667}, - {5063.15, -1756.74, 1328.56, 0.886926, 0, 0, 0.42907, 0.903271}, - {5042.45, -1800.61, 1323.88, 2.50093, 0, 0, 0.949131, 0.31488}, - {5084.74, -1725.35, 1327.89, 1.65034, 0, 0, 0.734663, 0.678432}, - {4993.25, -1758.1, 1331.07, 3.49995, 0, 0, 0.98399, -0.178223}, - {5078.53, -1867.85, 1348.91, 5.85612, 0, 0, 0.211913, -0.977288}, - {5080.74, -1869.73, 1333.18, 6.18206, 0, 0, 0.0505424, -0.998722}, - {5089.55, -1894.13, 1356.08, 1.52072, 0, 0, 0.689181, 0.724589}, - {5113.24, -1899.49, 1363.77, 1.50108, 0, 0, 0.682034, 0.731321}, - {4984.18, -1907.69, 1325.62, 3.82193, 0, 0, 0.942698, -0.333646}, - {5094.14, -2432.08, 1429.38, 4.70083, 0, 0, 0.711182, -0.703007}, - {5329.89, -2113.30, 1281.06, 5.60560, 0, 0, 0.332347, -0.943157}, - {5170.87, -2148.13, 1278.32, 1.63540, 0, 0, 0.729573, 0.683903 }, - {5132.94, -1960.25, 1367.8, 3.69787, 0, 0, 0.961568, -0.274566}, - {5280.82, -2351.55, 1431.57, 4.46913, 0, 0, 0.787677, -0.616088}, - {5176.78, -2121.43, 1295.27, 3.24153, 0, 0, 0.998752, -0.04995}, - {5332.75, -2101.41, 1296.37, 5.50350, 0, 0, 0.380043, -0.924969}, - {5265.70, -2050.27, 1287.57, 0.50051, 0, 0, 0.247655, 0.968848 }, - {5194.21, -2129.89, 1274.04, 3.08053, 0, 0, 0.999534, 0.0305272}, - {5225.81, -1985.50, 1364.15, 0.37247, 0, 0, 0.185163, 0.982708 }, - {5339.46, -2204.47, 1280.45, 0.99921, 0, 0, 0.479081, 0.877771 }, - {5269.63, -2020.57, 1299.62, 3.00201, 0, 0, 0.997566, 0.0697332}, - {5111.54, -2445.70, 1435.31, 2.70983, 0, 0, 0.976788, 0.214207 }, - {5111.24, -1901.14, 1355.33, 1.61028, 0, 0, 0.720929, 0.693009 }, - {5310.42, -2207.82, 1277.46, 0.50441, 0, 0, 0.249544, 0.968363 }, - {5150.81, -2042.13, 1394.3, 2.21031, 0, 0, 0.893534, 0.448995 }, - {5224.84, -2376.61, 1366.33, 5.0621, 0, 0, 0.573311, -0.819338}, - {5105.41, -2454.86, 1446.16, 4.64584, 0, 0, 0.730239, -0.683191}, - {5309.65, -2188.28, 1266.84, 5.56631, 0, 0, 0.350811, -0.936446}, - {5281.46, -2047.82, 1287.67, 2.44909, 0, 0, 0.940652, 0.339373 }, - {5325.45, -2189.41, 1309.6, 6.23783, 0, 0, 0.0226771, -0.999743}, - {5190.96, -2142.54, 1293.03, 6.25668, 0, 0, 0.0132544, -0.999912}, - {5089.99, -2467.49, 1441.8, 0.77381, 0, 0, 0.377326, 0.92608 }, - {5195.08, -2129.01, 1285.36, 3.55727, 0, 0, 0.978480, -0.206344}, - {5353.76, -2116.28, 1299.27, 6.17894, 0, 0, 0.0521006, -0.998642}, - {5271.14, -2037.38, 1299.24, 4.07879, 0, 0, 0.892201, -0.451638}, - {5332.5 , -2181.28, 1279.95, 4.6906, 0, 0, 0.714768, -0.699362}, - {5108.2 , -2429.84, 1427.73, 4.5194, 0, 0, 0.771943, -0.635691} + {5039.9f, -1796.84f, 1323.88f, 2.59222f, 0, 0, 0.962511f, 0.271243f}, + {5087.2f, -1795.2f, 1320.68f, 1.03946f, 0, 0, 0.496644f, 0.867954f}, + {5112.68f, -1806.66f, 1359.93f, 1.37799f, 0, 0, 0.63576f, 0.771887f}, + {5095.61f, -1793.27f, 1359.78f, 0.580806f, 0, 0, 0.286338f, 0.958129f}, + {5090.43f, -1784.45f, 1360.44f, 0.796784f, 0, 0, 0.387937f, 0.921686f}, + {5139.25f, -1783.11f, 1359.39f, 3.30849f, 0, 0, 0.99652f, -0.0833509f}, + {5112.16f, -1763.72f, 1361.35f, 5.10312f, 0, 0, 0.556388f, -0.830922f}, + {4981.18f, -1793.98f, 1335.7f, 3.23072f, 0, 0, 0.999007f, -0.0445498f}, + {4996.57f, -1766.75f, 1341.62f, 3.5331f, 0, 0, 0.980902f, -0.194505f}, + {4983.74f, -1769.25f, 1345.75f, 3.79228f, 0, 0, 0.947541f, -0.319635f}, + {4996.01f, -1774.43f, 1330.71f, 3.07364f, 0, 0, 0.999423f, 0.0339693f}, + {5094.2f, -1726.13f, 1330.55f, 1.56175f, 0, 0, 0.703901f, 0.710298f}, + {5079.82f, -1721.24f, 1336.26f, 1.18868f, 0, 0, 0.559964f, 0.828517f}, + {5077.68f, -1717.15f, 1327.78f, 0.0145145f, 0, 0, 0.00725717f, 0.999974f}, + {5122.27f, -1738.22f, 1341.67f, 0.835256f, 0, 0, 0.405593f, 0.914054f}, + {5131.88f, -1741.15f, 1335.25f, 2.15472f, 0, 0, 0.880712f, 0.473653f}, + {5196.93f, -1772.99f, 1345.2f, 0.128397f, 0, 0, 0.0641544f, 0.99794f}, + {5225.33f, -1756.06f, 1344.17f, 3.04223f, 0, 0, 0.998766f, 0.0496599f}, + {5224.84f, -1767.05f, 1360.06f, 3.19538f, 0, 0, 0.999638f, -0.0268922f}, + {5202.05f, -1763.47f, 1361.68f, 2.59455f, 0, 0, 0.962826f, 0.270122f}, + {5194.74f, -1766.66f, 1356.94f, 0.0734191f, 0, 0, 0.0367013f, 0.999326f}, + {5159.67f, -1832.97f, 1344.5f, 5.17457f, 0, 0, 0.526356f, -0.850264f}, + {5096.17f, -1858.73f, 1332.46f, 5.30021f, 0, 0, 0.471939f, -0.881631f}, + {5110.7f, -1856.59f, 1342.84f, 5.97564f, 0, 0, 0.153167f, -0.9882f}, + {5109.76f, -1855.3f, 1332.38f, 4.89572f, 0, 0, 0.639411f, -0.768865f}, + {5068.95f, -1837.37f, 1328.81f, 2.61569f, 0, 0, 0.965628f, 0.25993f}, + {5064.4f, -1824.77f, 1329.02f, 2.16409f, 0, 0, 0.88292f, 0.469524f}, + {5059.89f, -1848.79f, 1329.59f, 0.0709955f, 0, 0, 0.0354903f, 0.99937f}, + {5014.37f, -1851.39f, 1322.56f, 4.66949f, 0, 0, 0.722111f, -0.691777f}, + {5025.1f, -1848.27f, 1323.39f, 4.44565f, 0, 0, 0.794854f, -0.606801f}, + {4942.63f, -1890.13f, 1326.59f, 3.28719f, 0, 0, 0.997351f, -0.0727343f}, + {4937.95f, -1888.71f, 1352.41f, 3.41678f, 0, 0, 0.990549f, -0.13716f}, + {4922.48f, -1881.92f, 1352.41f, 5.03077f, 0, 0, 0.586075f, -0.810257f}, + {4915.35f, -1894.32f, 1351.24f, 6.22457f, 0, 0, 0.0293048f, -0.999571f}, + {4922.71f, -1904.84f, 1352.56f, 1.37866f, 0, 0, 0.63602f, 0.771672f}, + {4932.89f, -1905.49f, 1352.56f, 1.89702f, 0, 0, 0.812549f, 0.582893f}, + {5011.83f, -1861.05f, 1345.86f, 4.43777f, 0, 0, 0.797239f, -0.603664f}, + {5011.83f, -1861.05f, 1363.26f, 4.748f, 0, 0, 0.694406f, -0.719583f}, + {5021.46f, -1858.35f, 1342.17f, 4.86188f, 0, 0, 0.652329f, -0.757936f}, + {4995.02f, -1698.3f, 1370.38f, 6.15779f, 0, 0, 0.0626579f, -0.998035f}, + {5119.85f, -1728.9f, 1336.04f, 5.87112f, 0, 0, 0.204579f, -0.97885f}, + {5214.75f, -1751.02f, 1342.5f, 5.08965f, 0, 0, 0.561972f, -0.827156f}, + {5075.04f, -1822.43f, 1328.87f, 3.99951f, 0, 0, 0.9094f, -0.415924f}, + {5057.09f, -1823.32f, 1350.35f, 3.88169f, 0, 0, 0.93231f, -0.361659f}, + {4984.6f, -1816.99f, 1329.21f, 3.05308f, 0, 0, 0.999021f, 0.0442417f}, + {4983.35f, -1811.55f, 1356.82f, 3.33975f, 0, 0, 0.995096f, -0.098917f}, + {4984.11f, -1825.73f, 1350.76f, 2.26375f, 0, 0, 0.905211f, 0.424962f}, + {4968.47f, -1786.46f, 1354.09f, 3.07663f, 0, 0, 0.999473f, 0.0324733f}, + {5061.82f, -1751.16f, 1339.07f, 5.94727f, 0, 0, 0.167171f, -0.985928f}, + {5063.75f, -1763, 1351.91f, 0.759707f, 0, 0, 0.370784f, 0.928719f}, + {5078.65f, -1708.26f, 1353.9f, 1.27022f, 0, 0, 0.593264f, 0.805008f}, + {4983.19f, -1755.96f, 1331.13f, 4.28221f, 0, 0, 0.841733f, -0.539894f}, + {4972.76f, -1755.3f, 1332.5f, 4.21938f, 0, 0, 0.858276f, -0.513188f}, + {4961.65f, -1760.82f, 1351.69f, 3.56515f, 0, 0, 0.977659f, -0.210198f}, + {5086.45f, -1779.83f, 1321.62f, 6.23157f, 0, 0, 0.0258051f, -0.999667f}, + {5063.15f, -1756.74f, 1328.56f, 0.886926f, 0, 0, 0.42907f, 0.903271f}, + {5042.45f, -1800.61f, 1323.88f, 2.50093f, 0, 0, 0.949131f, 0.31488f}, + {5084.74f, -1725.35f, 1327.89f, 1.65034f, 0, 0, 0.734663f, 0.678432f}, + {4993.25f, -1758.1f, 1331.07f, 3.49995f, 0, 0, 0.98399f, -0.178223f}, + {5078.53f, -1867.85f, 1348.91f, 5.85612f, 0, 0, 0.211913f, -0.977288f}, + {5080.74f, -1869.73f, 1333.18f, 6.18206f, 0, 0, 0.0505424f, -0.998722f}, + {5089.55f, -1894.13f, 1356.08f, 1.52072f, 0, 0, 0.689181f, 0.724589f}, + {5113.24f, -1899.49f, 1363.77f, 1.50108f, 0, 0, 0.682034f, 0.731321f}, + {4984.18f, -1907.69f, 1325.62f, 3.82193f, 0, 0, 0.942698f, -0.333646f}, + {5094.14f, -2432.08f, 1429.38f, 4.70083f, 0, 0, 0.711182f, -0.703007f}, + {5329.89f, -2113.30f, 1281.06f, 5.60560f, 0, 0, 0.332347f, -0.943157f}, + {5170.87f, -2148.13f, 1278.32f, 1.63540f, 0, 0, 0.729573f, 0.683903f }, + {5132.94f, -1960.25f, 1367.8f, 3.69787f, 0, 0, 0.961568f, -0.274566f}, + {5280.82f, -2351.55f, 1431.57f, 4.46913f, 0, 0, 0.787677f, -0.616088f}, + {5176.78f, -2121.43f, 1295.27f, 3.24153f, 0, 0, 0.998752f, -0.04995f}, + {5332.75f, -2101.41f, 1296.37f, 5.50350f, 0, 0, 0.380043f, -0.924969f}, + {5265.70f, -2050.27f, 1287.57f, 0.50051f, 0, 0, 0.247655f, 0.968848f }, + {5194.21f, -2129.89f, 1274.04f, 3.08053f, 0, 0, 0.999534f, 0.0305272f}, + {5225.81f, -1985.50f, 1364.15f, 0.37247f, 0, 0, 0.185163f, 0.982708f }, + {5339.46f, -2204.47f, 1280.45f, 0.99921f, 0, 0, 0.479081f, 0.877771f }, + {5269.63f, -2020.57f, 1299.62f, 3.00201f, 0, 0, 0.997566f, 0.0697332f}, + {5111.54f, -2445.70f, 1435.31f, 2.70983f, 0, 0, 0.976788f, 0.214207f }, + {5111.24f, -1901.14f, 1355.33f, 1.61028f, 0, 0, 0.720929f, 0.693009f }, + {5310.42f, -2207.82f, 1277.46f, 0.50441f, 0, 0, 0.249544f, 0.968363f }, + {5150.81f, -2042.13f, 1394.3f, 2.21031f, 0, 0, 0.893534f, 0.448995f }, + {5224.84f, -2376.61f, 1366.33f, 5.0621f, 0, 0, 0.573311f, -0.819338f}, + {5105.41f, -2454.86f, 1446.16f, 4.64584f, 0, 0, 0.730239f, -0.683191f}, + {5309.65f, -2188.28f, 1266.84f, 5.56631f, 0, 0, 0.350811f, -0.936446f}, + {5281.46f, -2047.82f, 1287.67f, 2.44909f, 0, 0, 0.940652f, 0.339373f }, + {5325.45f, -2189.41f, 1309.6f, 6.23783f, 0, 0, 0.0226771f, -0.999743f}, + {5190.96f, -2142.54f, 1293.03f, 6.25668f, 0, 0, 0.0132544f, -0.999912f}, + {5089.99f, -2467.49f, 1441.8f, 0.77381f, 0, 0, 0.377326f, 0.92608f }, + {5195.08f, -2129.01f, 1285.36f, 3.55727f, 0, 0, 0.978480f, -0.206344f}, + {5353.76f, -2116.28f, 1299.27f, 6.17894f, 0, 0, 0.0521006f, -0.998642f}, + {5271.14f, -2037.38f, 1299.24f, 4.07879f, 0, 0, 0.892201f, -0.451638f}, + {5332.5f , -2181.28f, 1279.95f, 4.6906f, 0, 0, 0.714768f, -0.699362f}, + {5108.2f , -2429.84f, 1427.73f, 4.5194f, 0, 0, 0.771943f, -0.635691f} }; float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde base { - {5524.11, -2612.73, 1483.38, 1.96198, 0, 0, 0.831047, 0.556202}, - {5514.42, -2617.19, 1505.77, 1.82453, 0, 0, 0.790892, 0.611956}, - {5510.21, -2624.77, 1485.34, 1.71065, 0, 0, 0.754783, 0.655974}, - {5570.72, -2619.04, 1487.62, 0.728898, 0, 0, 0.356435, 0.93432}, - {5570.29, -2639.37, 1487.31, 1.49308, 0, 0, 0.679104, 0.734042}, - {5583.56, -2637.2, 1503.78, 1.46559, 0, 0, 0.668951, 0.743307}, - {5571.53, -2626.81, 1510.99, 0.362107, 0, 0, 0.180066, 0.983654}, - {5545.97, -2659.62, 1489.64, 5.07055, 0, 0, 0.569845, -0.821752}, - {5557.44, -2675.91, 1482.58, 1.70118, 0, 0, 0.751671, 0.659539}, - {5594.98, -2742.31, 1495.51, 4.5993, 0, 0, 0.74594, -0.666013}, - {5599.65, -2755.6, 1505.05, 1.66896, 0, 0, 0.740947, 0.671564}, - {5565.95, -2774.75, 1499.48, 6.22425, 0, 0, 0.0294611, -0.999566}, - {5567.1, -2769.7, 1511.17, 5.99257, 0, 0, 0.144799, -0.989461}, - {5572.84, -2774.16, 1527.06, 0.836428, 0, 0, 0.406129, 0.913816}, - {5538.32, -2805.94, 1498.87, 4.30082, 0, 0, 0.836674, -0.547701}, - {5515.66, -2801.74, 1503.53, 5.57316, 0, 0, 0.347602, -0.937642}, - {5516.76, -2827.14, 1501.15, 0.35026, 0, 0, 0.174236, 0.984704}, - {5536.13, -2813.51, 1537.21, 4.51681, 0, 0, 0.772765, -0.634692}, - {5525.05, -2825.16, 1538.53, 0.489275, 0, 0, 0.242205, 0.970225}, - {5534.42, -2815.45, 1562.84, 4.62834, 0, 0, 0.736191, -0.676774}, - {5519.64, -2831.12, 1526.46, 0.611008, 0, 0, 0.300774, 0.953696}, - {5551.04, -2827.55, 1523.5, 3.35206, 0, 0, 0.994468, -0.10504}, - {5469.22, -2802.87, 1503.5, 4.99509, 0, 0, 0.600436, -0.799673}, - {5427.8, -2737.26, 1487.12, 1.78673, 0, 0, 0.779186, 0.626793}, - {5454.1, -2709.1, 1485.92, 3.03552, 0, 0, 0.998594, 0.0530137}, - {5436.3, -2718.2, 1506.02, 2.7567, 0, 0, 0.981539, 0.191261}, - {5412.6, -2740.55, 1510.79, 2.98446, 0, 0, 0.996915, 0.0784832}, - {5406.12, -2752.48, 1521.01, 2.05769, 0, 0, 0.856705, 0.515807}, - {5445.24, -2676.35, 1521.89, 2.91378, 0, 0, 0.99352, 0.113661}, - {5481.4, -2665.08, 1482.23, 4.30001, 0, 0, 0.836895, -0.547363}, - {5443.51, -2675.44, 1487.12, 2.90986, 0, 0, 0.993295, 0.115606}, - {5391.72, -2647.3, 1528.9, 3.76987, 0, 0, 0.951063, -0.308997}, - {5421.09, -2734.12, 1521.01, 2.70567, 0, 0, 0.97634, 0.216242}, - {5405.39, -2710.33, 1533.77, 2.51324, 0, 0, 0.951052, 0.309032}, - {5423.96, -2703.76, 1516.34, 2.79206, 0, 0, 0.984767, 0.173879}, - {5444.75, -2735.23, 1486.37, 2.22657, 0, 0, 0.897155, 0.441715}, - {5570.98, -2747.91, 1495.7, 5.14433, 0, 0, 0.53915, -0.84221}, - {5567.79, -2673.9, 1484.66, 2.72529, 0, 0, 0.978415, 0.20665}, - {5600.71, -2696.8, 1500.42, 0.443704, 0, 0, 0.220036, 0.975492}, - {5600.7, -2693.04, 1515.2, 5.16003, 0, 0, 0.532522, -0.846416}, - {5627.56, -2839.66, 1510.53, 5.41527, 0, 0, 0.420463, -0.907309}, - {5622.02, -2868.71, 1516.22, 2.25482, 0, 0, 0.903303, 0.429002}, - {5586.61, -2878.97, 1510.34, 4.55604, 0, 0, 0.76017, -0.649724}, - {5583.78, -2843.71, 1509.54, 5.35715, 0, 0, 0.44665, -0.894709}, - {5580.95, -2811.3, 1513.3, 3.57587, 0, 0, 0.976518, -0.215434}, - {5542.52, -2869.31, 1523.13, 5.23304, 0, 0, 0.501275, -0.865288}, - {5557.35, -2866.36, 1518.76, 4.48299, 0, 0, 0.783388, -0.621533}, - {5380.91, -2849.36, 1512.81, 3.90962, 0, 0, 0.927168, -0.374646}, - {5395.76, -2881.41, 1521.11, 4.28426, 0, 0, 0.84118, -0.540755}, - {5374.87, -2859.63, 1528.98, 3.30252, 0, 0, 0.996765, -0.0803745}, - {5356.07, -2854.66, 1520.34, 5.83933, 0, 0, 0.220108, -0.975475}, - {5363.01, -2975.72, 1539.02, 4.13738, 0, 0, 0.87859, -0.477576}, - {5336.85, -2980.74, 1561.24, 5.11126, 0, 0, 0.553001, -0.83318}, - {5335.23, -2974.62, 1540.05, 5.04451, 0, 0, 0.580496, -0.814263}, - {5422.37, -2998.87, 1549.98, 4.51831, 0, 0, 0.772288, -0.635272}, - {5405.54, -3014.6, 1562.16, 5.86761, 0, 0, 0.206298, -0.978489}, - {5427.96, -3019.4, 1561.58, 3.53498, 0, 0, 0.980718, -0.19543}, - {5348.12, -2977.84, 1582.47, 3.94025, 0, 0, 0.921323, -0.388799}, - {5331.12, -2993.71, 1576.14, 0.0642734, 0, 0, 0.0321311, 0.999484}, - {5321.63, -2986.55, 1552.2, 5.29503, 0, 0, 0.474219, -0.880407}, - {5292.1, -2914.36, 1529.52, 2.9742, 0, 0, 0.996499, 0.083601}, - {5281.77, -2926.5, 1530.62, 1.67829, 0, 0, 0.744071, 0.6681}, - {5287.19, -2909.94, 1543.49, 3.31192, 0, 0, 0.996376, -0.0850591}, - {5534.15, -2679.35, 1483.61, 0.428685, 0, 0, 0.212705, 0.977116}, - {5545.43, -2647.82, 1483.05, 5.38848, 0, 0, 0.432578, -0.901596} + {5524.11f, -2612.73f, 1483.38f, 1.96198f, 0, 0, 0.831047f, 0.556202f}, + {5514.42f, -2617.19f, 1505.77f, 1.82453f, 0, 0, 0.790892f, 0.611956f}, + {5510.21f, -2624.77f, 1485.34f, 1.71065f, 0, 0, 0.754783f, 0.655974f}, + {5570.72f, -2619.04f, 1487.62f, 0.728898f, 0, 0, 0.356435f, 0.93432f}, + {5570.29f, -2639.37f, 1487.31f, 1.49308f, 0, 0, 0.679104f, 0.734042f}, + {5583.56f, -2637.2f, 1503.78f, 1.46559f, 0, 0, 0.668951f, 0.743307f}, + {5571.53f, -2626.81f, 1510.99f, 0.362107f, 0, 0, 0.180066f, 0.983654f}, + {5545.97f, -2659.62f, 1489.64f, 5.07055f, 0, 0, 0.569845f, -0.821752f}, + {5557.44f, -2675.91f, 1482.58f, 1.70118f, 0, 0, 0.751671f, 0.659539f}, + {5594.98f, -2742.31f, 1495.51f, 4.5993f, 0, 0, 0.74594f, -0.666013f}, + {5599.65f, -2755.6f, 1505.05f, 1.66896f, 0, 0, 0.740947f, 0.671564f}, + {5565.95f, -2774.75f, 1499.48f, 6.22425f, 0, 0, 0.0294611f, -0.999566f}, + {5567.1f, -2769.7f, 1511.17f, 5.99257f, 0, 0, 0.144799f, -0.989461f}, + {5572.84f, -2774.16f, 1527.06f, 0.836428f, 0, 0, 0.406129f, 0.913816f}, + {5538.32f, -2805.94f, 1498.87f, 4.30082f, 0, 0, 0.836674f, -0.547701f}, + {5515.66f, -2801.74f, 1503.53f, 5.57316f, 0, 0, 0.347602f, -0.937642f}, + {5516.76f, -2827.14f, 1501.15f, 0.35026f, 0, 0, 0.174236f, 0.984704f}, + {5536.13f, -2813.51f, 1537.21f, 4.51681f, 0, 0, 0.772765f, -0.634692f}, + {5525.05f, -2825.16f, 1538.53f, 0.489275f, 0, 0, 0.242205f, 0.970225f}, + {5534.42f, -2815.45f, 1562.84f, 4.62834f, 0, 0, 0.736191f, -0.676774f}, + {5519.64f, -2831.12f, 1526.46f, 0.611008f, 0, 0, 0.300774f, 0.953696f}, + {5551.04f, -2827.55f, 1523.5f, 3.35206f, 0, 0, 0.994468f, -0.10504f}, + {5469.22f, -2802.87f, 1503.5f, 4.99509f, 0, 0, 0.600436f, -0.799673f}, + {5427.8f, -2737.26f, 1487.12f, 1.78673f, 0, 0, 0.779186f, 0.626793f}, + {5454.1f, -2709.1f, 1485.92f, 3.03552f, 0, 0, 0.998594f, 0.0530137f}, + {5436.3f, -2718.2f, 1506.02f, 2.7567f, 0, 0, 0.981539f, 0.191261f}, + {5412.6f, -2740.55f, 1510.79f, 2.98446f, 0, 0, 0.996915f, 0.0784832f}, + {5406.12f, -2752.48f, 1521.01f, 2.05769f, 0, 0, 0.856705f, 0.515807f}, + {5445.24f, -2676.35f, 1521.89f, 2.91378f, 0, 0, 0.99352f, 0.113661f}, + {5481.4f, -2665.08f, 1482.23f, 4.30001f, 0, 0, 0.836895f, -0.547363f}, + {5443.51f, -2675.44f, 1487.12f, 2.90986f, 0, 0, 0.993295f, 0.115606f}, + {5391.72f, -2647.3f, 1528.9f, 3.76987f, 0, 0, 0.951063f, -0.308997f}, + {5421.09f, -2734.12f, 1521.01f, 2.70567f, 0, 0, 0.97634f, 0.216242f}, + {5405.39f, -2710.33f, 1533.77f, 2.51324f, 0, 0, 0.951052f, 0.309032f}, + {5423.96f, -2703.76f, 1516.34f, 2.79206f, 0, 0, 0.984767f, 0.173879f}, + {5444.75f, -2735.23f, 1486.37f, 2.22657f, 0, 0, 0.897155f, 0.441715f}, + {5570.98f, -2747.91f, 1495.7f, 5.14433f, 0, 0, 0.53915f, -0.84221f}, + {5567.79f, -2673.9f, 1484.66f, 2.72529f, 0, 0, 0.978415f, 0.20665f}, + {5600.71f, -2696.8f, 1500.42f, 0.443704f, 0, 0, 0.220036f, 0.975492f}, + {5600.7f, -2693.04f, 1515.2f, 5.16003f, 0, 0, 0.532522f, -0.846416f}, + {5627.56f, -2839.66f, 1510.53f, 5.41527f, 0, 0, 0.420463f, -0.907309f}, + {5622.02f, -2868.71f, 1516.22f, 2.25482f, 0, 0, 0.903303f, 0.429002f}, + {5586.61f, -2878.97f, 1510.34f, 4.55604f, 0, 0, 0.76017f, -0.649724f}, + {5583.78f, -2843.71f, 1509.54f, 5.35715f, 0, 0, 0.44665f, -0.894709f}, + {5580.95f, -2811.3f, 1513.3f, 3.57587f, 0, 0, 0.976518f, -0.215434f}, + {5542.52f, -2869.31f, 1523.13f, 5.23304f, 0, 0, 0.501275f, -0.865288f}, + {5557.35f, -2866.36f, 1518.76f, 4.48299f, 0, 0, 0.783388f, -0.621533f}, + {5380.91f, -2849.36f, 1512.81f, 3.90962f, 0, 0, 0.927168f, -0.374646f}, + {5395.76f, -2881.41f, 1521.11f, 4.28426f, 0, 0, 0.84118f, -0.540755f}, + {5374.87f, -2859.63f, 1528.98f, 3.30252f, 0, 0, 0.996765f, -0.0803745f}, + {5356.07f, -2854.66f, 1520.34f, 5.83933f, 0, 0, 0.220108f, -0.975475f}, + {5363.01f, -2975.72f, 1539.02f, 4.13738f, 0, 0, 0.87859f, -0.477576f}, + {5336.85f, -2980.74f, 1561.24f, 5.11126f, 0, 0, 0.553001f, -0.83318f}, + {5335.23f, -2974.62f, 1540.05f, 5.04451f, 0, 0, 0.580496f, -0.814263f}, + {5422.37f, -2998.87f, 1549.98f, 4.51831f, 0, 0, 0.772288f, -0.635272f}, + {5405.54f, -3014.6f, 1562.16f, 5.86761f, 0, 0, 0.206298f, -0.978489f}, + {5427.96f, -3019.4f, 1561.58f, 3.53498f, 0, 0, 0.980718f, -0.19543f}, + {5348.12f, -2977.84f, 1582.47f, 3.94025f, 0, 0, 0.921323f, -0.388799f}, + {5331.12f, -2993.71f, 1576.14f, 0.0642734f, 0, 0, 0.0321311f, 0.999484f}, + {5321.63f, -2986.55f, 1552.2f, 5.29503f, 0, 0, 0.474219f, -0.880407f}, + {5292.1f, -2914.36f, 1529.52f, 2.9742f, 0, 0, 0.996499f, 0.083601f}, + {5281.77f, -2926.5f, 1530.62f, 1.67829f, 0, 0, 0.744071f, 0.6681f}, + {5287.19f, -2909.94f, 1543.49f, 3.31192f, 0, 0, 0.996376f, -0.0850591f}, + {5534.15f, -2679.35f, 1483.61f, 0.428685f, 0, 0, 0.212705f, 0.977116f}, + {5545.43f, -2647.82f, 1483.05f, 5.38848f, 0, 0, 0.432578f, -0.901596f} }; hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) @@ -758,7 +758,7 @@ void hyjalAI::UpdateAI(const uint32 diff) { me->SetVisibility(VISIBILITY_OFF); HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5037.76, -1889.71); + HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); @@ -770,8 +770,8 @@ void hyjalAI::UpdateAI(const uint32 diff) { me->SetVisibility(VISIBILITY_OFF); HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); + HideNearPos(5563, -2763.19f); + HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); @@ -788,11 +788,11 @@ void hyjalAI::UpdateAI(const uint32 diff) RespawnNearPos(me->GetPositionX(), me->GetPositionY()); if (Faction == 0) { - RespawnNearPos(5037.76, -1889.71); + RespawnNearPos(5037.76f, -1889.71f); } else if (Faction == 1) { - RespawnNearPos(5563, -2763.19); - RespawnNearPos(5542.2, -2629.36); + RespawnNearPos(5563, -2763.19f); + RespawnNearPos(5542.2f, -2629.36f); } me->SetVisibility(VISIBILITY_ON); }else{ @@ -813,12 +813,12 @@ void hyjalAI::UpdateAI(const uint32 diff) switch(me->GetEntry()) { case JAINA://jaina - HideNearPos(5037.76, -1889.71); + HideNearPos(5037.76f, -1889.71f); break; case THRALL://thrall - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); - HideNearPos(5603.75, -2853.12); + HideNearPos(5563, -2763.19f); + HideNearPos(5542.2f, -2629.36f); + HideNearPos(5603.75f, -2853.12f); break; } me->SetVisibility(VISIBILITY_OFF); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 584fef4f05e..dfc86bee83c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -28,131 +28,131 @@ float HordeWPs[8][3]=//basic waypoints from spawn to leader { - {5492.91, -2404.61, 1462.63}, - {5531.76, -2460.87, 1469.55}, - {5554.58, -2514.66, 1476.12}, - {5554.16, -2567.23, 1479.90}, - {5540.67, -2625.99, 1480.89}, - {5508.16, -2659.20, 1480.15},//random rush starts from here - {5489.62, -2704.05, 1482.18}, - {5457.04, -2726.26, 1485.10} + {5492.91f, -2404.61f, 1462.63f}, + {5531.76f, -2460.87f, 1469.55f}, + {5554.58f, -2514.66f, 1476.12f}, + {5554.16f, -2567.23f, 1479.90f}, + {5540.67f, -2625.99f, 1480.89f}, + {5508.16f, -2659.20f, 1480.15f},//random rush starts from here + {5489.62f, -2704.05f, 1482.18f}, + {5457.04f, -2726.26f, 1485.10f} }; float AllianceWPs[8][3]=//basic waypoints from spawn to leader { - {4896.08, -1576.35, 1333.65}, - {4898.68, -1615.02, 1329.48}, - {4907.12, -1667.08, 1321.00}, - {4963.18, -1699.35, 1340.51}, - {4989.16, -1716.67, 1335.74},//first WP in the base, after the gate - {5026.27, -1736.89, 1323.02}, - {5037.77, -1770.56, 1324.36}, - {5067.23, -1789.95, 1321.17} + {4896.08f, -1576.35f, 1333.65f}, + {4898.68f, -1615.02f, 1329.48f}, + {4907.12f, -1667.08f, 1321.00f}, + {4963.18f, -1699.35f, 1340.51f}, + {4989.16f, -1716.67f, 1335.74f},//first WP in the base, after the gate + {5026.27f, -1736.89f, 1323.02f}, + {5037.77f, -1770.56f, 1324.36f}, + {5067.23f, -1789.95f, 1321.17f} }; float FrostWyrmWPs[3][3]=//waypoints for the frost wyrms in horde base { - {5580.82, -2628.83, 1528.28}, - {5550.90, -2667.16, 1505.45}, - {5459.64, -2725.91, 1484.83} + {5580.82f, -2628.83f, 1528.28f}, + {5550.90f, -2667.16f, 1505.45f}, + {5459.64f, -2725.91f, 1484.83f} }; float GargoyleWPs[3][3]=//waypoints for the gargoyles in horde base { - {5533.66, -2634.32, 1495.33}, - {5517.88, -2712.05, 1490.54}, - {5459.64, -2725.91, 1484.83} + {5533.66f, -2634.32f, 1495.33f}, + {5517.88f, -2712.05f, 1490.54f}, + {5459.64f, -2725.91f, 1484.83f} }; float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde base in wave 1/3 { - {5531.96, -2772.83, 1516.68}, - {5498.32, -2734.84, 1497.01}, - {5456.67, -2725.48, 1493.08} + {5531.96f, -2772.83f, 1516.68f}, + {5498.32f, -2734.84f, 1497.01f}, + {5456.67f, -2725.48f, 1493.08f} }; float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave { - {4976.37,-1708.02,1339.43},//0spawn - {4994.83,-1725.52,1333.25},//1 start - {4982.92,-1753.7,1330.69},//2 end - {4996.75,-1721.47,1332.95},//3 start - {5015.74,-1755.05,1322.49},//4 - {4998.68,-1773.44,1329.59},//5 - {4994.83,-1725.52,1333.25},//6 start - {5022.8,-1735.46,1323.53},//7 - {5052.15,-1729.02,1320.88},//8 - {5082.43,-1726.29,1327.87},//9 - {4994.83,-1725.52,1333.25},//10 start - {5018.92,-1751.14,1322.19},//11 - {5040.09,-1792.09,1322.1},//12 - {4994.83,-1725.52,1333.25},//13 start - {5023.47,-1748.1,1322.51},//14 - {5013.43,-1842.39,1322.07},//15 - {4994.83,-1725.52,1333.25},//16 start - {5020.8,-1756.86,1322.2},//17 - {5019.53,-1824.6,1321.96},//18 - {5043.42,-1853.75,1324.52},//19 - {5053.02,-1864.13,1330.36},//20 - {5062.49,-1852.47,1330.49},//21 - {5015.27, -1738.77, 1324.83},//35//start 22 - {5027.97, -1775.25, 1321.87},//34 23 - {5015.94, -1821.24, 1321.86},//33 24 - {4983.25, -1857.4, 1320.48},//32 25 - {4981.51, -1883.7, 1322.34},//31 26 - {5002.33, -1893.98, 1325.88},//30 27 - {5049.32, -1886.54, 1331.69},//29 28 - {5089.68, -1846.88, 1328.99},//28 29 - {5127.90, -1825.14, 1335.58},//27 30 - {5163.27, -1789.08, 1337.04},//26 31 - {5138.97, -1755.88, 1334.57},//25 32 - {5096.63, -1742.22, 1329.61},//24 33 - {5065.81, -1729.43, 1325.66},//23 34 - {5049.32, -1726.31, 1320.64},//22 start - {5081.07, -1902.10, 1346.36},//36 abo start - {5107.65, -1912.03, 1356.49},//37 - {5132.83, -1927.07, 1362.42},//38 - {5147.78, -1954.41, 1365.98},//39 - {5164.96, -1966.48, 1367.04},//40 - {5189.04, -1961.06, 1367.90},//41 - {5212.27, -1975.30, 1365.58},//42 - {5221.82, -1994.18, 1364.97},//43 end1 - {5202.23, -1994.94, 1367.59},//44 end2 - {5279.94, -2049.68, 1311.38},//45 garg1 - {5289.15, -2219.06, 1291.12},//46 garg2 - {5202.07, -2136.10, 1305.07},//47 garg3 - {5071.52, -2425.63, 1454.48},//48 garg4 - {5120.65, -2467.92, 1463.93},//49 garg5 - {5283.04, -2043.26, 1300.11},//50 garg target1 - {5313.22, -2207.60, 1290.06},//51 garg target2 - {5180.41, -2121.87, 1292.62},//52 garg target3 - {5088.68, -2432.04, 1441.73},//53 garg target4 - {5111.26, -2454.73, 1449.63}//54 garg target5 + {4976.37f,-1708.02f,1339.43f},//0spawn + {4994.83f,-1725.52f,1333.25f},//1 start + {4982.92f,-1753.7f,1330.69f},//2 end + {4996.75f,-1721.47f,1332.95f},//3 start + {5015.74f,-1755.05f,1322.49f},//4 + {4998.68f,-1773.44f,1329.59f},//5 + {4994.83f,-1725.52f,1333.25f},//6 start + {5022.8f,-1735.46f,1323.53f},//7 + {5052.15f,-1729.02f,1320.88f},//8 + {5082.43f,-1726.29f,1327.87f},//9 + {4994.83f,-1725.52f,1333.25f},//10 start + {5018.92f,-1751.14f,1322.19f},//11 + {5040.09f,-1792.09f,1322.1f},//12 + {4994.83f,-1725.52f,1333.25f},//13 start + {5023.47f,-1748.1f,1322.51f},//14 + {5013.43f,-1842.39f,1322.07f},//15 + {4994.83f,-1725.52f,1333.25f},//16 start + {5020.8f,-1756.86f,1322.2f},//17 + {5019.53f,-1824.6f,1321.96f},//18 + {5043.42f,-1853.75f,1324.52f},//19 + {5053.02f,-1864.13f,1330.36f},//20 + {5062.49f,-1852.47f,1330.49f},//21 + {5015.27f, -1738.77f, 1324.83f},//35//start 22 + {5027.97f, -1775.25f, 1321.87f},//34 23 + {5015.94f, -1821.24f, 1321.86f},//33 24 + {4983.25f, -1857.4f, 1320.48f},//32 25 + {4981.51f, -1883.7f, 1322.34f},//31 26 + {5002.33f, -1893.98f, 1325.88f},//30 27 + {5049.32f, -1886.54f, 1331.69f},//29 28 + {5089.68f, -1846.88f, 1328.99f},//28 29 + {5127.90f, -1825.14f, 1335.58f},//27 30 + {5163.27f, -1789.08f, 1337.04f},//26 31 + {5138.97f, -1755.88f, 1334.57f},//25 32 + {5096.63f, -1742.22f, 1329.61f},//24 33 + {5065.81f, -1729.43f, 1325.66f},//23 34 + {5049.32f, -1726.31f, 1320.64f},//22 start + {5081.07f, -1902.10f, 1346.36f},//36 abo start + {5107.65f, -1912.03f, 1356.49f},//37 + {5132.83f, -1927.07f, 1362.42f},//38 + {5147.78f, -1954.41f, 1365.98f},//39 + {5164.96f, -1966.48f, 1367.04f},//40 + {5189.04f, -1961.06f, 1367.90f},//41 + {5212.27f, -1975.30f, 1365.58f},//42 + {5221.82f, -1994.18f, 1364.97f},//43 end1 + {5202.23f, -1994.94f, 1367.59f},//44 end2 + {5279.94f, -2049.68f, 1311.38f},//45 garg1 + {5289.15f, -2219.06f, 1291.12f},//46 garg2 + {5202.07f, -2136.10f, 1305.07f},//47 garg3 + {5071.52f, -2425.63f, 1454.48f},//48 garg4 + {5120.65f, -2467.92f, 1463.93f},//49 garg5 + {5283.04f, -2043.26f, 1300.11f},//50 garg target1 + {5313.22f, -2207.60f, 1290.06f},//51 garg target2 + {5180.41f, -2121.87f, 1292.62f},//52 garg target3 + {5088.68f, -2432.04f, 1441.73f},//53 garg target4 + {5111.26f, -2454.73f, 1449.63f}//54 garg target5 }; float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave { - {5490.72,-2702.94,1482.14},//0 start - {5469.77,-2741.34,1486.95}, - {5439.47,-2771.02,1494.59}, - {5408.85,-2811.92,1505.68}, - {5423.87,-2857.80,1515.55}, - {5428.19,-2898.15,1524.61}, - {5394.59,-2930.05,1528.23}, - {5351.11,-2935.80,1532.24}, - {5312.37,-2959.06,1536.21}, - {5264.93,-2989.80,1545.70}, - {5256.63,-3056.16,1559.24}, - {5267.32,-3119.55,1575.36}, - {5305.61,-3139.88,1586.38}, - {5330.56,-3135.37,1588.58}, - {5365.87,-3139.78,1583.96}, - {5389.39,-3163.57,1582.57},//15 end - {5500.86,-2669.89,1481.04},//16 start - {5472.08,-2715.14,1483.55}, - {5450.11,-2721.47,1485.61}, - {5433.25,-2712.93,1493.02},//19 end 1 - {5429.91,-2718.44,1493.42}//20 end 2 + {5490.72f,-2702.94f,1482.14f},//0 start + {5469.77f,-2741.34f,1486.95f}, + {5439.47f,-2771.02f,1494.59f}, + {5408.85f,-2811.92f,1505.68f}, + {5423.87f,-2857.80f,1515.55f}, + {5428.19f,-2898.15f,1524.61f}, + {5394.59f,-2930.05f,1528.23f}, + {5351.11f,-2935.80f,1532.24f}, + {5312.37f,-2959.06f,1536.21f}, + {5264.93f,-2989.80f,1545.70f}, + {5256.63f,-3056.16f,1559.24f}, + {5267.32f,-3119.55f,1575.36f}, + {5305.61f,-3139.88f,1586.38f}, + {5330.56f,-3135.37f,1588.58f}, + {5365.87f,-3139.78f,1583.96f}, + {5389.39f,-3163.57f,1582.57f},//15 end + {5500.86f,-2669.89f,1481.04f},//16 start + {5472.08f,-2715.14f,1483.55f}, + {5450.11f,-2721.47f,1485.61f}, + {5433.25f,-2712.93f,1493.02f},//19 end 1 + {5429.91f,-2718.44f,1493.42f}//20 end 2 }; hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) @@ -436,7 +436,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -477,7 +477,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -564,11 +564,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -670,11 +670,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -785,11 +785,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -902,11 +902,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1004,11 +1004,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1097,11 +1097,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1193,7 +1193,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); DoCast(pTarget, SPELL_FROST_BREATH, true); } } @@ -1302,7 +1302,7 @@ public: void Reset() { forcemove = true; - Zpos = 10.0; + Zpos = 10.0f; StrikeTimer = 2000+rand()%5000; MoveTimer = 0; me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -1316,7 +1316,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } @@ -1389,7 +1389,7 @@ public: float x,y,z; me->getVictim()->GetPosition(x,y,z); me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); - Zpos-=1.0; + Zpos-=1.0f; if (Zpos <= 0)Zpos=0; MoveTimer = 2000; } else MoveTimer-=diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index af05690362e..d1bec246942 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -137,59 +137,59 @@ enum float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= { { - {NPC_ZOMBIE, 2164.698975, 1255.392944, 135.040878, 0.490202}, - {NPC_ZOMBIE, 2183.501465, 1263.079102, 134.859055, 3.169981}, - {NPC_GHOUL, 2177.512939, 1247.313843, 135.846695, 1.696574}, - {NPC_GHOUL, 2171.991943, 1246.615845, 135.745026, 1.696574}, + {NPC_ZOMBIE, 2164.698975f, 1255.392944f, 135.040878f, 0.490202f}, + {NPC_ZOMBIE, 2183.501465f, 1263.079102f, 134.859055f, 3.169981f}, + {NPC_GHOUL, 2177.512939f, 1247.313843f, 135.846695f, 1.696574f}, + {NPC_GHOUL, 2171.991943f, 1246.615845f, 135.745026f, 1.696574f}, {0, 0, 0, 0, 0} }, { - {NPC_GHOUL, 2254.434326, 1163.427612, 138.055038, 2.077358}, - {NPC_GHOUL, 2254.703613, 1158.867798, 138.212234, 2.345532}, - {NPC_GHOUL, 2257.615723, 1162.310913, 138.091202, 2.077358}, - {NPC_NECROMANCER, 2258.258057, 1157.250732, 138.272873, 2.387766}, + {NPC_GHOUL, 2254.434326f, 1163.427612f, 138.055038f, 2.077358f}, + {NPC_GHOUL, 2254.703613f, 1158.867798f, 138.212234f, 2.345532f}, + {NPC_GHOUL, 2257.615723f, 1162.310913f, 138.091202f, 2.077358f}, + {NPC_NECROMANCER, 2258.258057f, 1157.250732f, 138.272873f, 2.387766f}, {0, 0, 0, 0, 0} }, { - {NPC_STALKER, 2348.120117, 1202.302490, 130.491104, 4.698538}, - {NPC_GHOUL, 2352.863525, 1207.819092, 130.424271, 4.949865}, - {NPC_GHOUL, 2343.593750, 1207.915039, 130.781311, 4.321547}, - {NPC_NECROMANCER, 2348.257324, 1212.202515, 130.670135, 4.450352}, + {NPC_STALKER, 2348.120117f, 1202.302490f, 130.491104f, 4.698538f}, + {NPC_GHOUL, 2352.863525f, 1207.819092f, 130.424271f, 4.949865f}, + {NPC_GHOUL, 2343.593750f, 1207.915039f, 130.781311f, 4.321547f}, + {NPC_NECROMANCER, 2348.257324f, 1212.202515f, 130.670135f, 4.450352f}, {0, 0, 0, 0, 0} }, { - {NPC_STALKER, 2139.825195, 1356.277100, 132.199615, 5.820131}, - {NPC_GHOUL, 2137.073486, 1362.464844, 132.271637, 5.820131}, - {NPC_GHOUL, 2134.075684, 1354.148071, 131.885864, 5.820131}, - {NPC_NECROMANCER, 2133.302246, 1358.907837, 132.037689, 5.820131}, + {NPC_STALKER, 2139.825195f, 1356.277100f, 132.199615f, 5.820131f}, + {NPC_GHOUL, 2137.073486f, 1362.464844f, 132.271637f, 5.820131f}, + {NPC_GHOUL, 2134.075684f, 1354.148071f, 131.885864f, 5.820131f}, + {NPC_NECROMANCER, 2133.302246f, 1358.907837f, 132.037689f, 5.820131f}, {0, 0, 0, 0, 0} }, { - {NPC_NECROMANCER, 2264.013428, 1174.055908, 138.093094, 2.860481}, - {NPC_GHOUL, 2264.207764, 1170.892700, 138.034973, 2.860481}, - {NPC_GHOUL, 2266.948975, 1176.898926, 137.976929, 2.860481}, - {NPC_STALKER, 2269.215576, 1170.109253, 137.742691, 2.860481}, - {NPC_FIEND, 2273.106689, 1176.101074, 137.880508, 2.860481} + {NPC_NECROMANCER, 2264.013428f, 1174.055908f, 138.093094f, 2.860481f}, + {NPC_GHOUL, 2264.207764f, 1170.892700f, 138.034973f, 2.860481f}, + {NPC_GHOUL, 2266.948975f, 1176.898926f, 137.976929f, 2.860481f}, + {NPC_STALKER, 2269.215576f, 1170.109253f, 137.742691f, 2.860481f}, + {NPC_FIEND, 2273.106689f, 1176.101074f, 137.880508f, 2.860481f} }, { - {NPC_GOLEM, 2349.701660, 1188.436646, 130.428864, 3.908642}, - {NPC_GHOUL, 2349.909180, 1194.582642, 130.417816, 3.577001}, - {NPC_EGHOUL, 2354.662598, 1185.692017, 130.552032, 3.577001}, - {NPC_EGHOUL, 2354.716797, 1191.614380, 130.539810, 3.577001}, + {NPC_GOLEM, 2349.701660f, 1188.436646f, 130.428864f, 3.908642f}, + {NPC_GHOUL, 2349.909180f, 1194.582642f, 130.417816f, 3.577001f}, + {NPC_EGHOUL, 2354.662598f, 1185.692017f, 130.552032f, 3.577001f}, + {NPC_EGHOUL, 2354.716797f, 1191.614380f, 130.539810f, 3.577001f}, {0, 0, 0, 0, 0} }, { - {NPC_CONSTRUCT, 2145.212891, 1355.288086, 132.288773, 6.004838}, - {NPC_NECROMANCER, 2137.078613, 1357.612671, 132.173340, 6.004838}, - {NPC_EGHOUL, 2139.402100, 1352.541626, 132.127518, 5.812850}, - {NPC_EGHOUL, 2142.408447, 1360.760620, 132.321564, 5.812850}, + {NPC_CONSTRUCT, 2145.212891f, 1355.288086f, 132.288773f, 6.004838f}, + {NPC_NECROMANCER, 2137.078613f, 1357.612671f, 132.173340f, 6.004838f}, + {NPC_EGHOUL, 2139.402100f, 1352.541626f, 132.127518f, 5.812850f}, + {NPC_EGHOUL, 2142.408447f, 1360.760620f, 132.321564f, 5.812850f}, {0, 0, 0, 0, 0} }, { - {NPC_GHOUL, 2172.686279, 1259.618164, 134.391754, 1.865499}, - {NPC_FIEND, 2177.649170, 1256.061157, 135.096512, 1.849572}, - {NPC_CONSTRUCT, 2170.782959, 1253.594849, 134.973022, 1.849572}, - {NPC_NECROMANCER, 2175.595703, 1249.041992, 135.603531, 1.849572}, + {NPC_GHOUL, 2172.686279f, 1259.618164f, 134.391754f, 1.865499f}, + {NPC_FIEND, 2177.649170f, 1256.061157f, 135.096512f, 1.849572f}, + {NPC_CONSTRUCT, 2170.782959f, 1253.594849f, 134.973022f, 1.849572f}, + {NPC_NECROMANCER, 2175.595703f, 1249.041992f, 135.603531f, 1.849572f}, {0, 0, 0, 0, 0} } }; @@ -197,25 +197,25 @@ float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= // Locations for rifts to spawn and draconians to go float RiftAndSpawnsLocations[ENCOUNTER_CHRONO_SPAWNS][5]= { - {NPC_TIME_RIFT, 2431.790039, 1190.670044, 148.076004, 0.187923}, - {NPC_INFINITE_ADVERSARY, 2433.857910, 1185.612061, 148.075974, 4.566168}, - {NPC_INFINITE_ADVERSARY, 2437.577881, 1188.241089, 148.075974, 0.196999}, - {NPC_INFINITE_AGENT, 2437.165527, 1192.294922, 148.075974, 0.169247}, - {NPC_INFINITE_HUNTER, 2434.989990, 1197.679565, 148.075974, 0.715971}, - {NPC_TIME_RIFT, 2403.954834, 1178.815430, 148.075943, 4.966126}, - {NPC_INFINITE_AGENT, 2403.676758, 1171.495850, 148.075607, 4.902797}, - {NPC_INFINITE_HUNTER, 2407.691162, 1172.162720, 148.075607, 4.963010}, - {NPC_TIME_RIFT, 2414.217041, 1133.446167, 148.076050, 1.706972}, - {NPC_INFINITE_ADVERSARY, 2416.024658, 1139.456177, 148.076431, 1.752129}, - {NPC_INFINITE_HUNTER, 2410.866699, 1139.680542, 148.076431, 1.752129}, - {NPC_TIME_RIFT, 2433.081543, 1099.869751, 148.076157, 1.809509}, - {NPC_INFINITE_ADVERSARY, 2426.947998, 1107.471680, 148.076019, 1.877580}, - {NPC_INFINITE_HUNTER, 2432.944580, 1108.896362, 148.208160, 2.199241}, - {NPC_TIME_RIFT, 2444.077637, 1114.366089, 148.076157, 3.049565}, - {NPC_INFINITE_ADVERSARY, 2438.190674, 1118.368164, 148.076172, 3.139232}, - {NPC_INFINITE_AGENT, 2435.861328, 1113.402954, 148.169327, 2.390271}, - {NPC_TIME_RIFT, 2463.131592, 1115.391724, 152.473129, 3.409651}, - {NPC_EPOCH, 2451.809326, 1112.901245, 149.220459, 3.363617} + {NPC_TIME_RIFT, 2431.790039f, 1190.670044f, 148.076004f, 0.187923f}, + {NPC_INFINITE_ADVERSARY, 2433.857910f, 1185.612061f, 148.075974f, 4.566168f}, + {NPC_INFINITE_ADVERSARY, 2437.577881f, 1188.241089f, 148.075974f, 0.196999f}, + {NPC_INFINITE_AGENT, 2437.165527f, 1192.294922f, 148.075974f, 0.169247f}, + {NPC_INFINITE_HUNTER, 2434.989990f, 1197.679565f, 148.075974f, 0.715971f}, + {NPC_TIME_RIFT, 2403.954834f, 1178.815430f, 148.075943f, 4.966126f}, + {NPC_INFINITE_AGENT, 2403.676758f, 1171.495850f, 148.075607f, 4.902797f}, + {NPC_INFINITE_HUNTER, 2407.691162f, 1172.162720f, 148.075607f, 4.963010f}, + {NPC_TIME_RIFT, 2414.217041f, 1133.446167f, 148.076050f, 1.706972f}, + {NPC_INFINITE_ADVERSARY, 2416.024658f, 1139.456177f, 148.076431f, 1.752129f}, + {NPC_INFINITE_HUNTER, 2410.866699f, 1139.680542f, 148.076431f, 1.752129f}, + {NPC_TIME_RIFT, 2433.081543f, 1099.869751f, 148.076157f, 1.809509f}, + {NPC_INFINITE_ADVERSARY, 2426.947998f, 1107.471680f, 148.076019f, 1.877580f}, + {NPC_INFINITE_HUNTER, 2432.944580f, 1108.896362f, 148.208160f, 2.199241f}, + {NPC_TIME_RIFT, 2444.077637f, 1114.366089f, 148.076157f, 3.049565f}, + {NPC_INFINITE_ADVERSARY, 2438.190674f, 1118.368164f, 148.076172f, 3.139232f}, + {NPC_INFINITE_AGENT, 2435.861328f, 1113.402954f, 148.169327f, 2.390271f}, + {NPC_TIME_RIFT, 2463.131592f, 1115.391724f, 152.473129f, 3.409651f}, + {NPC_EPOCH, 2451.809326f, 1112.901245f, 149.220459f, 3.363617f} }; #define GOSSIP_ITEM_ARTHAS_0 "I'm ready to start Culling of Stratholme." diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 8c9be6ce445..77f82a180db 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -39,10 +39,10 @@ inline uint32 RandRiftBoss() { return ((rand()%2) ? C_RKEEP : C_RLORD); } float PortalLocation[4][4]= { - {-2041.06, 7042.08, 29.99, 1.30}, - {-1968.18, 7042.11, 21.93, 2.12}, - {-1885.82, 7107.36, 22.32, 3.07}, - {-1928.11, 7175.95, 22.11, 3.44} + {-2041.06f, 7042.08f, 29.99f, 1.30f}, + {-1968.18f, 7042.11f, 21.93f, 2.12f}, + {-1885.82f, 7107.36f, 22.32f, 3.07f}, + {-1928.11f, 7175.95f, 22.11f, 3.44f} }; struct Wave diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index a811bed91d0..966642f9c98 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -78,25 +78,25 @@ struct Location static Location DrakeWP[]= { - {0, 2125.84, 88.2535, 54.8830}, - {1, 2111.01, 93.8022, 52.6356}, - {2, 2106.70, 114.753, 53.1965}, - {3, 2107.76, 138.746, 52.5109}, - {4, 2114.83, 160.142, 52.4738}, - {5, 2125.24, 178.909, 52.7283}, - {6, 2151.02, 208.901, 53.1551}, - {7, 2177.00, 233.069, 52.4409}, - {8, 2190.71, 227.831, 53.2742}, - {9, 2178.14, 214.219, 53.0779}, - {10, 2154.99, 202.795, 52.6446}, - {11, 2132.00, 191.834, 52.5709}, - {12, 2117.59, 166.708, 52.7686}, - {13, 2093.61, 139.441, 52.7616}, - {14, 2086.29, 104.950, 52.9246}, - {15, 2094.23, 81.2788, 52.6946}, - {16, 2108.70, 85.3075, 53.3294}, - {17, 2125.50, 88.9481, 54.7953}, - {18, 2128.20, 70.9763, 64.4221} + {0, 2125.84f, 88.2535f, 54.8830f}, + {1, 2111.01f, 93.8022f, 52.6356f}, + {2, 2106.70f, 114.753f, 53.1965f}, + {3, 2107.76f, 138.746f, 52.5109f}, + {4, 2114.83f, 160.142f, 52.4738f}, + {5, 2125.24f, 178.909f, 52.7283f}, + {6, 2151.02f, 208.901f, 53.1551f}, + {7, 2177.00f, 233.069f, 52.4409f}, + {8, 2190.71f, 227.831f, 53.2742f}, + {9, 2178.14f, 214.219f, 53.0779f}, + {10, 2154.99f, 202.795f, 52.6446f}, + {11, 2132.00f, 191.834f, 52.5709f}, + {12, 2117.59f, 166.708f, 52.7686f}, + {13, 2093.61f, 139.441f, 52.7616f}, + {14, 2086.29f, 104.950f, 52.9246f}, + {15, 2094.23f, 81.2788f, 52.6946f}, + {16, 2108.70f, 85.3075f, 53.3294f}, + {17, 2125.50f, 88.9481f, 54.7953f}, + {18, 2128.20f, 70.9763f, 64.4221f} }; class boss_lieutenant_drake : public CreatureScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 65c471c1afa..a6916fdb2e7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -146,7 +146,7 @@ public: if (mBarrelCount == 5) { UpdateQuestCredit(); - pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43, 71.01, 64.42, 1.74, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); + pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43f, 71.01f, 64.42f, 1.74f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); m_auiEncounter[0] = DONE; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index a3e0c6beb5b..e4d35ada722 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -228,7 +228,7 @@ public: case GOSSIP_ACTION_INFO_DEF+20: pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); + pCreature->SummonCreature(SKARLOC_MOUNT,2038.81f,270.26f,63.20f,5.41f,TEMPSUMMON_TIMED_DESPAWN,12000); if (pInstance) pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); @@ -304,7 +304,7 @@ public: { case 8: SetRun(false); - me->SummonCreature(18764,2181.87,112.46,89.45,0.26,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(18764,2181.87f,112.46f,89.45f,0.26f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 9: DoScriptText(SAY_TH_ARMORY, me); @@ -322,26 +322,26 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28,137.37,87.93,5.07,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44,131.83,87.93,0.78,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62,135.40,87.93,3.70,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75,130.13,87.93,1.48,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2200.28f,137.37f,87.93f,5.07f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2197.44f,131.83f,87.93f,0.78f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2203.62f,135.40f,87.93f,3.70f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2200.75f,130.13f,87.93f,1.48f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80,154.01,67.45,4.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36,151.87,67.74,4.46,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12,154.41,67.12,4.56,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08,155.38,67.24,4.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2135.80f,154.01f,67.45f,4.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2144.36f,151.87f,67.74f,4.46f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2142.12f,154.41f,67.12f,4.56f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2138.08f,155.38f,67.24f,4.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98,192.17,65.24,6.02,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48,198.75,65.18,5.15,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11,197.29,65.18,5.63,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18,194.82,65.18,5.75,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2102.98f,192.17f,65.24f,6.02f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2108.48f,198.75f,65.18f,5.15f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2106.11f,197.29f,65.18f,5.63f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2104.18f,194.82f,65.18f,5.75f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 29: DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(ENTRY_SCARLOC,2036.48f,271.22f,63.43f,5.27f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); //temporary,skarloc should rather be triggered to walk up to thrall break; case 30: @@ -356,12 +356,12 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26,522.16,56.87,3.99,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69,525.37,57.11,4.01,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65,524.55,56.63,3.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26f,522.16f,56.87f,3.99f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69f,525.37f,57.11f,4.01f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_SENTRY,2124.65f,524.55f,56.63f,3.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64,625.77,58.26,4.71,TEMPSUMMON_TIMED_DESPAWN,10000); + me->SummonCreature(SKARLOC_MOUNT,2488.64f,625.77f,58.26f,4.71f,TEMPSUMMON_TIMED_DESPAWN,10000); DoUnmount(); HadMount = false; SetRun(false); @@ -378,10 +378,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22,692.60,55.50,2.84,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13,696.55,55.51,3.38,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55,693.64,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94,695.81,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22f,692.60f,55.50f,2.84f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13f,696.55f,55.51f,3.38f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55f,693.64f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94f,695.81f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 71: SetRun(); @@ -390,10 +390,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33,646.82,56.03,4.28,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14,648.03,56.03,4.50,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32,649.60,56.03,4.38,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22,649.00,56.03,4.34,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33f,646.82f,56.03f,4.28f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14f,648.03f,56.03f,4.50f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32f,649.60f,56.03f,4.38f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22f,649.00f,56.03f,4.34f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); break; case 84: DoScriptText(SAY_TH_CHURCH_END, me); @@ -404,10 +404,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71,660.31,61.93,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96,662.59,61.93,0.79,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36,662.34,61.93,2.68,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39,659.77,61.93,2.61,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71f,660.31f,61.93f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96f,662.59f,61.93f,0.79f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36f,662.34f,61.93f,2.68f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39f,659.77f,61.93f,2.61f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 94: if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) @@ -455,7 +455,7 @@ public: } //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); + me->SummonCreature(EROZION_ENTRY,2646.47f,680.416f,55.38f,4.16f,TEMPSUMMON_TIMED_DESPAWN,120000); } break; case 108: @@ -599,7 +599,7 @@ public: { pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH,2639.13f,698.55f,65.43f,4.59f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index bc55b96d392..34612aa07ad 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -63,7 +63,7 @@ public: void JustDied(Unit* /*killer*/) { - me->SummonCreature(12238,28.067,61.875,-123.405,4.67,TEMPSUMMON_TIMED_DESPAWN,600000); + me->SummonCreature(12238,28.067f,61.875f,-123.405f,4.67f,TEMPSUMMON_TIMED_DESPAWN,600000); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 510366749b5..4c31c533ba7 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -87,17 +87,17 @@ static sOnyxMove aMoveData[]= {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f},//north }; -const Position MiddleRoomLocation = {-23.6155, -215.357, -55.7344}; +const Position MiddleRoomLocation = {-23.6155f, -215.357f, -55.7344f}; -const Position Phase2Location = {-80.924, -214.299, -82.942}; +const Position Phase2Location = {-80.924f, -214.299f, -82.942f}; static Position aSpawnLocations[3]= { //Whelps - {-30.127, -254.463, -89.440}, - {-30.817, -177.106, -89.258}, + {-30.127f, -254.463f, -89.440f}, + {-30.817f, -177.106f, -89.258f}, //Lair Guard - {-145.950, -212.831, -68.659} + {-145.950f, -212.831f, -68.659f} }; class boss_onyxia : public CreatureScript @@ -325,7 +325,7 @@ public: { uint32 uiMaxCount = sizeof(aMoveData)/sizeof(sOnyxMove); - int iTemp = rand()%(uiMaxCount-1); + uint32 iTemp = rand()%(uiMaxCount-1); if (iTemp >= m_uiMovePoint) ++iTemp; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index eb28b423162..8e218d882fb 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -158,17 +158,17 @@ public: } - if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635,844.140,46.896,0.633)) + if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = pGo->SummonCreature(uiCreature,2502.635 + float(irand(-5,5)),844.140 + float(irand(-5,5)),46.896,0.633)) - pSummon->GetMotionMaster()->MovePoint(0,2533.479 + float(irand(-5,5)),870.020 + float(irand(-5,5)),47.678); + if (Creature* pSummon = pGo->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f)) + pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); } } - pCreature->GetMotionMaster()->MovePoint(0,2533.479 + float(irand(-5,5)),870.020 + float(irand(-5,5)),47.678); + pCreature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); } break; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 150f697a3cf..b3156e2fd7e 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -87,7 +87,7 @@ public: DoScriptText(SAY_POINT, me, pPlayer); break; case 4: - me->SummonCreature(ENTRY_BOAR, 2137.66, 1843.98, 48.08, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 8: DoScriptText(SAY_BLUELEAF, me, pPlayer); @@ -99,7 +99,7 @@ public: DoScriptText(SAY_BAD, me, pPlayer); break; case 14: - me->SummonCreature(ENTRY_BOAR, 2078.91, 1704.54, 56.77, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 25: DoScriptText(SAY_THINK, me, pPlayer); @@ -111,7 +111,7 @@ public: DoScriptText(SAY_FINALY, me, pPlayer); break; case 43: - me->SummonCreature(ENTRY_BOAR, 1956.43, 1596.97, 81.75, 1.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: DoScriptText(SAY_WIN, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index c3aca926847..63283665518 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -148,7 +148,7 @@ public: switch(urand(0,2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142,1289.2900,-74.419533,5.112); + DoTeleportPlayer(pTarget, -8106.0142f,1289.2900f,-74.419533f,5.112f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -163,7 +163,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354,1155.1907,-78.849319,2.608); + DoTeleportPlayer(pTarget, -7990.135354f,1155.1907f,-78.849319f,2.608f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -178,7 +178,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget,-8159.7753,1127.9064,-76.868660,0.675); + DoTeleportPlayer(pTarget,-8159.7753f,1127.9064f,-76.868660f,0.675f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index c60bbc738ee..40e5bb57938 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -157,15 +157,15 @@ public: switch (urand(0,2)) { case 0: - me->GetMap()->CreatureRelocation(me, -8340.782227,2083.814453,125.648788,0.0f); + me->GetMap()->CreatureRelocation(me, -8340.782227f,2083.814453f,125.648788f,0.0f); DoResetThreat(); break; case 1: - me->GetMap()->CreatureRelocation(me, -8341.546875,2118.504639,133.058151,0.0f); + me->GetMap()->CreatureRelocation(me, -8341.546875f,2118.504639f,133.058151f,0.0f); DoResetThreat(); break; case 2: - me->GetMap()->CreatureRelocation(me, -8318.822266,2058.231201,133.058151,0.0f); + me->GetMap()->CreatureRelocation(me, -8318.822266f,2058.231201f,133.058151f,0.0f); DoResetThreat(); break; } @@ -174,7 +174,7 @@ public: Blink_Timer= 20000 + rand()%20000; } else Blink_Timer -= diff; - int procent = (int) (me->GetHealth()*100 / me->GetMaxHealth() +0.5); + int procent = (int) (me->GetHealth()*100 / me->GetMaxHealth() +0.5f); //Summoning 2 Images and teleporting to a random position on 75% health if ((!Images75 && !IsImage) && (procent <= 75 && procent > 70)) @@ -210,9 +210,9 @@ public: { DoScriptText(SAY_SPLIT, me); - ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227,2083.814453,125.648788,0); - ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875,2118.504639,133.058151,0); - ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266,2058.231201,133.058151,0); + ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f,2083.814453f,125.648788f,0); + ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f,2118.504639f,133.058151f,0); + ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f,2058.231201f,133.058151f,0); ov_mycoordinates *bossc=place1, *i1=place2, *i2=place3; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 2ac8e6a24a0..93ede297ad0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -251,7 +251,7 @@ public: continue; if (sent->isDead()) continue; - int h = sent->GetHealth() + (sent->GetMaxHealth() / 2); + uint32 h = sent->GetHealth() + (sent->GetMaxHealth() / 2); if (h > sent->GetMaxHealth()) h = sent->GetMaxHealth(); sent->SetHealth(h); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 1413720cec7..c980cbf8fd8 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -227,8 +227,8 @@ public: { ++eventProgress; DoScriptText(SAY_TEMPLE_OF_PROMISE, me); - me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763, 227.874, -93.3233, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506, 216.645, -93.6756, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763f, 227.874f, -93.3233f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506f, 216.645f, -93.6756f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } break; case TYPE_NARALEX_PART2: @@ -239,9 +239,9 @@ public: DoCast(me, SPELL_SERPENTINE_CLEANSING); //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); eventTimer = 30000; - me->SummonCreature(NPC_DEVIATE_VIPER, -61.5261, 273.676, -92.8442, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_VIPER, -58.4658, 280.799, -92.8393, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_VIPER, -50.002, 278.578, -92.8442, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -61.5261f, 273.676f, -92.8442f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -58.4658f, 280.799f, -92.8393f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -50.002f, 278.578f, -92.8442f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } else if (eventProgress == 2) @@ -278,9 +278,9 @@ public: eventTimer = 15000; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943, 199.701, -103.529, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08, 221.13, -103.609, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007, 227.428, -97.421, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007f, 227.428f, -97.421f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); } else if (eventProgress == 4) @@ -289,13 +289,13 @@ public: eventTimer = 30000; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413, 207.188, -102.469, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857, 218.645, -102.905, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102, 227.211, -102.752, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 153.372, 235.149, -102.826, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 149.524, 251.113, -102.558, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 136.208, 266.466, -102.977, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 126.167, 274.759, -102.962, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102f, 227.211f, -102.752f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 153.372f, 235.149f, -102.826f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 149.524f, 251.113f, -102.558f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 136.208f, 266.466f, -102.977f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 126.167f, 274.759f, -102.962f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); } else if (eventProgress == 5) @@ -303,7 +303,7 @@ public: ++eventProgress; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); - me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872, 262.905, -103.503, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); pInstance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } @@ -369,11 +369,11 @@ public: eventTimer = 2500; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) { - naralex->GetMotionMaster()->MovePoint(0, 117.095512, 247.107971, -96.167870); - naralex->GetMotionMaster()->MovePoint(1, 90.388809, 276.135406, -83.389801); + naralex->GetMotionMaster()->MovePoint(0, 117.095512f, 247.107971f, -96.167870f); + naralex->GetMotionMaster()->MovePoint(1, 90.388809f, 276.135406f, -83.389801f); } - me->GetMotionMaster()->MovePoint(26, 117.095512, 247.107971, -96.167870); - me->GetMotionMaster()->MovePoint(27, 144.375443, 281.045837, -82.477135); + me->GetMotionMaster()->MovePoint(26, 117.095512f, 247.107971f, -96.167870f); + me->GetMotionMaster()->MovePoint(27, 144.375443f, 281.045837f, -82.477135f); } else if (eventProgress == 11) diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 4e29a71e21a..6552d008143 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y no z coordinat b/c they're all the same */ float pyramidSpawns [pyramidSpawnTotal][4] = { - {1,7789,1894.64,1206.29}, - {1,7787,1890.08,1218.68}, - {1,8876,1883.76,1222.3}, - {1,7789,1874.18,1221.24}, - {1,7787,1892.28,1225.49}, - {1,7788,1889.94,1212.21}, - {1,7787,1879.02,1223.06}, - {1,7789,1874.45,1204.44}, - {1,8876,1898.23,1217.97}, - {1,7787,1882.07,1225.7}, - {1,8877,1896.46,1205.62}, - {1,7787,1886.97,1225.86}, - {1,7787,1894.72,1221.91}, - {1,7787,1883.5,1218.25}, - {1,7787,1886.93,1221.4}, - {1,8876,1889.82,1222.51}, - {1,7788,1893.07,1215.26}, - {1,7788,1878.57,1214.16}, - {1,7788,1883.74,1212.35}, - {1,8877,1877,1207.27}, - {1,8877,1873.63,1204.65}, - {1,8876,1877.4,1216.41}, - {1,8877,1899.63,1202.52}, - {2,7789,1902.83,1223.41}, - {2,8876,1889.82,1222.51}, - {2,7787,1883.5,1218.25}, - {2,7788,1883.74,1212.35}, - {2,8877,1877,1207.27}, - {2,7787,1890.08,1218.68}, - {2,7789,1894.64,1206.29}, - {2,8876,1877.4,1216.41}, - {2,7787,1892.28,1225.49}, - {2,7788,1893.07,1215.26}, - {2,8877,1896.46,1205.62}, - {2,7789,1874.45,1204.44}, - {2,7789,1874.18,1221.24}, - {2,7787,1879.02,1223.06}, - {2,8876,1898.23,1217.97}, - {2,7787,1882.07,1225.7}, - {2,8877,1873.63,1204.65}, - {2,7787,1886.97,1225.86}, - {2,7788,1878.57,1214.16}, - {2,7787,1894.72,1221.91}, - {2,7787,1886.93,1221.4}, - {2,8876,1883.76,1222.3}, - {2,7788,1889.94,1212.21}, - {2,8877,1899.63,1202.52}, - {3,7788,1878.57,1214.16}, - {3,7787,1894.72,1221.91}, - {3,7787,1886.93,1221.4}, - {3,8876,1883.76,1222.3}, - {3,7788,1889.94,1212.21}, - {3,7275,1889.23,1207.72}, - {3,7796,1879.77,1207.96} + {1,7789,1894.64f,1206.29f}, + {1,7787,1890.08f,1218.68f}, + {1,8876,1883.76f,1222.3f}, + {1,7789,1874.18f,1221.24f}, + {1,7787,1892.28f,1225.49f}, + {1,7788,1889.94f,1212.21f}, + {1,7787,1879.02f,1223.06f}, + {1,7789,1874.45f,1204.44f}, + {1,8876,1898.23f,1217.97f}, + {1,7787,1882.07f,1225.7f}, + {1,8877,1896.46f,1205.62f}, + {1,7787,1886.97f,1225.86f}, + {1,7787,1894.72f,1221.91f}, + {1,7787,1883.5f,1218.25f}, + {1,7787,1886.93f,1221.4f}, + {1,8876,1889.82f,1222.51f}, + {1,7788,1893.07f,1215.26f}, + {1,7788,1878.57f,1214.16f}, + {1,7788,1883.74f,1212.35f}, + {1,8877,1877,1207.27f}, + {1,8877,1873.63f,1204.65f}, + {1,8876,1877.4f,1216.41f}, + {1,8877,1899.63f,1202.52f}, + {2,7789,1902.83f,1223.41f}, + {2,8876,1889.82f,1222.51f}, + {2,7787,1883.5f,1218.25f}, + {2,7788,1883.74f,1212.35f}, + {2,8877,1877,1207.27f}, + {2,7787,1890.08f,1218.68f}, + {2,7789,1894.64f,1206.29f}, + {2,8876,1877.4f,1216.41f}, + {2,7787,1892.28f,1225.49f}, + {2,7788,1893.07f,1215.26f}, + {2,8877,1896.46f,1205.62f}, + {2,7789,1874.45f,1204.44f}, + {2,7789,1874.18f,1221.24f}, + {2,7787,1879.02f,1223.06f}, + {2,8876,1898.23f,1217.97f}, + {2,7787,1882.07f,1225.7f}, + {2,8877,1873.63f,1204.65f}, + {2,7787,1886.97f,1225.86f}, + {2,7788,1878.57f,1214.16f}, + {2,7787,1894.72f,1221.91f}, + {2,7787,1886.93f,1221.4f}, + {2,8876,1883.76f,1222.3f}, + {2,7788,1889.94f,1212.21f}, + {2,8877,1899.63f,1202.52f}, + {3,7788,1878.57f,1214.16f}, + {3,7787,1894.72f,1221.91f}, + {3,7787,1886.93f,1221.4f}, + {3,8876,1883.76f,1222.3f}, + {3,7788,1889.94f,1212.21f}, + {3,7275,1889.23f,1207.72f}, + {3,7796,1879.77f,1207.96f} }; float Spawnsway[2][3] = { - {1884.86,1228.62,9}, - {1887.53,1263,41} + {1884.86f,1228.62f,9}, + {1887.53f,1263,41} }; class instance_zulfarrak : public InstanceMapScript @@ -269,11 +269,11 @@ public: if (major_wave_Timer<diff) { // move NPCs to bottom of stair - MoveNPCIfAlive(ENTRY_BLY,1887.92,1228.179,9.98,4.78); - MoveNPCIfAlive(ENTRY_MURTA,1891.57,1228.68,9.69,4.78); - MoveNPCIfAlive(ENTRY_ORO,1897.23,1228.34,9.43,4.78); - MoveNPCIfAlive(ENTRY_RAVEN,1883.68,1227.95,9.543,4.78); - MoveNPCIfAlive(ENTRY_WEEGLI,1878.02,1227.65,9.485,4.78); + MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f); + MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f); + MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f); + MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f); + MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f); SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); } else @@ -283,11 +283,11 @@ public: if (IsWaveAllDead()) // move NPCS to their final positions { SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS); - MoveNPCIfAlive(ENTRY_BLY,1883.82,1200.83,8.87,1.32); - MoveNPCIfAlive(ENTRY_MURTA,1891.83,1201.45,8.87,1.32); - MoveNPCIfAlive(ENTRY_ORO,1894.50,1204.40,8.87,1.32); - MoveNPCIfAlive(ENTRY_RAVEN,1874.11,1206.17,8.87,1.32); - MoveNPCIfAlive(ENTRY_WEEGLI,1877.52,1199.63,8.87,1.32); + MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f); } break; }; @@ -313,7 +313,7 @@ public: { if (pyramidSpawns[i][0] == (float)wave) { - Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87, 0}; + Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0}; TempSummon* ts = instance->SummonCreature(pyramidSpawns[i][1],pos); ts->GetMotionMaster()->MoveRandom(10); addsAtBase.push_back(ts->GetGUID()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 18266d1a34a..02f95c23a7c 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -224,11 +224,11 @@ public: { pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance,ENTRY_BLY,1884.99,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_ORO,1886.47,1270.68,41.68); - initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19,1272.03,41.60); + initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f); + initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f); } return false; } @@ -362,7 +362,7 @@ public: { pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR); DoScriptText(SAY_WEEGLI_OHNO,me); - me->SetHomePosition(1882.69,1272.28,41.87,0); + me->SetHomePosition(1882.69f,1272.28f,41.87f,0); } else if (destroyingDoor) @@ -384,8 +384,8 @@ public: if (me->isAlive()) { me->setFaction(FACTION_FRIENDLY); - me->GetMotionMaster()->MovePoint(0, 1858.57,1146.35,14.745); - me->SetHomePosition(1858.57,1146.35,14.745,3.85); // in case he gets interrupted + me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f); + me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted DoScriptText(SAY_WEEGLI_OK_I_GO,me); destroyingDoor=true; } diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 9f03f29765a..f309db9ba08 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -85,9 +85,9 @@ class npc_torek : public CreatureScript break; case 19: //TODO: verify location and creatures amount. - me->SummonCreature(ENTRY_DURIEL,1776.73,-2049.06,109.83,1.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64,-2049.41,109.83,1.40,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73,-2049.50,109.83,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_DURIEL,1776.73f,-2049.06f,109.83f,1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64f,-2049.41f,109.83f,1.40f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73f,-2049.50f,109.83f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); break; case 20: DoScriptText(SAY_WIN, me, pPlayer); @@ -195,14 +195,14 @@ class npc_ruul_snowhoof : public CreatureScript Cage->SetGoState(GO_STATE_ACTIVE); break;} case 13: - me->SummonCreature(3922, 3449.218018, -587.825073, 174.978867, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3921, 3446.384521, -587.830872, 175.186279, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3926, 3444.218994, -587.835327, 175.380600, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3922, 3449.218018f, -587.825073f, 174.978867f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3921, 3446.384521f, -587.830872f, 175.186279f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3926, 3444.218994f, -587.835327f, 175.380600f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); break; case 19: - me->SummonCreature(3922, 3508.344482, -492.024261, 186.929031, 4.145029, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3921, 3506.265625, -490.531006, 186.740128, 4.239277, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3926, 3503.682373, -489.393799, 186.629684, 4.349232, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3922, 3508.344482f, -492.024261f, 186.929031f, 4.145029f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3921, 3506.265625f, -490.531006f, 186.740128f, 4.239277f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3926, 3503.682373f, -489.393799f, 186.629684f, 4.349232f, TEMPSUMMON_DEAD_DESPAWN, 60000); break; case 21:{ @@ -283,19 +283,19 @@ enum eEnums static float m_afFirstNagaCoord[3][3]= { - {3603.504150, 1122.631104, 1.635}, // rider - {3589.293945, 1148.664063, 5.565}, // sorceress - {3609.925537, 1168.759521, -1.168} // razortail + {3603.504150f, 1122.631104f, 1.635f}, // rider + {3589.293945f, 1148.664063f, 5.565f}, // sorceress + {3609.925537f, 1168.759521f, -1.168f} // razortail }; static float m_afSecondNagaCoord[3][3]= { - {3609.925537, 1168.759521, -1.168}, // witch - {3645.652100, 1139.425415, 1.322}, // priest - {3583.602051, 1128.405762, 2.347} // myrmidon + {3609.925537f, 1168.759521f, -1.168f}, // witch + {3645.652100f, 1139.425415f, 1.322f}, // priest + {3583.602051f, 1128.405762f, 2.347f} // myrmidon }; -static float m_fVorshaCoord[]={3633.056885, 1172.924072, -5.388}; +static float m_fVorshaCoord[]={3633.056885f, 1172.924072f, -5.388f}; class npc_muglash : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 44ae137278c..5e0c38af632 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -200,64 +200,64 @@ public: float WPs[58][4] = { //pos_x pos_y pos_z orien -{3691.97, -3962.41, 35.9118, 3.67}, -{3675.02, -3960.49, 35.9118, 3.67}, -{3653.19, -3958.33, 33.9118, 3.59}, -{3621.12, -3958.51, 29.9118, 3.48}, -{3604.86, -3963, 29.9118, 3.48}, -{3569.94, -3970.25, 29.9118, 3.44}, -{3541.03, -3975.64, 29.9118, 3.41}, -{3510.84, -3978.71, 29.9118, 3.41}, -{3472.7, -3997.07, 29.9118, 3.35}, -{3439.15, -4014.55, 29.9118, 3.29}, -{3412.8, -4025.87, 29.9118, 3.25}, -{3384.95, -4038.04, 29.9118, 3.24}, -{3346.77, -4052.93, 29.9118, 3.22}, -{3299.56, -4071.59, 29.9118, 3.20}, -{3261.22, -4080.38, 30.9118, 3.19}, -{3220.68, -4083.09, 31.9118, 3.18}, -{3187.11, -4070.45, 33.9118, 3.16}, -{3162.78, -4062.75, 33.9118, 3.15}, -{3136.09, -4050.32, 33.9118, 3.07}, -{3119.47, -4044.51, 36.0363, 3.07}, -{3098.95, -4019.8, 33.9118, 3.07}, -{3073.07, -4011.42, 33.9118, 3.07}, -{3051.71, -3993.37, 33.9118, 3.02}, -{3027.52, -3978.6, 33.9118, 3.00}, -{3003.78, -3960.14, 33.9118, 2.98}, -{2977.99, -3941.98, 31.9118, 2.96}, -{2964.57, -3932.07, 30.9118, 2.96}, -{2947.9, -3921.31, 29.9118, 2.96}, -{2924.91, -3910.8, 29.9118, 2.94}, -{2903.04, -3896.42, 29.9118, 2.93}, -{2884.75, -3874.03, 29.9118, 2.90}, -{2868.19, -3851.48, 29.9118, 2.82}, -{2854.62, -3819.72, 29.9118, 2.80}, -{2825.53, -3790.4, 29.9118, 2.744}, -{2804.31, -3773.05, 29.9118, 2.71}, -{2769.78, -3763.57, 29.9118, 2.70}, -{2727.23, -3745.92, 30.9118, 2.69}, -{2680.12, -3737.49, 30.9118, 2.67}, -{2647.62, -3739.94, 30.9118, 2.66}, -{2616.6, -3745.75, 30.9118, 2.64}, -{2589.38, -3731.97, 30.9118, 2.61}, -{2562.94, -3722.35, 31.9118, 2.56}, -{2521.05, -3716.6, 31.9118, 2.55}, -{2485.26, -3706.67, 31.9118, 2.51}, -{2458.93, -3696.67, 31.9118, 2.51}, -{2432, -3692.03, 31.9118, 2.46}, -{2399.59, -3681.97, 31.9118, 2.45}, -{2357.75, -3666.6, 31.9118, 2.44}, -{2311.99, -3656.88, 31.9118, 2.94}, -{2263.41, -3649.55, 31.9118, 3.02}, -{2209.05, -3641.76, 31.9118, 2.99}, -{2164.83, -3637.64, 31.9118, 3.15}, -{2122.42, -3639, 31.9118, 3.21}, -{2075.73, -3643.59, 31.9118, 3.22}, -{2033.59, -3649.52, 31.9118, 3.42}, -{1985.22, -3662.99, 31.9118, 3.42}, -{1927.09, -3679.56, 33.9118, 3.42}, -{1873.57, -3695.32, 33.9118, 3.44} +{3691.97f, -3962.41f, 35.9118f, 3.67f}, +{3675.02f, -3960.49f, 35.9118f, 3.67f}, +{3653.19f, -3958.33f, 33.9118f, 3.59f}, +{3621.12f, -3958.51f, 29.9118f, 3.48f}, +{3604.86f, -3963, 29.9118f, 3.48f}, +{3569.94f, -3970.25f, 29.9118f, 3.44f}, +{3541.03f, -3975.64f, 29.9118f, 3.41f}, +{3510.84f, -3978.71f, 29.9118f, 3.41f}, +{3472.7f, -3997.07f, 29.9118f, 3.35f}, +{3439.15f, -4014.55f, 29.9118f, 3.29f}, +{3412.8f, -4025.87f, 29.9118f, 3.25f}, +{3384.95f, -4038.04f, 29.9118f, 3.24f}, +{3346.77f, -4052.93f, 29.9118f, 3.22f}, +{3299.56f, -4071.59f, 29.9118f, 3.20f}, +{3261.22f, -4080.38f, 30.9118f, 3.19f}, +{3220.68f, -4083.09f, 31.9118f, 3.18f}, +{3187.11f, -4070.45f, 33.9118f, 3.16f}, +{3162.78f, -4062.75f, 33.9118f, 3.15f}, +{3136.09f, -4050.32f, 33.9118f, 3.07f}, +{3119.47f, -4044.51f, 36.0363f, 3.07f}, +{3098.95f, -4019.8f, 33.9118f, 3.07f}, +{3073.07f, -4011.42f, 33.9118f, 3.07f}, +{3051.71f, -3993.37f, 33.9118f, 3.02f}, +{3027.52f, -3978.6f, 33.9118f, 3.00f}, +{3003.78f, -3960.14f, 33.9118f, 2.98f}, +{2977.99f, -3941.98f, 31.9118f, 2.96f}, +{2964.57f, -3932.07f, 30.9118f, 2.96f}, +{2947.9f, -3921.31f, 29.9118f, 2.96f}, +{2924.91f, -3910.8f, 29.9118f, 2.94f}, +{2903.04f, -3896.42f, 29.9118f, 2.93f}, +{2884.75f, -3874.03f, 29.9118f, 2.90f}, +{2868.19f, -3851.48f, 29.9118f, 2.82f}, +{2854.62f, -3819.72f, 29.9118f, 2.80f}, +{2825.53f, -3790.4f, 29.9118f, 2.744f}, +{2804.31f, -3773.05f, 29.9118f, 2.71f}, +{2769.78f, -3763.57f, 29.9118f, 2.70f}, +{2727.23f, -3745.92f, 30.9118f, 2.69f}, +{2680.12f, -3737.49f, 30.9118f, 2.67f}, +{2647.62f, -3739.94f, 30.9118f, 2.66f}, +{2616.6f, -3745.75f, 30.9118f, 2.64f}, +{2589.38f, -3731.97f, 30.9118f, 2.61f}, +{2562.94f, -3722.35f, 31.9118f, 2.56f}, +{2521.05f, -3716.6f, 31.9118f, 2.55f}, +{2485.26f, -3706.67f, 31.9118f, 2.51f}, +{2458.93f, -3696.67f, 31.9118f, 2.51f}, +{2432, -3692.03f, 31.9118f, 2.46f}, +{2399.59f, -3681.97f, 31.9118f, 2.45f}, +{2357.75f, -3666.6f, 31.9118f, 2.44f}, +{2311.99f, -3656.88f, 31.9118f, 2.94f}, +{2263.41f, -3649.55f, 31.9118f, 3.02f}, +{2209.05f, -3641.76f, 31.9118f, 2.99f}, +{2164.83f, -3637.64f, 31.9118f, 3.15f}, +{2122.42f, -3639, 31.9118f, 3.21f}, +{2075.73f, -3643.59f, 31.9118f, 3.22f}, +{2033.59f, -3649.52f, 31.9118f, 3.42f}, +{1985.22f, -3662.99f, 31.9118f, 3.42f}, +{1927.09f, -3679.56f, 33.9118f, 3.42f}, +{1873.57f, -3695.32f, 33.9118f, 3.44f} }; class mob_rizzle_sprysprocket : public CreatureScript @@ -352,8 +352,8 @@ public: Map* pMap = me->GetMap(); if (pMap) { - pMap->CreatureRelocation(me, 3706.39, -3969.15, 35.9118, 0); - me->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0); + pMap->CreatureRelocation(me, 3706.39f, -3969.15f, 35.9118f, 0); + me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0); } //begin swimming and summon depth charges Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 4c69c9ac27f..bed937d5a9d 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -433,7 +433,7 @@ enum eGeezle GO_NAGA_FLAG = 181694 }; -static float SparkPos[3] = {-5029.91, -11291.79, 8.096}; +static float SparkPos[3] = {-5029.91f, -11291.79f, 8.096f}; class npc_geezle : public CreatureScript { @@ -487,8 +487,8 @@ public: { case 0: if (Spark) - Spark->GetMotionMaster()->MovePoint(0, -5080.70, -11253.61, 0.56); - me->GetMotionMaster()->MovePoint(0, -5092.26, -11252, 0.71); + Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); + me->GetMotionMaster()->MovePoint(0, -5092.26f, -11252, 0.71f); return 9000; // NPCs are walking up to fire case 1: DespawnNagaFlag(true); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 9ef82d1c953..e572514f251 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -365,7 +365,7 @@ public: ## npc_zelfrax ######*/ -const Position MovePosition = {-2967.030,-3872.1799,35.620}; +const Position MovePosition = {-2967.030f,-3872.1799f,35.620f}; enum eZelfrax { diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 9efcf4c8f44..aae5dd6f854 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -131,24 +131,24 @@ public: // First Ambush(3 Yetis) case 11: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_YETI, -4841.01, 1593.91, 73.42, 3.98, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_YETI, -4837.61, 1568.58, 78.21, 3.13, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_YETI, -4841.89, 1569.95, 76.53, 0.68, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4841.01f, 1593.91f, 73.42f, 3.98f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4837.61f, 1568.58f, 78.21f, 3.13f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4841.89f, 1569.95f, 76.53f, 0.68f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Second Ambush(3 Gorillas) case 21: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_GORILLA, -4595.81, 2005.99, 53.08, 3.74, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_GORILLA, -4597.53, 2008.31, 52.70, 3.78, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_GORILLA, -4599.37, 2010.59, 52.77, 3.84, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4595.81f, 2005.99f, 53.08f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4597.53f, 2008.31f, 52.70f, 3.78f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4599.37f, 2010.59f, 52.77f, 3.84f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Third Ambush(4 Gnolls) case 30: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14, 2075.87, 47.77, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68, 2077.98, 47.57, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33, 2080.24, 47.43, 3.87, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04, 2075.54, 46.83, 3.81, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: DoScriptText(SAY_OOX_END, me); diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index b2402d9d4c3..ac959773822 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -221,58 +221,58 @@ public: float Clintar_spirit_WP[41][5] = { //pos_x pos_y pos_z orien waitTime -{7465.28, -3115.46, 439.327, 0.83, 4000}, -{7476.49, -3101, 443.457, 0.89, 0}, -{7486.57, -3085.59, 439.478, 1.07, 0}, -{7472.19, -3085.06, 443.142, 3.07, 0}, -{7456.92, -3085.91, 438.862, 3.24, 0}, -{7446.68, -3083.43, 438.245, 2.40, 0}, -{7446.17, -3080.21, 439.826, 1.10, 6000}, -{7452.41, -3085.8, 438.984, 5.78, 0}, -{7469.11, -3084.94, 443.048, 6.25, 0}, -{7483.79, -3085.44, 439.607, 6.25, 0}, -{7491.14, -3090.96, 439.983, 5.44, 0}, -{7497.62, -3098.22, 436.854, 5.44, 0}, -{7498.72, -3113.41, 434.596, 4.84, 0}, -{7500.06, -3122.51, 434.749, 5.17, 0}, -{7504.96, -3131.53, 434.475, 4.74, 0}, -{7504.31, -3133.53, 435.693, 3.84, 6000}, -{7504.55, -3133.27, 435.476, 0.68, 15000}, -{7501.99, -3126.01, 434.93, 1.83, 0}, -{7490.76, -3114.97, 434.431, 2.51, 0}, -{7479.64, -3105.51, 431.123, 1.83, 0}, -{7474.63, -3086.59, 428.994, 1.83, 2000}, -{7472.96, -3074.18, 427.566, 1.57, 0}, -{7472.25, -3063, 428.268, 1.55, 0}, -{7473.46, -3054.22, 427.588, 0.36, 0}, -{7475.08, -3053.6, 428.653, 0.36, 6000}, -{7474.66, -3053.56, 428.433, 3.19, 4000}, -{7471.81, -3058.84, 427.073, 4.29, 0}, -{7472.16, -3064.91, 427.772, 4.95, 0}, -{7471.56, -3085.36, 428.924, 4.72, 0}, -{7473.56, -3093.48, 429.294, 5.04, 0}, -{7478.94, -3104.29, 430.638, 5.23, 0}, -{7484.46, -3109.61, 432.769, 5.79, 0}, -{7490.23, -3111.08, 434.431, 0.02, 0}, -{7496.29, -3108, 434.783, 1.15, 0}, -{7497.46, -3100.66, 436.191, 1.50, 0}, -{7495.64, -3093.39, 438.349, 2.10, 0}, -{7492.44, -3086.01, 440.267, 1.38, 0}, -{7498.26, -3076.44, 440.808, 0.71, 0}, -{7506.4, -3067.35, 443.64, 0.77, 0}, -{7518.37, -3057.42, 445.584, 0.74, 0}, -{7517.51, -3056.3, 444.568, 2.49, 4500} +{7465.28f, -3115.46f, 439.327f, 0.83f, 4000}, +{7476.49f, -3101, 443.457f, 0.89f, 0}, +{7486.57f, -3085.59f, 439.478f, 1.07f, 0}, +{7472.19f, -3085.06f, 443.142f, 3.07f, 0}, +{7456.92f, -3085.91f, 438.862f, 3.24f, 0}, +{7446.68f, -3083.43f, 438.245f, 2.40f, 0}, +{7446.17f, -3080.21f, 439.826f, 1.10f, 6000}, +{7452.41f, -3085.8f, 438.984f, 5.78f, 0}, +{7469.11f, -3084.94f, 443.048f, 6.25f, 0}, +{7483.79f, -3085.44f, 439.607f, 6.25f, 0}, +{7491.14f, -3090.96f, 439.983f, 5.44f, 0}, +{7497.62f, -3098.22f, 436.854f, 5.44f, 0}, +{7498.72f, -3113.41f, 434.596f, 4.84f, 0}, +{7500.06f, -3122.51f, 434.749f, 5.17f, 0}, +{7504.96f, -3131.53f, 434.475f, 4.74f, 0}, +{7504.31f, -3133.53f, 435.693f, 3.84f, 6000}, +{7504.55f, -3133.27f, 435.476f, 0.68f, 15000}, +{7501.99f, -3126.01f, 434.93f, 1.83f, 0}, +{7490.76f, -3114.97f, 434.431f, 2.51f, 0}, +{7479.64f, -3105.51f, 431.123f, 1.83f, 0}, +{7474.63f, -3086.59f, 428.994f, 1.83f, 2000}, +{7472.96f, -3074.18f, 427.566f, 1.57f, 0}, +{7472.25f, -3063, 428.268f, 1.55f, 0}, +{7473.46f, -3054.22f, 427.588f, 0.36f, 0}, +{7475.08f, -3053.6f, 428.653f, 0.36f, 6000}, +{7474.66f, -3053.56f, 428.433f, 3.19f, 4000}, +{7471.81f, -3058.84f, 427.073f, 4.29f, 0}, +{7472.16f, -3064.91f, 427.772f, 4.95f, 0}, +{7471.56f, -3085.36f, 428.924f, 4.72f, 0}, +{7473.56f, -3093.48f, 429.294f, 5.04f, 0}, +{7478.94f, -3104.29f, 430.638f, 5.23f, 0}, +{7484.46f, -3109.61f, 432.769f, 5.79f, 0}, +{7490.23f, -3111.08f, 434.431f, 0.02f, 0}, +{7496.29f, -3108, 434.783f, 1.15f, 0}, +{7497.46f, -3100.66f, 436.191f, 1.50f, 0}, +{7495.64f, -3093.39f, 438.349f, 2.10f, 0}, +{7492.44f, -3086.01f, 440.267f, 1.38f, 0}, +{7498.26f, -3076.44f, 440.808f, 0.71f, 0}, +{7506.4f, -3067.35f, 443.64f, 0.77f, 0}, +{7518.37f, -3057.42f, 445.584f, 0.74f, 0}, +{7517.51f, -3056.3f, 444.568f, 2.49f, 4500} }; #define ASPECT_RAVEN 22915 -#define ASPECT_RAVEN_SUMMON_X 7472.96 -#define ASPECT_RAVEN_SUMMON_Y -3074.18 -#define ASPECT_RAVEN_SUMMON_Z 427.566 -#define CLINTAR_SPIRIT_SUMMON_X 7459.2275 -#define CLINTAR_SPIRIT_SUMMON_Y -3122.5632 -#define CLINTAR_SPIRIT_SUMMON_Z 438.9842 -#define CLINTAR_SPIRIT_SUMMON_O 0.8594 +#define ASPECT_RAVEN_SUMMON_X 7472.96f +#define ASPECT_RAVEN_SUMMON_Y -3074.18f +#define ASPECT_RAVEN_SUMMON_Z 427.566f +#define CLINTAR_SPIRIT_SUMMON_X 7459.2275f +#define CLINTAR_SPIRIT_SUMMON_Y -3122.5632f +#define CLINTAR_SPIRIT_SUMMON_Z 438.9842f +#define CLINTAR_SPIRIT_SUMMON_O 0.8594f //from -1000292 to -1000287 are signed for 7806. but all this texts ids wrong. #define CLINTAR_SPIRIT_SAY_START -1000286 diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index b7009e339a5..7d615979f9c 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -206,56 +206,56 @@ public: float wp_plain_vision[50][3] = { - {-2226.32, -408.095, -9.36235}, - {-2203.04, -437.212, -5.72498}, - {-2163.91, -457.851, -7.09049}, - {-2123.87, -448.137, -9.29591}, - {-2104.66, -427.166, -6.49513}, - {-2101.48, -422.826, -5.3567}, - {-2097.56, -417.083, -7.16716}, - {-2084.87, -398.626, -9.88973}, - {-2072.71, -382.324, -10.2488}, - {-2054.05, -356.728, -6.22468}, - {-2051.8, -353.645, -5.35791}, - {-2049.08, -349.912, -6.15723}, - {-2030.6, -310.724, -9.59302}, - {-2002.15, -249.308, -10.8124}, - {-1972.85, -195.811, -10.6316}, - {-1940.93, -147.652, -11.7055}, - {-1888.06, -81.943, -11.4404}, - {-1837.05, -34.0109, -12.258}, - {-1796.12, -14.6462, -10.3581}, - {-1732.61, -4.27746, -10.0213}, - {-1688.94, -0.829945, -11.7103}, - {-1681.32, 13.0313, -9.48056}, - {-1677.04, 36.8349, -7.10318}, - {-1675.2, 68.559, -8.95384}, - {-1676.57, 89.023, -9.65104}, - {-1678.16, 110.939, -10.1782}, - {-1677.86, 128.681, -5.73869}, - {-1675.27, 144.324, -3.47916}, - {-1671.7, 163.169, -1.23098}, - {-1666.61, 181.584, 5.26145}, - {-1661.51, 196.154, 8.95252}, - {-1655.47, 210.811, 8.38727}, - {-1647.07, 226.947, 5.27755}, - {-1621.65, 232.91, 2.69579}, - {-1600.23, 237.641, 2.98539}, - {-1576.07, 242.546, 4.66541}, - {-1554.57, 248.494, 6.60377}, - {-1547.53, 259.302, 10.6741}, - {-1541.7, 269.847, 16.4418}, - {-1539.83, 278.989, 21.0597}, - {-1540.16, 290.219, 27.8247}, - {-1538.99, 298.983, 34.0032}, - {-1540.38, 307.337, 41.3557}, - {-1536.61, 314.884, 48.0179}, - {-1532.42, 323.277, 55.6667}, - {-1528.77, 329.774, 61.1525}, - {-1525.65, 333.18, 63.2161}, - {-1517.01, 350.713, 62.4286}, - {-1511.39, 362.537, 62.4539}, - {-1508.68, 366.822, 62.733} + {-2226.32f, -408.095f, -9.36235f}, + {-2203.04f, -437.212f, -5.72498f}, + {-2163.91f, -457.851f, -7.09049f}, + {-2123.87f, -448.137f, -9.29591f}, + {-2104.66f, -427.166f, -6.49513f}, + {-2101.48f, -422.826f, -5.3567f}, + {-2097.56f, -417.083f, -7.16716f}, + {-2084.87f, -398.626f, -9.88973f}, + {-2072.71f, -382.324f, -10.2488f}, + {-2054.05f, -356.728f, -6.22468f}, + {-2051.8f, -353.645f, -5.35791f}, + {-2049.08f, -349.912f, -6.15723f}, + {-2030.6f, -310.724f, -9.59302f}, + {-2002.15f, -249.308f, -10.8124f}, + {-1972.85f, -195.811f, -10.6316f}, + {-1940.93f, -147.652f, -11.7055f}, + {-1888.06f, -81.943f, -11.4404f}, + {-1837.05f, -34.0109f, -12.258f}, + {-1796.12f, -14.6462f, -10.3581f}, + {-1732.61f, -4.27746f, -10.0213f}, + {-1688.94f, -0.829945f, -11.7103f}, + {-1681.32f, 13.0313f, -9.48056f}, + {-1677.04f, 36.8349f, -7.10318f}, + {-1675.2f, 68.559f, -8.95384f}, + {-1676.57f, 89.023f, -9.65104f}, + {-1678.16f, 110.939f, -10.1782f}, + {-1677.86f, 128.681f, -5.73869f}, + {-1675.27f, 144.324f, -3.47916f}, + {-1671.7f, 163.169f, -1.23098f}, + {-1666.61f, 181.584f, 5.26145f}, + {-1661.51f, 196.154f, 8.95252f}, + {-1655.47f, 210.811f, 8.38727f}, + {-1647.07f, 226.947f, 5.27755f}, + {-1621.65f, 232.91f, 2.69579f}, + {-1600.23f, 237.641f, 2.98539f}, + {-1576.07f, 242.546f, 4.66541f}, + {-1554.57f, 248.494f, 6.60377f}, + {-1547.53f, 259.302f, 10.6741f}, + {-1541.7f, 269.847f, 16.4418f}, + {-1539.83f, 278.989f, 21.0597f}, + {-1540.16f, 290.219f, 27.8247f}, + {-1538.99f, 298.983f, 34.0032f}, + {-1540.38f, 307.337f, 41.3557f}, + {-1536.61f, 314.884f, 48.0179f}, + {-1532.42f, 323.277f, 55.6667f}, + {-1528.77f, 329.774f, 61.1525f}, + {-1525.65f, 333.18f, 63.2161f}, + {-1517.01f, 350.713f, 62.4286f}, + {-1511.39f, 362.537f, 62.4539f}, + {-1508.68f, 366.822f, 62.733f} }; class npc_plains_vision : public CreatureScript diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 9b2271cbb93..2200c2056a7 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -380,76 +380,76 @@ struct Location //Cordinates for Spawns static Location SpawnLocation[]= { - {-8085, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1526, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1520, 2.61, 3.141592},//Kaldorei Infantry - - {-8085, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8085, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1516, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1424, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1422, 2.61, 3.141592},//Kaldorei Infantry + {-8085, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8085, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8085, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1424, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1422, 2.61f, 3.141592f},//Kaldorei Infantry // 2 waves of warriors - {-8082, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1525, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1526, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1527, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1523, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1521, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1519, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1526, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8088, 1510, 2.61, 0},//Anubisath Conqueror - {-8084, 1520, 2.61, 0},//Anubisath Conqueror - {-8088, 1530, 2.61, 0},//Anubisath Conqueror - - {-8080, 1513, 2.61, 0},//Qiraj Wasp - {-8082, 1523, 2.61, 0},//Qiraj Wasp - {-8085, 1518, 2.61, 0},//Qiraj Wasp - {-8082, 1516, 2.61, 0},//Qiraj Wasp - {-8085, 1520, 2.61, 0},//Qiraj Wasp - {-8080, 1528, 2.61, 0},//Qiraj Wasp - - {-8082, 1513, 2.61, 0},//Qiraj Wasp - {-8079, 1523, 2.61, 0},//Qiraj Wasp - {-8080, 1531, 2.61, 0},//Qiraj Wasp - {-8079, 1516, 2.61, 0},//Qiraj Wasp - {-8082, 1520, 2.61, 0},//Qiraj Wasp - {-8080, 1518, 2.61, 0},//Qiraj Wasp - - {-8081, 1514, 2.61, 0},//Qiraj Tank - {-8081, 1520, 2.61, 0},//Qiraj Tank - {-8081, 1526, 2.61, 0},//Qiraj Tank - {-8081, 1512, 2.61, 0},//Qiraj Tank - {-8082, 1520, 2.61, 0},//Qiraj Tank - {-8081, 1528, 2.61, 0},//Qiraj Tank - - {-8082, 1513, 2.61, 3.141592},//Anubisath Conqueror - {-8082, 1520, 2.61, 3.141592},//Anubisath Conqueror - {-8082, 1527, 2.61, 3.141592},//Anubisath Conqueror + {-8082, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1525, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1527, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1523, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1521, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1519, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8088, 1510, 2.61f, 0},//Anubisath Conqueror + {-8084, 1520, 2.61f, 0},//Anubisath Conqueror + {-8088, 1530, 2.61f, 0},//Anubisath Conqueror + + {-8080, 1513, 2.61f, 0},//Qiraj Wasp + {-8082, 1523, 2.61f, 0},//Qiraj Wasp + {-8085, 1518, 2.61f, 0},//Qiraj Wasp + {-8082, 1516, 2.61f, 0},//Qiraj Wasp + {-8085, 1520, 2.61f, 0},//Qiraj Wasp + {-8080, 1528, 2.61f, 0},//Qiraj Wasp + + {-8082, 1513, 2.61f, 0},//Qiraj Wasp + {-8079, 1523, 2.61f, 0},//Qiraj Wasp + {-8080, 1531, 2.61f, 0},//Qiraj Wasp + {-8079, 1516, 2.61f, 0},//Qiraj Wasp + {-8082, 1520, 2.61f, 0},//Qiraj Wasp + {-8080, 1518, 2.61f, 0},//Qiraj Wasp + + {-8081, 1514, 2.61f, 0},//Qiraj Tank + {-8081, 1520, 2.61f, 0},//Qiraj Tank + {-8081, 1526, 2.61f, 0},//Qiraj Tank + {-8081, 1512, 2.61f, 0},//Qiraj Tank + {-8082, 1520, 2.61f, 0},//Qiraj Tank + {-8081, 1528, 2.61f, 0},//Qiraj Tank + + {-8082, 1513, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082, 1520, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082, 1527, 2.61f, 3.141592f},//Anubisath Conqueror }; struct WaveData @@ -570,7 +570,7 @@ public: break; case 7: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, NULL); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); + Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); break; case 8: DoScriptText(MERITHRA_YELL_1,Merithra); @@ -581,7 +581,7 @@ public: case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Merithra->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61,3); + Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,3); break; case 11: Merithra->CastSpell(Merithra,24818,false); @@ -596,8 +596,8 @@ public: Merithra->SetVisibility(VISIBILITY_OFF); break; case 15: - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); - Merithra->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,42); + Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); break; case 16: DoScriptText(ARYGOS_YELL_1, Arygos); @@ -608,7 +608,7 @@ public: case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Arygos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61,42); + Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,42); break; case 19: Arygos->CastSpell(Arygos,50505,false); @@ -622,9 +622,9 @@ public: DoScriptText(CAELESTRASZ_SAY_2,Caelestrasz, Fandral); break; case 23: - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); Arygos->SetVisibility(VISIBILITY_OFF); - Arygos->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,10); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10); break; case 24: DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); @@ -635,7 +635,7 @@ public: case 26: Caelestrasz->HandleEmoteCommand(254); Caelestrasz->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61,4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61f,4); break; case 27: Caelestrasz->CastSpell(Caelestrasz,54293,false); @@ -654,9 +654,9 @@ public: break; case 32: Caelestrasz->SetVisibility(VISIBILITY_OFF); - Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,42); - Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77,8); - me->GetMotionMaster()->MoveCharge(-8113,1525,2.77,8); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); + Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8); + me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8); break;//both run to the gate case 33: DoScriptText(ANACHRONOS_SAY_4, me); @@ -666,17 +666,17 @@ public: DoCast(plr, 23017, true);//Arcane Channeling break; case 35: - me->CastSpell(-8088,1520.43,2.67,25158,true); + me->CastSpell(-8088,1520.43f,2.67f,25158,true); break; case 36: DoCast(plr, 25159, true); break; case 37: - me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); break; case 38: DoCast(plr, 25166, true); - me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); break; case 39: DoScriptText(ANACHRONOS_SAY_5, me, Fandral); @@ -685,7 +685,7 @@ public: Fandral->CastSpell(me, 25167, true); break; case 41: - Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); DoScriptText(FANDRAL_SAY_3, Fandral); break; case 42: @@ -703,7 +703,7 @@ public: break; case 46: DoScriptText(ANACHRONOS_SAY_8, me); - me->GetMotionMaster()->MoveCharge(-8110,1527,2.77,4); + me->GetMotionMaster()->MoveCharge(-8110,1527,2.77f,4); break; case 47: DoScriptText(ANACHRONOS_EMOTE_1, me); @@ -716,7 +716,7 @@ public: break; case 50: DoScriptText(FANDRAL_EMOTE_2,Fandral); - Fandral->CastSpell(-8127,1525,17.5,33806,true); + Fandral->CastSpell(-8127,1525,17.5f,33806,true); break; case 51: { @@ -733,7 +733,7 @@ public: break; } case 52: - Fandral->GetMotionMaster()->MoveCharge(-8028.75, 1538.795, 2.61,4); + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f,4); DoScriptText(ANACHRONOS_SAY_9, me,Fandral); break; case 53: @@ -747,24 +747,24 @@ public: break; case 56: DoScriptText(ANACHRONOS_EMOTE_3, me); - me->GetMotionMaster()->MoveCharge(-8116,1522,3.65,4); + me->GetMotionMaster()->MoveCharge(-8116,1522,3.65f,4); break; case 57: - me->GetMotionMaster()->MoveCharge(-8116.7,1527,3.7,4); + me->GetMotionMaster()->MoveCharge(-8116.7f,1527,3.7f,4); break; case 58: - me->GetMotionMaster()->MoveCharge(-8112.67,1529.9,2.86,4); + me->GetMotionMaster()->MoveCharge(-8112.67f,1529.9f,2.86f,4); break; case 59: - me->GetMotionMaster()->MoveCharge(-8117.99,1532.24,3.94,4); + me->GetMotionMaster()->MoveCharge(-8117.99f,1532.24f,3.94f,4); break; case 60: if (plr) DoScriptText(ANACHRONOS_SAY_10, me,plr); - me->GetMotionMaster()->MoveCharge(-8113.46,1524.16,2.89,4); + me->GetMotionMaster()->MoveCharge(-8113.46f,1524.16f,2.89f,4); break; case 61: - me->GetMotionMaster()->MoveCharge(-8057.1,1470.32,2.61,6); + me->GetMotionMaster()->MoveCharge(-8057.1f,1470.32f,2.61f,6); if (plr->IsInRange(me,0,15)) plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD ,me); break; @@ -1104,11 +1104,11 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535,1535.14,2.61,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767, 1533.148,2.61, 1.5,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52, 1537.843, 2.61, 5.7,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462, 1535.843, 2.61, 3.141592,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75, 1538.795, 2.61, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535f,1535.14f,2.61f,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767f, 1533.148f,2.61f, 1.5f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52f, 1537.843f, 2.61f, 5.7f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462f, 1535.843f, 2.61f, 3.141592f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75f, 1538.795f, 2.61f, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); if (Merithra) { diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 8db4955cd2e..0815d58ac5e 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -125,9 +125,9 @@ public: { case 16: DoScriptText(SAY_AMBUSH, me); - me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53, -503.34, -46.31, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85, -503.77, -45.90, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37, -496.23, -45.71, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53f, -503.34f, -46.31f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 18: me->SetInFront(pPlayer); DoScriptText(SAY_END, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 4b9601580f9..6f017f32493 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -215,7 +215,7 @@ public: { if (who->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE) { - float Radius = 10.0; + float Radius = 10.0f; if (me->IsWithinDistInMap(who, Radius)) { Start(false, false, who->GetGUID()); @@ -439,16 +439,16 @@ public: switch(i) { case 23: - me->SummonCreature(SPAWN_FIRST, -8350.96, -4445.79, 10.10, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, -8355.96, -4447.79, 10.10, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, -8353.96, -4442.79, 10.10, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_OOX_AMBUSH, me); break; case 56: - me->SummonCreature(SPAWN_SECOND_1, -7510.07, -4795.50, 9.35, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_SECOND_2, -7515.07, -4797.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_SECOND_2, -7518.07, -4792.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_OOX_AMBUSH, me); if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff); @@ -503,7 +503,7 @@ enum eTooga FACTION_TOOG_ESCORTEE = 113 }; -const float m_afToWaterLoc[] = {-7032.664551, -4906.199219, -1.606446}; +const float m_afToWaterLoc[] = {-7032.664551f, -4906.199219f, -1.606446f}; class npc_tooga : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 2660fb96022..2b7df3202b0 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -333,12 +333,12 @@ enum eTwiggyFlathead float AffrayChallengerLoc[6][4]= { - {-1683, -4326, 2.79, 0}, - {-1682, -4329, 2.79, 0}, - {-1683, -4330, 2.79, 0}, - {-1680, -4334, 2.79, 1.49}, - {-1674, -4326, 2.79, 3.49}, - {-1677, -4334, 2.79, 1.66} + {-1683.0f, -4326.0f, 2.79f, 0.0f}, + {-1682.0f, -4329.0f, 2.79f, 0.0f}, + {-1683.0f, -4330.0f, 2.79f, 0.0f}, + {-1680.0f, -4334.0f, 2.79f, 1.49f}, + {-1674.0f, -4326.0f, 2.79f, 3.49f}, + {-1677.0f, -4334.0f, 2.79f, 1.66f} }; class npc_twiggy_flathead : public CreatureScript @@ -509,12 +509,12 @@ public: } } else if (Wave >= 6 && !EventBigWill) { - if (Creature* pCreature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000)) + if (Creature* pCreature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12f, 6.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000)) { BigWill = pCreature->GetGUID(); - //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32); - //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78); - pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79); + //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32f); + //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78f); + pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79f); pCreature->HandleEmoteCommand(EMOTE_STATE_READYUNARMED); EventBigWill = true; Wave_Timer = 1000; diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 0c555c0d6e8..35d808d779d 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -47,7 +47,7 @@ enum eKanati NPC_GALAK_ASS = 10720 }; -const float m_afGalakLoc[]= {-4867.387695, -1357.353760, -48.226 }; +const float m_afGalakLoc[]= {-4867.387695f, -1357.353760f, -48.226f }; class npc_kanati : public CreatureScript { @@ -131,12 +131,12 @@ enum eLakota float m_afBanditLoc[6][6]= { - {-4905.479492, -2062.732666, 84.352}, - {-4915.201172, -2073.528320, 84.733}, - {-4878.883301, -1986.947876, 91.966}, - {-4877.503906, -1966.113403, 91.859}, - {-4767.985352, -1873.169189, 90.192}, - {-4788.861328, -1888.007813, 89.888} + {-4905.479492f, -2062.732666f, 84.352f}, + {-4915.201172f, -2073.528320f, 84.733f}, + {-4878.883301f, -1986.947876f, 91.966f}, + {-4877.503906f, -1966.113403f, 91.859f}, + {-4767.985352f, -1873.169189f, 90.192f}, + {-4788.861328f, -1888.007813f, 89.888f} }; class npc_lakota_windsong : public CreatureScript @@ -221,9 +221,9 @@ enum ePacka float m_afWyvernLoc[3][3]= { - {-4990.606, -906.057, -5.343}, - {-4970.241, -927.378, -4.951}, - {-4985.364, -952.528, -5.199} + {-4990.606f, -906.057f, -5.343f}, + {-4970.241f, -927.378f, -4.951f}, + {-4985.364f, -952.528f, -5.199f} }; class npc_paoka_swiftmountain : public CreatureScript diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 46cf08f5b3b..2352b95f387 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -86,18 +86,18 @@ public: { case 19: - me->SummonCreature(ENTRY_STOMPER, -6391.69, -1730.49, -272.83, 4.96, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO1, me, pPlayer); break; case 28: DoScriptText(SAY_SEARCH, me, pPlayer); break; case 38: - me->SummonCreature(ENTRY_TARLORD, -6370.75, -1382.84, -270.51, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO2, me, pPlayer); break; case 49: - me->SummonCreature(ENTRY_TARLORD1, -6324.44, -1181.05, -270.17, 4.34, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO3, me, pPlayer); break; case 55: diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index bfc402e5327..2894c62e06c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -76,14 +76,14 @@ enum Phases const Position SpawnPoint[2] = { - { 550.7, 282.8, 224.3 }, - { 551.1, 229.4, 224.3 }, + { 550.7f, 282.8f, 224.3f }, + { 551.1f, 229.4f, 224.3f }, }; const Position SpawnPointGuardian[2] = { - { 550.348633, 316.006805, 234.2947 }, - { 550.188660, 324.264557, 237.7412 }, + { 550.348633f, 316.006805f, 234.2947f }, + { 550.188660f, 324.264557f, 237.7412f }, }; class boss_anub_arak : public CreatureScript @@ -319,7 +319,7 @@ public: if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); } - uiPoundTimer = 16.5*IN_MILLISECONDS; + uiPoundTimer = 16.5f*IN_MILLISECONDS; } else uiPoundTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 0e1b103aa55..48da4cc8e9d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -82,14 +82,14 @@ enum Misc const Position SpawnPoint[] = { - { 566.164, 682.087, 769.079, 2.21657 }, - { 529.042, 706.941, 777.298, 1.0821 }, - { 489.975, 671.239, 772.131, 0.261799 }, - { 488.556, 692.95, 771.764, 4.88692 }, - { 553.34, 640.387, 777.419, 1.20428 }, - { 517.486, 706.398, 777.335, 5.35816 }, - { 504.01, 637.693, 777.479, 0.506145 }, - { 552.625, 706.408, 777.177, 3.4383 } + { 566.164f, 682.087f, 769.079f, 2.21657f }, + { 529.042f, 706.941f, 777.298f, 1.0821f }, + { 489.975f, 671.239f, 772.131f, 0.261799f }, + { 488.556f, 692.95f, 771.764f, 4.88692f }, + { 553.34f, 640.387f, 777.419f, 1.20428f }, + { 517.486f, 706.398f, 777.335f, 5.35816f }, + { 504.01f, 637.693f, 777.479f, 0.506145f }, + { 552.625f, 706.408f, 777.177f, 3.4383f } }; class boss_krik_thir : public CreatureScript diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 12e8791848a..b1614946050 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -44,8 +44,8 @@ enum Misc H_DATA_EMBRACE_DMG = 40000, DATA_SPHERE_DISTANCE = 15 }; -#define DATA_SPHERE_ANGLE_OFFSET 0.7 -#define DATA_GROUND_POSITION_Z 11.4 +#define DATA_SPHERE_ANGLE_OFFSET 0.7f +#define DATA_GROUND_POSITION_Z 11.4f enum Yells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 7113194ea33..879338f50d4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -114,7 +114,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -240,7 +240,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -419,13 +419,13 @@ public: switch(uiWaypoint) { case 0: - me->SetOrientation(5.81); + me->SetOrientation(5.81f); break; case 1: - me->SetOrientation(4.60); + me->SetOrientation(4.60f); break; case 2: - me->SetOrientation(2.79); + me->SetOrientation(2.79f); break; } @@ -441,13 +441,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,712.14,628.42,411.88); + AddWaypoint(0,712.14f,628.42f,411.88f); break; case 1: - AddWaypoint(0,742.44,650.29,411.79); + AddWaypoint(0,742.44f,650.29f,411.79f); break; case 2: - AddWaypoint(0,783.33,615.29,411.84); + AddWaypoint(0,783.33f,615.29f,411.84f); break; } break; @@ -455,13 +455,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,713.12,632.97,411.90); + AddWaypoint(0,713.12f,632.97f,411.90f); break; case 1: - AddWaypoint(0,746.73,650.24,411.56); + AddWaypoint(0,746.73f,650.24f,411.56f); break; case 2: - AddWaypoint(0,781.32,610.54,411.82); + AddWaypoint(0,781.32f,610.54f,411.82f); break; } break; @@ -469,13 +469,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,715.06,637.07,411.91); + AddWaypoint(0,715.06f,637.07f,411.91f); break; case 1: - AddWaypoint(0,750.72,650.20,411.77); + AddWaypoint(0,750.72f,650.20f,411.77f); break; case 2: - AddWaypoint(0,779.77,607.03,411.81); + AddWaypoint(0,779.77f,607.03f,411.81f); break; } break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 9569a68476f..d9b07573065 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -85,9 +85,9 @@ struct Point const Point MovementPoint[] = { - {746.84,623.15,411.41}, - {747.96,620.29,411.09}, - {750.23,618.35,411.09} + {746.84f,623.15f,411.41f}, + {747.96f,620.29f,411.09f}, + {750.23f,618.35f,411.09f} }; void AggroAllPlayers(Creature* pTemp) @@ -178,22 +178,22 @@ public: switch(uiType) { case 1: - AddWaypoint(0,747.36,634.07,411.572); - AddWaypoint(1,780.43,607.15,411.82); - AddWaypoint(2,785.99,599.41,411.92); - AddWaypoint(3,778.44,601.64,411.79); + AddWaypoint(0,747.36f,634.07f,411.572f); + AddWaypoint(1,780.43f,607.15f,411.82f); + AddWaypoint(2,785.99f,599.41f,411.92f); + AddWaypoint(3,778.44f,601.64f,411.79f); uiWaypointPath = 1; break; case 2: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,768.72,581.01,411.92); - AddWaypoint(2,763.55,590.52,411.71); + AddWaypoint(0,747.35f,634.07f,411.57f); + AddWaypoint(1,768.72f,581.01f,411.92f); + AddWaypoint(2,763.55f,590.52f,411.71f); uiWaypointPath = 2; break; case 3: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,784.02,645.33,412.39); - AddWaypoint(2,775.67,641.91,411.91); + AddWaypoint(0,747.35f,634.07f,411.57f); + AddWaypoint(1,784.02f,645.33f,412.39f); + AddWaypoint(2,775.67f,641.91f,411.91f); uiWaypointPath = 3; break; } @@ -362,11 +362,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); EnterEvadeMode(); bHome = true; @@ -496,11 +496,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -642,11 +642,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -789,11 +789,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -937,11 +937,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 7a46c83edd7..9cd5c55af1b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -190,9 +190,9 @@ public: { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } } } @@ -203,7 +203,7 @@ public: { if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) { - pBoss->GetMotionMaster()->MovePoint(0,746.88,618.74,411.06); + pBoss->GetMotionMaster()->MovePoint(0,746.88f,618.74f,411.06f); pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); pBoss->SetReactState(REACT_AGGRESSIVE); } @@ -213,18 +213,18 @@ public: m_auiEncounter[1] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } break; case BOSS_ARGENT_CHALLENGE_P: m_auiEncounter[2] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 99e0c44ba57..9238efa1539 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -33,13 +33,13 @@ EndContentData */ #define GOSSIP_START_EVENT1 "I'm ready to start challenge." #define GOSSIP_START_EVENT2 "I'm ready for the next challenge." -#define ORIENTATION 4.714 +#define ORIENTATION 4.714f /*###### ## npc_announcer_toc5 ######*/ -const Position SpawnPosition = {746.261,657.401,411.681,4.65}; +const Position SpawnPosition = {746.261f,657.401f,411.681f,4.65f}; class npc_announcer_toc5 : public CreatureScript { @@ -124,7 +124,7 @@ public: NextStep(10000,false,1); break; case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) pInstance->HandleGameObject(pGO->GetGUID(),false); NextStep(10000,false,3); @@ -306,7 +306,7 @@ public: void DoStartArgentChampionEncounter() { - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); if (Creature* pBoss = me->SummonCreature(uiArgentChampion,SpawnPosition)) { @@ -369,7 +369,7 @@ public: if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834,651.915,447.035,0); + me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 87467b261ac..d0fd2d83916 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -109,12 +109,12 @@ enum SummonActions };
const Position SphereSpawn[6] = { - { 786.6439, 108.2498, 155.6701 }, - { 806.8429, 150.5902, 155.6701 }, - { 759.1386, 163.9654, 155.6701 }, - { 744.3701, 119.5211, 155.6701 }, - { 710.0211, 120.8152, 155.6701 }, - { 706.6383, 161.5266, 155.6701 }, + { 786.6439f, 108.2498f, 155.6701f }, + { 806.8429f, 150.5902f, 155.6701f }, + { 759.1386f, 163.9654f, 155.6701f }, + { 744.3701f, 119.5211f, 155.6701f }, + { 710.0211f, 120.8152f, 155.6701f }, + { 706.6383f, 161.5266f, 155.6701f }, };
class boss_anubarak_trial : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 007d0e27304..b3119228d93 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -42,8 +42,11 @@ enum eAIs AI_PET = 3, }; -#define SPELL_ANTI_AOE 68595 -#define SPELL_PVP_TRINKET 65547 +enum eSpells +{ + SPELL_ANTI_AOE = 68595, + SPELL_PVP_TRINKET = 65547, +};
class boss_toc_champion_controller : public CreatureScript { public: @@ -429,15 +432,17 @@ struct boss_faction_championsAI : public ScriptedAI /******************************************************************** HEALERS ********************************************************************/ - -#define SPELL_LIFEBLOOM 66093 -#define SPELL_NOURISH 66066 -#define SPELL_REGROWTH 66067 -#define SPELL_REJUVENATION 66065 -#define SPELL_TRANQUILITY 66086 -#define SPELL_BARKSKIN 65860 //1 min cd -#define SPELL_THORNS 66068 -#define SPELL_NATURE_GRASP 66071 //1 min cd, self buff +enum eDruidSpells +{ + SPELL_LIFEBLOOM = 66093, + SPELL_NOURISH = 66066, + SPELL_REGROWTH = 66067, + SPELL_REJUVENATION = 66065, + SPELL_TRANQUILITY = 66086, + SPELL_BARKSKIN = 65860, //1 min cd + SPELL_THORNS = 66068, + SPELL_NATURE_GRASP = 66071, //1 min cd, self buff +};
class mob_toc_druid : public CreatureScript { public: @@ -520,16 +525,19 @@ public: }; -#define SPELL_HEALING_WAVE 66055 -#define SPELL_RIPTIDE 66053 -#define SPELL_SPIRIT_CLEANSE 66056 //friendly only -#define SPELL_HEROISM 65983 -#define SPELL_BLOODLUST 65980 -#define SPELL_HEX 66054 -#define SPELL_EARTH_SHIELD 66063 -#define SPELL_EARTH_SHOCK 65973 -#define AURA_EXHAUSTION 57723 -#define AURA_SATED 57724 +enum eShamanSpells +{ + SPELL_HEALING_WAVE = 66055, + SPELL_RIPTIDE = 66053, + SPELL_SPIRIT_CLEANSE = 66056, //friendly only + SPELL_HEROISM = 65983, + SPELL_BLOODLUST = 65980, + SPELL_HEX = 66054, + SPELL_EARTH_SHIELD = 66063, + SPELL_EARTH_SHOCK = 65973, + AURA_EXHAUSTION = 57723, + AURA_SATED = 57724, +};
class mob_toc_shaman : public CreatureScript { public: @@ -609,14 +617,17 @@ public: }; -#define SPELL_HAND_OF_FREEDOM 68757 //25 sec cd -#define SPELL_BUBBLE 66010 //5 min cd -#define SPELL_CLEANSE 66116 -#define SPELL_FLASH_OF_LIGHT 66113 -#define SPELL_HOLY_LIGHT 66112 -#define SPELL_HOLY_SHOCK 66114 -#define SPELL_HAND_OF_PROTECTION 66009 -#define SPELL_HAMMER_OF_JUSTICE 66613 +enum ePaladinSpells +{ + SPELL_HAND_OF_FREEDOM = 68757, //25 sec cd + SPELL_BUBBLE = 66010, //5 min cd + SPELL_CLEANSE = 66116, + SPELL_FLASH_OF_LIGHT = 66113, + SPELL_HOLY_LIGHT = 66112, + SPELL_HOLY_SHOCK = 66114, + SPELL_HAND_OF_PROTECTION = 66009, + SPELL_HAMMER_OF_JUSTICE = 66613, +};
class mob_toc_paladin : public CreatureScript { public: @@ -714,13 +725,15 @@ public: }; -#define SPELL_RENEW 66177 -#define SPELL_SHIELD 66099 -#define SPELL_FLASH_HEAL 66104 -#define SPELL_DISPEL 65546 -#define SPELL_PSYCHIC_SCREAM 65543 -#define SPELL_MANA_BURN 66100 -
class mob_toc_priest : public CreatureScript +enum ePriestSpells +{ + SPELL_RENEW = 66177, + SPELL_SHIELD = 66099, + SPELL_FLASH_HEAL = 66104, + SPELL_DISPEL = 65546, + SPELL_PSYCHIC_SCREAM = 65543, + SPELL_MANA_BURN = 66100, +};
class mob_toc_priest : public CreatureScript { public: mob_toc_priest() : CreatureScript("mob_toc_priest") { } @@ -789,15 +802,17 @@ public: /******************************************************************** RANGED ********************************************************************/ - -#define SPELL_SILENCE 65542 -#define SPELL_VAMPIRIC_TOUCH 65490 -#define SPELL_SW_PAIN 65541 -#define SPELL_MIND_FLAY 65488 -#define SPELL_MIND_BLAST 65492 -#define SPELL_HORROR 65545 -#define SPELL_DISPERSION 65544 -#define SPELL_SHADOWFORM 16592 +enum eShadowPriestSpells +{ + SPELL_SILENCE = 65542, + SPELL_VAMPIRIC_TOUCH = 65490, + SPELL_SW_PAIN = 65541, + SPELL_MIND_FLAY = 65488, + SPELL_MIND_BLAST = 65492, + SPELL_HORROR = 65545, + SPELL_DISPERSION = 65544, + SPELL_SHADOWFORM = 16592, +};
class mob_toc_shadow_priest : public CreatureScript { public: @@ -897,17 +912,19 @@ public: }; -#define SPELL_HELLFIRE 65816 -#define SPELL_CORRUPTION 65810 -#define SPELL_CURSE_OF_AGONY 65814 -#define SPELL_CURSE_OF_EXHAUSTION 65815 -#define SPELL_FEAR 65809 //8s -#define SPELL_SEARING_PAIN 65819 -#define SPELL_SHADOW_BOLT 65821 -#define SPELL_UNSTABLE_AFFLICTION 65812 -#define SPELL_SUMMON_FELHUNTER 67514 -#define H_SPELL_UNSTABLE_AFFLICTION 68155 //15s -
class mob_toc_warlock : public CreatureScript +enum eWarlockSpells +{ + SPELL_HELLFIRE = 65816, + SPELL_CORRUPTION = 65810, + SPELL_CURSE_OF_AGONY = 65814, + SPELL_CURSE_OF_EXHAUSTION = 65815, + SPELL_FEAR = 65809, //8s + SPELL_SEARING_PAIN = 65819, + SPELL_SHADOW_BOLT = 65821, + SPELL_UNSTABLE_AFFLICTION = 65812, + SPELL_SUMMON_FELHUNTER = 67514, + H_SPELL_UNSTABLE_AFFLICTION = 68155, //15s +};
class mob_toc_warlock : public CreatureScript { public: mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } @@ -1001,16 +1018,18 @@ public: }; -#define SPELL_ARCANE_BARRAGE 65799 //3s -#define SPELL_ARCANE_BLAST 65791 -#define SPELL_ARCANE_EXPLOSION 65800 -#define SPELL_BLINK 65793 //15s -#define SPELL_COUNTERSPELL 65790 //24s -#define SPELL_FROST_NOVA 65792 //25s -#define SPELL_FROSTBOLT 65807 -#define SPELL_ICE_BLOCK 65802 //5min -#define SPELL_POLYMORPH 65801 //15s -
class mob_toc_mage : public CreatureScript +enum eMageSpells +{ + SPELL_ARCANE_BARRAGE = 65799, //3s + SPELL_ARCANE_BLAST = 65791, + SPELL_ARCANE_EXPLOSION = 65800, + SPELL_BLINK = 65793, //15s + SPELL_COUNTERSPELL = 65790, //24s + SPELL_FROST_NOVA = 65792, //25s + SPELL_FROSTBOLT = 65807, + SPELL_ICE_BLOCK = 65802, //5min + SPELL_POLYMORPH = 65801, //15s +};
class mob_toc_mage : public CreatureScript { public: mob_toc_mage() : CreatureScript("mob_toc_mage") { } @@ -1099,17 +1118,19 @@ public: }; - -#define SPELL_AIMED_SHOT 65883 -#define SPELL_DETERRENCE 65871 //90s -#define SPELL_DISENGAGE 65869 //30s -#define SPELL_EXPLOSIVE_SHOT 65866 -#define SPELL_FROST_TRAP 65880 //30s -#define SPELL_SHOOT 65868 //1.7s -#define SPELL_STEADY_SHOT 65867 //3s -#define SPELL_WING_CLIP 66207 //6s -#define SPELL_WYVERN_STING 65877 //60s -#define SPELL_CALL_PET 67777 +enum eHunterSpells +{ + SPELL_AIMED_SHOT = 65883, + SPELL_DETERRENCE = 65871, //90s + SPELL_DISENGAGE = 65869, //30s + SPELL_EXPLOSIVE_SHOT = 65866, + SPELL_FROST_TRAP = 65880, //30s + SPELL_SHOOT = 65868, //1.7s + SPELL_STEADY_SHOT = 65867, //3s + SPELL_WING_CLIP = 66207, //6s + SPELL_WYVERN_STING = 65877, //60s + SPELL_CALL_PET = 67777, +};
class mob_toc_hunter : public CreatureScript { public: @@ -1214,15 +1235,17 @@ public: }; -#define SPELL_CYCLONE 65859 //6s -#define SPELL_ENTANGLING_ROOTS 65857 //10s -#define SPELL_FAERIE_FIRE 65863 -#define SPELL_FORCE_OF_NATURE 65861 //180s -#define SPELL_INSECT_SWARM 65855 -#define SPELL_MOONFIRE 65856 //5s -#define SPELL_STARFIRE 65854 -#define SPELL_WRATH 65862 -
class mob_toc_boomkin : public CreatureScript +enum eBoomkinSpells +{ + SPELL_CYCLONE = 65859, //6s + SPELL_ENTANGLING_ROOTS = 65857, //10s + SPELL_FAERIE_FIRE = 65863, + SPELL_FORCE_OF_NATURE = 65861, //180s + SPELL_INSECT_SWARM = 65855, + SPELL_MOONFIRE = 65856, //5s + SPELL_STARFIRE = 65854, + SPELL_WRATH = 65862, +};
class mob_toc_boomkin : public CreatureScript { public: mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } @@ -1313,17 +1336,18 @@ public: /******************************************************************** MELEE ********************************************************************/ - -#define SPELL_BLADESTORM 65947 -#define SPELL_INTIMIDATING_SHOUT 65930 -#define SPELL_MORTAL_STRIKE 65926 -#define SPELL_CHARGE 68764 -#define SPELL_DISARM 65935 -#define SPELL_OVERPOWER 65924 -#define SPELL_SUNDER_ARMOR 65936 -#define SPELL_SHATTERING_THROW 65940 -#define SPELL_RETALIATION 65932 -
class mob_toc_warrior : public CreatureScript +enum eWarriorSpells +{ + SPELL_BLADESTORM = 65947, + SPELL_INTIMIDATING_SHOUT = 65930, + SPELL_MORTAL_STRIKE = 65926, + SPELL_CHARGE = 68764, + SPELL_DISARM = 65935, + SPELL_OVERPOWER = 65924, + SPELL_SUNDER_ARMOR = 65936, + SPELL_SHATTERING_THROW = 65940, + SPELL_RETALIATION = 65932, +};
class mob_toc_warrior : public CreatureScript { public: mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } @@ -1426,14 +1450,16 @@ public: }; -#define SPELL_CHAINS_OF_ICE 66020 //8sec -#define SPELL_DEATH_COIL 66019 //5sec -#define SPELL_DEATH_GRIP 66017 //35sec -#define SPELL_FROST_STRIKE 66047 //6sec -#define SPELL_ICEBOUND_FORTITUDE 66023 //1min -#define SPELL_ICY_TOUCH 66021 //8sec -#define SPELL_STRANGULATE 66018 //2min -
class mob_toc_dk : public CreatureScript +enum eDeathKnightSpells +{ + SPELL_CHAINS_OF_ICE = 66020, //8sec + SPELL_DEATH_COIL = 66019, //5sec + SPELL_DEATH_GRIP = 66017, //35sec + SPELL_FROST_STRIKE = 66047, //6sec + SPELL_ICEBOUND_FORTITUDE = 66023, //1min + SPELL_ICY_TOUCH = 66021, //8sec + SPELL_STRANGULATE = 66018, //2min +};
class mob_toc_dk : public CreatureScript { public: mob_toc_dk() : CreatureScript("mob_toc_dk") { } @@ -1524,14 +1550,16 @@ public: }; -#define SPELL_FAN_OF_KNIVES 65955 //2sec -#define SPELL_BLIND 65960 //2min -#define SPELL_CLOAK 65961 //90sec -#define SPELL_BLADE_FLURRY 65956 //2min -#define SPELL_SHADOWSTEP 66178 //30sec -#define SPELL_HEMORRHAGE 65954 -#define SPELL_EVISCERATE 65957 -
class mob_toc_rogue : public CreatureScript +enum eRogueSpells +{ + SPELL_FAN_OF_KNIVES = 65955, //2sec + SPELL_BLIND = 65960, //2min + SPELL_CLOAK = 65961, //90sec + SPELL_BLADE_FLURRY = 65956, //2min + SPELL_SHADOWSTEP = 66178, //30sec + SPELL_HEMORRHAGE = 65954, + SPELL_EVISCERATE = 65957, +};
class mob_toc_rogue : public CreatureScript { public: mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } @@ -1623,9 +1651,12 @@ public: }; -#define SPELL_EARTH_SHOCK 65973 -#define SPELL_LAVA_LASH 65974 -#define SPELL_STORMSTRIKE 65970 +enum eEnhShamanSpells +{ + SPELL_EARTH_SHOCK_ENH = 65973, + SPELL_LAVA_LASH = 65974, + SPELL_STORMSTRIKE = 65970, +};
class mob_toc_enh_shaman : public CreatureScript { public: @@ -1716,7 +1747,7 @@ public: if (m_uiEarthShockTimer <= uiDiff) { - DoCastVictim(SPELL_EARTH_SHOCK); + DoCastVictim(SPELL_EARTH_SHOCK_ENH); m_uiEarthShockTimer = urand(5*IN_MILLISECONDS,8*IN_MILLISECONDS); } else m_uiEarthShockTimer -= uiDiff; @@ -1745,15 +1776,18 @@ public: }; -#define SPELL_AVENGING_WRATH 66011 //3min cd -#define SPELL_CRUSADER_STRIKE 66003 //6sec cd -#define SPELL_DIVINE_SHIELD 66010 //5min cd -#define SPELL_DIVINE_STORM 66006 //10sec cd -#define SPELL_HAMMER_OF_JUSTICE 66007 //40sec cd -#define SPELL_HAND_OF_PROTECTION 66009 //5min cd -#define SPELL_JUDGEMENT_OF_COMMAND 66005 //8sec cd -#define SPELL_REPENTANCE 66008 //60sec cd -#define SPELL_SEAL_OF_COMMAND 66004 //no cd +enum eRetroPaladinSpells +{ + SPELL_AVENGING_WRATH = 66011, //3min cd + SPELL_CRUSADER_STRIKE = 66003, //6sec cd + SPELL_DIVINE_SHIELD = 66010, //5min cd + SPELL_DIVINE_STORM = 66006, //10sec cd + SPELL_HAMMER_OF_JUSTICE_RET = 66007, //40sec cd + SPELL_HAND_OF_PROTECTION_RET = 66009, //5min cd + SPELL_JUDGEMENT_OF_COMMAND = 66005, //8sec cd + SPELL_REPENTANCE = 66008, //60sec cd + SPELL_SEAL_OF_COMMAND = 66004, //no cd +};
class mob_toc_retro_paladin : public CreatureScript { public: @@ -1841,8 +1875,11 @@ public: }; -#define SPELL_DEVOUR_MAGIC 67518 -#define SPELL_SPELL_LOCK 67519 +enum eWarlockPetSpells +{ + SPELL_DEVOUR_MAGIC = 67518, + SPELL_SPELL_LOCK = 67519, +}; class mob_toc_pet_warlock : public CreatureScript { @@ -1890,7 +1927,11 @@ public: }; -#define SPELL_CLAW 67793 +enum eHunterPetSpells +{ + SPELL_CLAW = 67793, +}; + class mob_toc_pet_hunter : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 0419ec380d7..b39e1cca7d7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -295,7 +295,7 @@ public: } if (tributeChest) if (Creature* pTirion = instance->GetCreature(m_uiTirionGUID)) - if (GameObject* pChest = pTirion->SummonGameObject(tributeChest,805.62,134.87,142.16,3.27,0,0,0,0,90000000)) + if (GameObject* pChest = pTirion->SummonGameObject(tributeChest,805.62f,134.87f,142.16f,3.27f,0,0,0,0,90000000)) pChest->SetRespawnTime(pChest->GetRespawnDelay()); break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index 3704331ddb1..9f387d63314 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -76,28 +76,28 @@ static Position JaraxxusLoc[]= static Position FactionChampionLoc[]= { - {514.231,105.569,418.234}, // 0 - Horde Initial Pos 0 - {508.334,115.377,418.234}, // 1 - Horde Initial Pos 1 - {506.454,126.291,418.234}, // 2 - Horde Initial Pos 2 - {506.243,106.596,421.592}, // 3 - Horde Initial Pos 3 - {499.885,117.717,421.557}, // 4 - Horde Initial Pos 4 - - {613.127,100.443,419.74}, // 5 - Ally Initial Pos 0 - {621.126,128.042,418.231}, // 6 - Ally Initial Pos 1 - {618.829,113.606,418.232}, // 7 - Ally Initial Pos 2 - {625.845,112.914,421.575}, // 8 - Ally Initial Pos 3 - {615.566,109.653,418.234}, // 9 - Ally Initial Pos 4 - - {535.469,113.012,394.66}, // 10 - Horde Final Pos 0 - {526.417,137.465,394.749}, // 11 - Horde Final Pos 1 - {528.108,111.057,395.289}, // 12 - Horde Final Pos 2 - {519.92,134.285,395.289}, // 13 - Horde Final Pos 3 - {533.648,119.148,394.646}, // 14 - Horde Final Pos 4 - {531.399,125.63,394.708}, // 15 - Horde Final Pos 5 - {528.958,131.47,394.73}, // 16 - Horde Final Pos 6 - {526.309,116.667,394.833}, // 17 - Horde Final Pos 7 - {524.238,122.411,394.819}, // 18 - Horde Final Pos 8 - {521.901,128.488,394.832}, // 19 - Horde Final Pos 9 + {514.231f,105.569f,418.234f}, // 0 - Horde Initial Pos 0 + {508.334f,115.377f,418.234f}, // 1 - Horde Initial Pos 1 + {506.454f,126.291f,418.234f}, // 2 - Horde Initial Pos 2 + {506.243f,106.596f,421.592f}, // 3 - Horde Initial Pos 3 + {499.885f,117.717f,421.557f}, // 4 - Horde Initial Pos 4 + + {613.127f,100.443f,419.74f}, // 5 - Ally Initial Pos 0 + {621.126f,128.042f,418.231f}, // 6 - Ally Initial Pos 1 + {618.829f,113.606f,418.232f}, // 7 - Ally Initial Pos 2 + {625.845f,112.914f,421.575f}, // 8 - Ally Initial Pos 3 + {615.566f,109.653f,418.234f}, // 9 - Ally Initial Pos 4 + + {535.469f,113.012f,394.66f}, // 10 - Horde Final Pos 0 + {526.417f,137.465f,394.749f}, // 11 - Horde Final Pos 1 + {528.108f,111.057f,395.289f}, // 12 - Horde Final Pos 2 + {519.92f,134.285f,395.289f}, // 13 - Horde Final Pos 3 + {533.648f,119.148f,394.646f}, // 14 - Horde Final Pos 4 + {531.399f,125.63f,394.708f}, // 15 - Horde Final Pos 5 + {528.958f,131.47f,394.73f}, // 16 - Horde Final Pos 6 + {526.309f,116.667f,394.833f}, // 17 - Horde Final Pos 7 + {524.238f,122.411f,394.819f}, // 18 - Horde Final Pos 8 + {521.901f,128.488f,394.832f}, // 19 - Horde Final Pos 9 }; static Position TwinValkyrsLoc[]= diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index c6bca04f95b..3cf22dcb6ef 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -59,9 +59,9 @@ enum Achievements ACHIEV_OH_NOVOS = 2057 }; -static Position AddSpawnPoint = { -379.20, -816.76, 59.70 }; -static Position CrystalHandlerSpawnPoint = { -326.626343, -709.956604, 27.813314 }; -static Position AddDestinyPoint = { -379.314545, -772.577637, 28.58837 }; +static Position AddSpawnPoint = { -379.20f, -816.76f, 59.70f }; +static Position CrystalHandlerSpawnPoint = { -326.626343f, -709.956604f, 27.813314f }; +static Position AddDestinyPoint = { -379.314545f, -772.577637f, 28.58837f }; class boss_novos : public CreatureScript { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 4d003d3c2c4..ade2633d05e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -52,7 +52,7 @@ enum Creatures NPC_DRAKKARI_INVADER_2 = 27709 }; -Position AddSpawnPoint = { -260.493011, -622.968018, 26.605301, 3.036870 }; +Position AddSpawnPoint = { -260.493011f, -622.968018f, 26.605301f, 3.036870f }; class boss_trollgore : public CreatureScript { @@ -82,7 +82,7 @@ public: void Reset() { uiConsumeTimer = 15*IN_MILLISECONDS; - uiAuraCountTimer = 15.5*IN_MILLISECONDS; + uiAuraCountTimer = 15.5f*IN_MILLISECONDS; uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS); uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 11f4a454622..bfc1c600462 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -24,8 +24,6 @@ * - Fix outro npc movement */ -#define PI 3.1415f - enum Yells { SAY_FACE_ANGER_AGGRO = -1632010, @@ -93,30 +91,30 @@ struct Position movePosition; } outroPositions[] = { - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47, 2427.79, 705.935, 0.802851 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59, 2428.34, 705.935, 0.977384 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2429.31, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2421.12, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43, 2426.53, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55, 2418.36, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14, 705.935, 1.0472 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04, 2424.87, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89, 2421.54, 705.935, 0.610865 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57, 2434.62, 705.935, 1.13446 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46, 2417.99, 705.935, 1.06465 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81, 2428.42, 705.935, 0.820305 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61, 2412.66, 705.935, 0.925025 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9, 2410.64, 705.935, 0.872665 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76, 2416.73, 705.935, 0.942478 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23, 2419.14, 705.935, 0.855211 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61, 2416.87, 705.935, 0.907571 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77, 2421.03, 705.935, 0.855211 } }, - - { NPC_KORELN, NPC_LORALEN, { 5602.58, 2435.95, 705.935, 0.959931 } }, - { NPC_ELANDRA, NPC_KALIRA, { 5606.13, 2433.16, 705.935, 0.785398 } }, - { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12, 2436.6, 705.935, 0.890118 } }, - - { 0, 0, { 0, 0, 0, 0 } } + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47f, 2427.79f, 705.935f, 0.802851f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59f, 2428.34f, 705.935f, 0.977384f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2429.31f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2421.12f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43f, 2426.53f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55f, 2418.36f, 705.935f, 1.15192f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14f, 705.935f, 1.0472f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04f, 2424.87f, 705.935f, 1.15192f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89f, 2421.54f, 705.935f, 0.610865f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57f, 2434.62f, 705.935f, 1.13446f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46f, 2417.99f, 705.935f, 1.06465f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81f, 2428.42f, 705.935f, 0.820305f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61f, 2412.66f, 705.935f, 0.925025f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9f, 2410.64f, 705.935f, 0.872665f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76f, 2416.73f, 705.935f, 0.942478f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23f, 2419.14f, 705.935f, 0.855211f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61f, 2416.87f, 705.935f, 0.907571f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77f, 2421.03f, 705.935f, 0.855211f } }, + + { NPC_KORELN, NPC_LORALEN, { 5602.58f, 2435.95f, 705.935f, 0.959931f } }, + { NPC_ELANDRA, NPC_KALIRA, { 5606.13f, 2433.16f, 705.935f, 0.785398f } }, + { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12f, 2436.6f, 705.935f, 0.890118f } }, + + { 0, 0, { 0.0f, 0.0f, 0.0f, 0.0f } } }; class boss_devourer_of_souls : public CreatureScript @@ -198,7 +196,7 @@ public: void JustDied(Unit* /*killer*/) { - Position spawnPoint = { 5618.139, 2451.873, 705.854 }; + Position spawnPoint = { 5618.139f, 2451.873f, 705.854f }; DoScriptText(RAND(SAY_FACE_SORROW_DEATH,SAY_FACE_DESIRE_DEATH), me); @@ -297,7 +295,7 @@ public: beamAngle = me->GetOrientation(); - beamAngleDiff = PI/30.0f; // PI/2 in 15 sec = PI/30 per tick + beamAngleDiff = M_PI/30.0f; // PI/2 in 15 sec = PI/30 per tick if (RAND(true,false)) beamAngleDiff = -beamAngleDiff; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index f8bea1d81b8..6489f84827f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -137,17 +137,17 @@ enum eEnum static Position HallsofReflectionLocs[]= { - {5283.234863, 1990.946777, 707.695679, 0.929097}, // 2 Loralen Follows - {5408.031250, 2102.918213, 707.695251, 0.792756}, // 9 Sylvanas Follows - {5401.866699, 2110.837402, 707.695251, 0.800610}, // 10 Loralen follows + {5283.234863f, 1990.946777f, 707.695679f, 0.929097f}, // 2 Loralen Follows + {5408.031250f, 2102.918213f, 707.695251f, 0.792756f}, // 9 Sylvanas Follows + {5401.866699f, 2110.837402f, 707.695251f, 0.800610f}, // 10 Loralen follows }; -static Position SpawnPos = {5262.540527, 1949.693726, 707.695007, 0.808736}; // Jaina/Sylvanas Beginning Position -static Position MoveThronePos = {5306.952148, 1998.499023, 709.341431, 1.277278}; // Jaina/Sylvanas walks to throne -static Position UtherSpawnPos = {5308.310059, 2003.857178, 709.341431, 4.650315}; -static Position LichKingSpawnPos = {5362.917480, 2062.307129, 707.695374, 3.945812}; -static Position LichKingMoveThronePos = {5312.080566, 2009.172119, 709.341431, 3.973301}; // Lich King walks to throne -static Position LichKingMoveAwayPos = {5400.069824, 2102.7131689, 707.69525, 0.843803}; // Lich King walks away +static Position SpawnPos = {5262.540527f, 1949.693726f, 707.695007f, 0.808736f}; // Jaina/Sylvanas Beginning Position +static Position MoveThronePos = {5306.952148f, 1998.499023f, 709.341431f, 1.277278f}; // Jaina/Sylvanas walks to throne +static Position UtherSpawnPos = {5308.310059f, 2003.857178f, 709.341431f, 4.650315f}; +static Position LichKingSpawnPos = {5362.917480f, 2062.307129f, 707.695374f, 3.945812f}; +static Position LichKingMoveThronePos = {5312.080566f, 2009.172119f, 709.341431f, 3.973301f}; // Lich King walks to throne +static Position LichKingMoveAwayPos = {5400.069824f, 2102.7131689f, 707.69525f, 0.843803f}; // Lich King walks away class npc_jaina_or_sylvanas_hor : public CreatureScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index b42dcffb399..531129b562a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -44,56 +44,56 @@ enum Events static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = { - {5277.74,2016.88,707.778,5.96903}, - {5295.88,2040.34,707.778,5.07891}, - {5320.37,1980.13,707.778,2.00713}, - {5280.51,1997.84,707.778,0.296706}, - {5302.45,2042.22,707.778,4.90438}, - {5306.57,1977.47,707.778,1.50098}, + {5277.74f,2016.88f,707.778f,5.96903f}, + {5295.88f,2040.34f,707.778f,5.07891f}, + {5320.37f,1980.13f,707.778f,2.00713f}, + {5280.51f,1997.84f,707.778f,0.296706f}, + {5302.45f,2042.22f,707.778f,4.90438f}, + {5306.57f,1977.47f,707.778f,1.50098f}, }; static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = { - {5312.75,2037.12,707.778,4.59022}, - {5309.58,2042.67,707.778,4.69494}, - {5275.08,2008.72,707.778,6.21337}, - {5279.65,2004.66,707.778,0.069813}, - {5275.48,2001.14,707.778,0.174533}, - {5316.7,2041.55,707.778,4.50295}, + {5312.75f,2037.12f,707.778f,4.59022f}, + {5309.58f,2042.67f,707.778f,4.69494f}, + {5275.08f,2008.72f,707.778f,6.21337f}, + {5279.65f,2004.66f,707.778f,0.069813f}, + {5275.48f,2001.14f,707.778f,0.174533f}, + {5316.7f,2041.55f,707.778f,4.50295f}, }; static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = { - {5302.25,1972.41,707.778,1.37881}, - {5311.03,1972.23,707.778,1.64061}, - {5277.36,1993.23,707.778,0.401426}, - {5318.7,2036.11,707.778,4.2237}, - {5335.72,1996.86,707.778,2.74017}, - {5299.43,1979.01,707.778,1.23918}, + {5302.25f,1972.41f,707.778f,1.37881f}, + {5311.03f,1972.23f,707.778f,1.64061f}, + {5277.36f,1993.23f,707.778f,0.401426f}, + {5318.7f,2036.11f,707.778f,4.2237f}, + {5335.72f,1996.86f,707.778f,2.74017f}, + {5299.43f,1979.01f,707.778f,1.23918f}, }; static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = { - {5306.06,2037,707.778,4.81711}, - {5344.15,2007.17,707.778,3.15905}, - {5337.83,2010.06,707.778,3.22886}, - {5343.29,1999.38,707.778,2.9147}, - {5340.84,1992.46,707.778,2.75762}, - {5325.07,1977.6,707.778,2.07694}, - {5336.6,2017.28,707.778,3.47321}, - {5313.82,1978.15,707.778,1.74533}, - {5280.63,2012.16,707.778,6.05629}, - {5322.96,2040.29,707.778,4.34587}, + {5306.06f,2037,707.778f,4.81711f}, + {5344.15f,2007.17f,707.778f,3.15905f}, + {5337.83f,2010.06f,707.778f,3.22886f}, + {5343.29f,1999.38f,707.778f,2.9147f}, + {5340.84f,1992.46f,707.778f,2.75762f}, + {5325.07f,1977.6f,707.778f,2.07694f}, + {5336.6f,2017.28f,707.778f,3.47321f}, + {5313.82f,1978.15f,707.778f,1.74533f}, + {5280.63f,2012.16f,707.778f,6.05629f}, + {5322.96f,2040.29f,707.778f,4.34587f}, }; static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = { - {5343.47,2015.95,707.778,3.49066}, - {5337.86,2003.4,707.778,2.98451}, - {5319.16,1974,707.778,1.91986}, - {5299.25,2036,707.778,5.02655}, - {5295.64,1973.76,707.778,1.18682}, - {5282.9,2019.6,707.778,5.88176}, + {5343.47f,2015.95f,707.778f,3.49066f}, + {5337.86f,2003.4f,707.778f,2.98451f}, + {5319.16f,1974,707.778f,1.91986f}, + {5299.25f,2036,707.778f,5.02655f}, + {5295.64f,1973.76f,707.778f,1.18682f}, + {5282.9f,2019.6f,707.778f,5.88176f}, }; class instance_halls_of_reflection : public InstanceMapScript diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index bfffbf9b5ad..d1b73e364ac 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -338,7 +338,7 @@ public: if (Creature* pIck = GetIck()) { // TODO: tele on Ick then run some distance. - pIck->GetNearPosition(pos, 5.0f, 3.14); + pIck->GetNearPosition(pos, 5.0f, 3.14f); me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f); } me->SetVisibility(VISIBILITY_ON); diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 5cfbf8433f0..8af4ee793da 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -27,7 +27,7 @@ enum Spells SPELL_ECK_SPRING_2 = 55837 //Eck leaps at a distant target. }; -static Position EckSpawnPoint = { 1643.877930, 936.278015, 107.204948, 0.668432 }; +static Position EckSpawnPoint = { 1643.877930f, 936.278015f, 107.204948f, 0.668432f }; class boss_eck : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index a40c1704fc8..00b586e6957 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -58,11 +58,11 @@ enum ConstrictorSpells static Position SpawnLoc[]= { - {1783.81, 646.637, 133.948, 3.71755}, - {1775.03, 606.586, 134.165, 1.43117}, - {1717.39, 630.041, 129.282, 5.96903}, - {1765.66, 646.542, 134.02, 5.11381}, - {1716.76, 635.159, 129.282, 0.191986} + {1783.81f, 646.637f, 133.948f, 3.71755f}, + {1775.03f, 606.586f, 134.165f, 1.43117f}, + {1717.39f, 630.041f, 129.282f, 5.96903f}, + {1765.66f, 646.542f, 134.02f, 5.11381f}, + {1716.76f, 635.159f, 129.282f, 0.191986f} }; class boss_slad_ran : public CreatureScript diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index e0fe074339a..047a2eedf57 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -24,7 +24,7 @@ #define MOB_CRYPT_GUARD 16573 -const Position GuardSummonPos = {3333.72, -3476.30, 287.1, 6.2801}; +const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f}; enum Events { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e66c57275c6..3a709787ff9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -37,21 +37,21 @@ enum Events const Position WaypointPositions[12] = { // Thane waypoints - {2542.3, -2984.1, 241.49, 5.362}, - {2547.6, -2999.4, 241.34, 5.049}, - {2542.9, -3015.0, 241.35, 4.654}, + {2542.3f, -2984.1f, 241.49f, 5.362f}, + {2547.6f, -2999.4f, 241.34f, 5.049f}, + {2542.9f, -3015.0f, 241.35f, 4.654f}, // Lady waypoints - {2498.3, -2961.8, 241.28, 3.267}, - {2487.7, -2959.2, 241.28, 2.890}, - {2469.4, -2947.6, 241.28, 2.576}, + {2498.3f, -2961.8f, 241.28f, 3.267f}, + {2487.7f, -2959.2f, 241.28f, 2.890f}, + {2469.4f, -2947.6f, 241.28f, 2.576f}, // Baron waypoints - {2553.8, -2968.4, 241.33, 5.757}, - {2564.3, -2972.5, 241.33, 5.890}, - {2583.9, -2971.67, 241.35, 0.008}, + {2553.8f, -2968.4f, 241.33f, 5.757f}, + {2564.3f, -2972.5f, 241.33f, 5.890f}, + {2583.9f, -2971.67f, 241.35f, 0.008f}, // Sir waypoints - {2534.5, -2921.7, 241.53, 1.363}, - {2523.5, -2902.8, 241.28, 2.095}, - {2517.8, -2896.6, 241.28, 2.315}, + {2534.5f, -2921.7f, 241.53f, 1.363f}, + {2523.5f, -2902.8f, 241.28f, 2.095f}, + {2517.8f, -2896.6f, 241.28f, 2.315f}, }; const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index dfe695301ee..13e0b91dff9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -28,9 +28,9 @@ const Position PosSummon[3] = { - {3267.9, -3172.1, 297.42, 0.94}, - {3253.2, -3132.3, 297.42, 0}, - {3308.3, -3185.8, 297.42, 1.58}, + {3267.9f, -3172.1f, 297.42f, 0.94f}, + {3253.2f, -3132.3f, 297.42f, 0}, + {3308.3f, -3185.8f, 297.42f, 1.58f}, }; enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 66a968cea45..b03701cf637 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -113,26 +113,26 @@ enum Pos const Position PosSummonLive[POS_LIVE] = { - {2669.7, -3428.76, 268.56, 1.6}, - {2692.1, -3428.76, 268.56, 1.6}, - {2714.4, -3428.76, 268.56, 1.6}, - {2669.7, -3431.67, 268.56, 1.6}, - {2692.1, -3431.67, 268.56, 1.6}, - {2714.4, -3431.67, 268.56, 1.6}, + {2669.7f, -3428.76f, 268.56f, 1.6f}, + {2692.1f, -3428.76f, 268.56f, 1.6f}, + {2714.4f, -3428.76f, 268.56f, 1.6f}, + {2669.7f, -3431.67f, 268.56f, 1.6f}, + {2692.1f, -3431.67f, 268.56f, 1.6f}, + {2714.4f, -3431.67f, 268.56f, 1.6f}, }; const Position PosSummonDead[POS_DEAD] = { - {2725.1, -3310.0, 268.85, 3.4}, - {2699.3, -3322.8, 268.60, 3.3}, - {2733.1, -3348.5, 268.84, 3.1}, - {2682.8, -3304.2, 268.85, 3.9}, - {2664.8, -3340.7, 268.23, 3.7}, + {2725.1f, -3310.0f, 268.85f, 3.4f}, + {2699.3f, -3322.8f, 268.60f, 3.3f}, + {2733.1f, -3348.5f, 268.84f, 3.1f}, + {2682.8f, -3304.2f, 268.85f, 3.9f}, + {2664.8f, -3340.7f, 268.23f, 3.7f}, }; -const float PosGroundLiveSide[4] = {2691.2, -3387.0, 267.68, 1.52}; -const float PosGroundDeadSide[4] = {2693.5, -3334.6, 267.68, 4.67}; -const float PosPlatform[4] = {2640.5, -3360.6, 285.26, 0}; +const float PosGroundLiveSide[4] = {2691.2f, -3387.0f, 267.68f, 1.52f}; +const float PosGroundDeadSide[4] = {2693.5f, -3334.6f, 267.68f, 4.67f}; +const float PosPlatform[4] = {2640.5f, -3360.6f, 285.26f, 0.0f}; // Predicate function to check that the r efzr unit is NOT on the same side as the source. struct NotOnSameSide : public std::unary_function<Unit *, bool> { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 600ee4a364f..e4a121aa2ae 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -133,18 +133,18 @@ enum Creatures const Position Pos[12] = { - {3783.272705, -5062.697266, 143.711203, 3.617599}, //LEFT_FAR - {3730.291260, -5027.239258, 143.956909, 4.461900}, //LEFT_MIDDLE - {3757.6, -5172.0, 143.7, 1.97}, //WINDOW_PORTAL05 - {3759.355225, -5174.128418, 143.802383, 2.170104}, //RIGHT_FAR - {3700.724365, -5185.123047, 143.928024, 1.309310}, //RIGHT_MIDDLE - {3700.86, -5181.29, 143.928024, 1.42}, //WINDOW_PORTAL04 - {3754.431396, -5080.727734, 142.036316, 3.736189}, //LEFT_FAR - {3724.396484, -5061.330566, 142.032700, 4.564785}, //LEFT_MIDDLE - {3732.02, -5028.53, 143.92, 4.49}, //WINDOW_PORTAL02 - {3687.571777, -5126.831055, 142.017807, 0.604023}, //RIGHT_FAR - {3707.990733, -5151.450195, 142.032562, 1.376855}, //RIGHT_MIDDLE - {3782.76, -5062.97, 143.79, 3.82}, //WINDOW_PORTAL03 + {3783.272705f, -5062.697266f, 143.711203f, 3.617599f}, //LEFT_FAR + {3730.291260f, -5027.239258f, 143.956909f, 4.461900f}, //LEFT_MIDDLE + {3757.6f, -5172.0f, 143.7f, 1.97f}, //WINDOW_PORTAL05 + {3759.355225f, -5174.128418f, 143.802383f, 2.170104f}, //RIGHT_FAR + {3700.724365f, -5185.123047f, 143.928024f, 1.309310f}, //RIGHT_MIDDLE + {3700.86f, -5181.29f, 143.928024f, 1.42f}, //WINDOW_PORTAL04 + {3754.431396f, -5080.727734f, 142.036316f, 3.736189f}, //LEFT_FAR + {3724.396484f, -5061.330566f, 142.032700f, 4.564785f}, //LEFT_MIDDLE + {3732.02f, -5028.53f, 143.92f, 4.49f}, //WINDOW_PORTAL02 + {3687.571777f, -5126.831055f, 142.017807f, 0.604023f}, //RIGHT_FAR + {3707.990733f, -5151.450195f, 142.032562f, 1.376855f}, //RIGHT_MIDDLE + {3782.76f, -5062.97f, 143.79f, 3.82f}, //WINDOW_PORTAL03 }; //creatures in corners @@ -152,95 +152,95 @@ const Position Pos[12] = #define MAX_ABOMINATIONS 21 const Position PosAbominations[MAX_ABOMINATIONS] = { - {3755.52, -5155.22, 143.480, 2.0}, - {3744.35, -5164.03, 143.590, 2.00}, - {3749.28, -5159.04, 143.190, 2.0}, - {3774.47, -5076.28, 143.528, 2.15912}, - {3765.94, -5074.15, 143.186, 3.77233}, - {3763.15, -5063.36, 143.694, 3.77233}, - {3737.81, -5045.69, 143.709, 4.9033}, - {3728.13, -5045.01, 143.355, 1.45069}, - {3721.56, -5048.35, 143.542, 1.45069}, - {3689.55, -5049.66, 143.637, 5.2104}, - {3681.71, -5053.03, 143.242, 2.47957}, - {3677.64, -5061.44, 143.358, 2.47957}, - {3654.2, -5090.87, 143.469, 1.0313}, - {3650.39, -5097.45, 143.496, 2.5047}, - {3658.7, -5103.59, 143.607, 3.3278}, - {3659.02, -5133.97, 143.624, 3.84538}, - {3666.33, -5139.34, 143.183, 3.84538}, - {3669.74, -5149.63, 143.678, 0.528643}, - {3695.53, -5169.53, 143.671, 2.11908}, - {3701.98, -5166.51, 143.395, 1.24257}, - {3709.62, -5169.15, 143.576, 5.97695}, + {3755.52f, -5155.22f, 143.480f, 2.0f}, + {3744.35f, -5164.03f, 143.590f, 2.00f}, + {3749.28f, -5159.04f, 143.190f, 2.0f}, + {3774.47f, -5076.28f, 143.528f, 2.15912f}, + {3765.94f, -5074.15f, 143.186f, 3.77233f}, + {3763.15f, -5063.36f, 143.694f, 3.77233f}, + {3737.81f, -5045.69f, 143.709f, 4.9033f}, + {3728.13f, -5045.01f, 143.355f, 1.45069f}, + {3721.56f, -5048.35f, 143.542f, 1.45069f}, + {3689.55f, -5049.66f, 143.637f, 5.2104f}, + {3681.71f, -5053.03f, 143.242f, 2.47957f}, + {3677.64f, -5061.44f, 143.358f, 2.47957f}, + {3654.2f, -5090.87f, 143.469f, 1.0313f}, + {3650.39f, -5097.45f, 143.496f, 2.5047f}, + {3658.7f, -5103.59f, 143.607f, 3.3278f}, + {3659.02f, -5133.97f, 143.624f, 3.84538f}, + {3666.33f, -5139.34f, 143.183f, 3.84538f}, + {3669.74f, -5149.63f, 143.678f, 0.528643f}, + {3695.53f, -5169.53f, 143.671f, 2.11908f}, + {3701.98f, -5166.51f, 143.395f, 1.24257f}, + {3709.62f, -5169.15f, 143.576f, 5.97695f}, }; //Soldiers of the Frozen Wastes #define MAX_WASTES 49 const Position PosWastes[MAX_WASTES] = { - {3754.41, -5147.24, 143.204, 2.0}, - {3754.68, -5156.17, 143.418, 2.0}, - {3757.91, -5160.12, 143.503, 2.0}, - {3752.67, -5164.6, 143.395, 2.0}, - {3745.42, -5164.47, 143.565, 2.74587}, - {3741.2, -5155.92, 143.17, 5.29134}, - {3746.57, -5148.82, 143.176, 5.07772}, - {3778.14, -5070.1, 143.568, 3.16208}, - {3775.09, -5078.97, 143.65, 2.81022}, - {3773.54, -5083.47, 143.758, 3.21549}, - {3765, -5078.29, 143.176, 4.36688}, - {3766.94, -5072.63, 143.184, 5.27951}, - {3762.68, -5064.94, 143.635, 3.95297}, - {3769.9, -5059.94, 143.74, 3.36549}, - {3736.33, -5042.18, 143.643, 5.9471}, - {3727.51, -5040.58, 143.502, 0.871859}, - {3719.89, -5049.64, 143.58, 4.75172}, - {3720.69, -5044.43, 143.662, 1.87245}, - {3725.69, -5048.99, 143.363, 2.48271}, - {3732.33, -5054.01, 143.44, 3.59405}, - {3738.09, -5051.06, 143.718, 4.70931}, - {3682.76, -5063.5, 143.175, 0.636238}, - {3686.7, -5060.58, 143.18, 0.636238}, - {3682.45, -5057.21, 143.184, 5.61252}, - {3677.57, -5053.34, 143.369, 1.52531}, - {3677.3, -5062.26, 143.369, 2.73482}, - {3691.21, -5053.02, 143.421, 5.93218}, - {3685.22, -5053.34, 143.314, 4.70303}, - {3652.11, -5088.47, 143.555, 0.793317}, - {3648.23, -5093.21, 143.311, 1.18837}, - {3648.14, -5100.11, 143.632, 2.12221}, - {3653.88, -5099.7, 143.558, 3.04348}, - {3661.23, -5100.33, 143.42, 4.08335}, - {3663.49, -5092.77, 143.346, 4.47134}, - {3661.85, -5087.99, 143.571, 1.0148}, - {3664.56, -5149.01, 143.532, 0.0762528}, - {3665.01, -5142.04, 143.201, 1.72009}, - {3671.15, -5142.92, 143.174, 4.81535}, - {3670.18, -5134.38, 143.177, 5.37534}, - {3664.33, -5131.69, 143.262, 5.39576}, - {3658.21, -5133.63, 143.662, 1.3863}, - {3659.7, -5144.49, 143.363, 2.32328}, - {3705.71, -5179.63, 143.746, 1.06743}, - {3696.77, -5177.45, 143.759, 5.36748}, - {3700.97, -5173.13, 143.52, 3.26575}, - {3708.53, -5172.19, 143.573, 3.26575}, - {3712.49, -5167.62, 143.657, 5.63295}, - {3704.89, -5161.84, 143.239, 5.63295}, - {3695.66, -5164.63, 143.674, 1.54416}, + {3754.41f, -5147.24f, 143.204f, 2.0f}, + {3754.68f, -5156.17f, 143.418f, 2.0f}, + {3757.91f, -5160.12f, 143.503f, 2.0f}, + {3752.67f, -5164.6f, 143.395f, 2.0f}, + {3745.42f, -5164.47f, 143.565f, 2.74587f}, + {3741.2f, -5155.92f, 143.17f, 5.29134f}, + {3746.57f, -5148.82f, 143.176f, 5.07772f}, + {3778.14f, -5070.1f, 143.568f, 3.16208f}, + {3775.09f, -5078.97f, 143.65f, 2.81022f}, + {3773.54f, -5083.47f, 143.758f, 3.21549f}, + {3765, -5078.29f, 143.176f, 4.36688f}, + {3766.94f, -5072.63f, 143.184f, 5.27951f}, + {3762.68f, -5064.94f, 143.635f, 3.95297f}, + {3769.9f, -5059.94f, 143.74f, 3.36549f}, + {3736.33f, -5042.18f, 143.643f, 5.9471f}, + {3727.51f, -5040.58f, 143.502f, 0.871859f}, + {3719.89f, -5049.64f, 143.58f, 4.75172f}, + {3720.69f, -5044.43f, 143.662f, 1.87245f}, + {3725.69f, -5048.99f, 143.363f, 2.48271f}, + {3732.33f, -5054.01f, 143.44f, 3.59405f}, + {3738.09f, -5051.06f, 143.718f, 4.70931f}, + {3682.76f, -5063.5f, 143.175f, 0.636238f}, + {3686.7f, -5060.58f, 143.18f, 0.636238f}, + {3682.45f, -5057.21f, 143.184f, 5.61252f}, + {3677.57f, -5053.34f, 143.369f, 1.52531f}, + {3677.3f, -5062.26f, 143.369f, 2.73482f}, + {3691.21f, -5053.02f, 143.421f, 5.93218f}, + {3685.22f, -5053.34f, 143.314f, 4.70303f}, + {3652.11f, -5088.47f, 143.555f, 0.793317f}, + {3648.23f, -5093.21f, 143.311f, 1.18837f}, + {3648.14f, -5100.11f, 143.632f, 2.12221f}, + {3653.88f, -5099.7f, 143.558f, 3.04348f}, + {3661.23f, -5100.33f, 143.42f, 4.08335f}, + {3663.49f, -5092.77f, 143.346f, 4.47134f}, + {3661.85f, -5087.99f, 143.571f, 1.0148f}, + {3664.56f, -5149.01f, 143.532f, 0.0762528f}, + {3665.01f, -5142.04f, 143.201f, 1.72009f}, + {3671.15f, -5142.92f, 143.174f, 4.81535f}, + {3670.18f, -5134.38f, 143.177f, 5.37534f}, + {3664.33f, -5131.69f, 143.262f, 5.39576f}, + {3658.21f, -5133.63f, 143.662f, 1.3863f}, + {3659.7f, -5144.49f, 143.363f, 2.32328f}, + {3705.71f, -5179.63f, 143.746f, 1.06743f}, + {3696.77f, -5177.45f, 143.759f, 5.36748f}, + {3700.97f, -5173.13f, 143.52f, 3.26575f}, + {3708.53f, -5172.19f, 143.573f, 3.26575f}, + {3712.49f, -5167.62f, 143.657f, 5.63295f}, + {3704.89f, -5161.84f, 143.239f, 5.63295f}, + {3695.66f, -5164.63f, 143.674f, 1.54416f}, }; //Soul Weavers #define MAX_WEAVERS 7 const Position PosWeavers[MAX_WEAVERS] = { - {3752.45, -5168.35, 143.562, 1.6094}, - {3772.2, -5070.04, 143.329, 1.93686}, - {3732.28, -5032.88, 143.771, 3.08355}, - {3689.05, -5055.7, 143.172, 6.09554}, - {3649.45, -5093.17, 143.299, 2.51805}, - {3659.7, -5144.49, 143.363, 4.08806}, - {3704.71, -5175.96, 143.597, 3.36549}, + {3752.45f, -5168.35f, 143.562f, 1.6094f}, + {3772.2f, -5070.04f, 143.329f, 1.93686f}, + {3732.28f, -5032.88f, 143.771f, 3.08355f}, + {3689.05f, -5055.7f, 143.172f, 6.09554f}, + {3649.45f, -5093.17f, 143.299f, 2.51805f}, + {3659.7f, -5144.49f, 143.363f, 4.08806f}, + {3704.71f, -5175.96f, 143.597f, 3.36549f}, }; // predicate function to select not charmed target diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 225bd0b7931..79c48387022 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -40,9 +40,9 @@ enum Creatures #define MAX_POS_WRAP 3 const Position PosWrap[MAX_POS_WRAP] = { - {3546.796, -3869.082, 296.450, 0.0}, - {3531.271, -3847.424, 299.450, 0.0}, - {3497.067, -3843.384, 302.384, 0.0}, + {3546.796f, -3869.082f, 296.450f, 0.0f}, + {3531.271f, -3847.424f, 299.450f, 0.0f}, + {3497.067f, -3843.384f, 302.384f, 0.0f}, }; enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 96f777e0579..135473a2ea4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -35,20 +35,20 @@ #define MOB_GUARDIAN 16981 // Teleport position of Noth on his balcony -#define TELE_X 2631.370 -#define TELE_Y -3529.680 -#define TELE_Z 274.040 -#define TELE_O 6.277 +#define TELE_X 2631.370f +#define TELE_Y -3529.680f +#define TELE_Z 274.040f +#define TELE_O 6.277f #define MAX_SUMMON_POS 5 const float SummonPos[MAX_SUMMON_POS][4] = { - {2728.12, -3544.43, 261.91, 6.04}, - {2729.05, -3544.47, 261.91, 5.58}, - {2728.24, -3465.08, 264.20, 3.56}, - {2704.11, -3456.81, 265.53, 4.51}, - {2663.56, -3464.43, 262.66, 5.20}, + {2728.12f, -3544.43f, 261.91f, 6.04f}, + {2729.05f, -3544.47f, 261.91f, 5.58f}, + {2728.24f, -3465.08f, 264.20f, 3.56f}, + {2704.11f, -3456.81f, 265.53f, 4.51f}, + {2663.56f, -3464.43f, 262.66f, 5.20f}, }; enum Events diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index e9234c3e25d..eb0aea45b79 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -51,12 +51,12 @@ enum Achievs const Position RiftLocation[6] = { - {652.64, -273.70, -8.75}, - {634.45, -265.94, -8.44}, - {620.73, -281.17, -9.02}, - {626.10, -304.67, -9.44}, - {639.87, -314.11, -9.49}, - {651.72, -297.44, -9.37} + {652.64f, -273.70f, -8.75f}, + {634.45f, -265.94f, -8.44f}, + {620.73f, -281.17f, -9.02f}, + {626.10f, -304.67f, -9.44f}, + {639.87f, -314.11f, -9.49f}, + {651.72f, -297.44f, -9.37f} }; class boss_anomalus : public CreatureScript diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 436242e2a39..1265b755bef 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -53,7 +53,7 @@ enum Achievements ACHIEV_TIMER = 5*IN_MILLISECONDS }; -const Position CenterOfRoom = {504.80, 89.07, -16.12, 6.27}; +const Position CenterOfRoom = {504.80f, 89.07f, -16.12f, 6.27f}; class boss_magus_telestra : public CreatureScript { @@ -293,7 +293,7 @@ public: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_ICE_NOVA, false); - uiCooldown = 1.5*IN_MILLISECONDS; + uiCooldown = 1.5f*IN_MILLISECONDS; } uiIceNovaTimer = 15*IN_MILLISECONDS; } else uiIceNovaTimer -= diff; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 0fbfb243581..d85c70c4fe8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -164,10 +164,10 @@ public: if (!pWho) return; - if (me->GetPositionZ() > 518.63) + if (me->GetPositionZ() > 518.63f) DoStartNoMovement(pWho); - if (me->GetPositionZ() < 518.63) + if (me->GetPositionZ() < 518.63f) { if (me->Attack(pWho, true)) { @@ -330,15 +330,15 @@ public: switch(pSpell->Id) { case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66,1042.53,527.32,0.077); + me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02,1170.85,527.321,3.66); + me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31,1080.377,508.361,4.25); + me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f); LeaveCombat(); break; case SPELL_TELEPORT: diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index 9ebecddfbb9..97e936ab4eb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -152,66 +152,66 @@ struct Locations //each dragons special points. First where fly to before connect to connon, second where land point is. Waypoint m_aTene[]= { - {3212.854, 575.597, 109.856}, //init - {3246.425, 565.367, 61.249} //end + {3212.854f, 575.597f, 109.856f}, //init + {3246.425f, 565.367f, 61.249f} //end }; Waypoint m_aShad[]= { - {3293.238, 472.223, 106.968}, - {3271.669, 526.907, 61.931} + {3293.238f, 472.223f, 106.968f}, + {3271.669f, 526.907f, 61.931f} }; Waypoint m_aVesp[]= { - {3193.310, 472.861, 102.697}, - {3227.268, 533.238, 59.995} + {3193.310f, 472.861f, 102.697f}, + {3227.268f, 533.238f, 59.995f} }; #define MAX_WAYPOINT 6 //points around raid "isle", counter clockwise. should probably be adjusted to be more alike Waypoint m_aDragonCommon[MAX_WAYPOINT]= { - {3214.012, 468.932, 98.652}, - {3244.950, 468.427, 98.652}, - {3283.520, 496.869, 98.652}, - {3287.316, 555.875, 98.652}, - {3250.479, 585.827, 98.652}, - {3209.969, 566.523, 98.652} + {3214.012f, 468.932f, 98.652f}, + {3244.950f, 468.427f, 98.652f}, + {3283.520f, 496.869f, 98.652f}, + {3287.316f, 555.875f, 98.652f}, + {3250.479f, 585.827f, 98.652f}, + {3209.969f, 566.523f, 98.652f} }; -static Location FlameRight1Spawn = { 3200.00, 573.211, 57.1551 }; -static Location FlameRight1Direction = { 3289.28, 573.211, 57.1551 }; -static Location FlameRight2Spawn = { 3200.00, 532.211, 57.1551 }; -static Location FlameRight2Direction = { 3289.28, 532.211, 57.1551 }; -static Location FlameRight3Spawn = { 3200.00, 491.211, 57.1551 }; -static Location FlameRight3Direction = { 3289.28, 491.211, 57.1551 }; -static Location FlameLeft1Spawn = { 3289.28, 511.711, 57.1551 }; -static Location FlameLeft1Direction = { 3200.00, 511.711, 57.1551 }; -static Location FlameLeft2Spawn = { 3289.28, 552.711, 57.1551 }; -static Location FlameLeft2Direction = { 3200.00, 552.711, 57.1551 }; - -static Location AcolyteofShadron = { 3363.92, 534.703, 97.2683 }; -static Location AcolyteofShadron2 = { 3246.57, 551.263, 58.6164 }; -static Location AcolyteofVesperon = { 3145.68, 520.71, 89.7 }; -static Location AcolyteofVesperon2 = { 3246.57, 551.263, 58.6164 }; +static Location FlameRight1Spawn = { 3200.00f, 573.211f, 57.1551f }; +static Location FlameRight1Direction = { 3289.28f, 573.211f, 57.1551f }; +static Location FlameRight2Spawn = { 3200.00f, 532.211f, 57.1551f }; +static Location FlameRight2Direction = { 3289.28f, 532.211f, 57.1551f }; +static Location FlameRight3Spawn = { 3200.00f, 491.211f, 57.1551f }; +static Location FlameRight3Direction = { 3289.28f, 491.211f, 57.1551f }; +static Location FlameLeft1Spawn = { 3289.28f, 511.711f, 57.1551f }; +static Location FlameLeft1Direction = { 3200.00f, 511.711f, 57.1551f }; +static Location FlameLeft2Spawn = { 3289.28f, 552.711f, 57.1551f }; +static Location FlameLeft2Direction = { 3200.00f, 552.711f, 57.1551f }; + +static Location AcolyteofShadron = { 3363.92f, 534.703f, 97.2683f }; +static Location AcolyteofShadron2 = { 3246.57f, 551.263f, 58.6164f }; +static Location AcolyteofVesperon = { 3145.68f, 520.71f, 89.7f }; +static Location AcolyteofVesperon2 = { 3246.57f, 551.263f, 58.6164f }; Locations TwilightEggs[] = { - {3219.28, 669.121 , 88.5549}, - {3221.55, 682.852 , 90.5361}, - {3239.77, 685.94 , 90.3168}, - {3250.33, 669.749 , 88.7637}, - {3246.6, 642.365 , 84.8752}, - {3233.68, 653.117 , 85.7051} + {3219.28f, 669.121f , 88.5549f}, + {3221.55f, 682.852f , 90.5361f}, + {3239.77f, 685.94f , 90.3168f}, + {3250.33f, 669.749f , 88.7637f}, + {3246.6f, 642.365f , 84.8752f}, + {3233.68f, 653.117f , 85.7051f} }; Locations TwilightEggsSarth[] = { - {3252.73, 515.762 , 58.5501}, - {3256.56, 521.119 , 58.6061}, - {3255.63, 527.513 , 58.7568}, - {3264.90, 525.865 , 58.6436}, - {3264.26, 516.364 , 58.8011}, - {3257.54, 502.285 , 58.2077} + {3252.73f, 515.762f , 58.5501f}, + {3256.56f, 521.119f , 58.6061f}, + {3255.63f, 527.513f , 58.7568f}, + {3264.90f, 525.865f , 58.6436f}, + {3264.26f, 516.364f , 58.8011f}, + {3257.54f, 502.285f , 58.2077f} }; /*###### @@ -285,7 +285,7 @@ public: me->RemoveAurasDueToSpell(SPELL_TWILIGHT_REVENGE); me->ResetLootMode(); - me->SetHomePosition(3246.57, 551.263, 58.6164, 4.66003); + me->SetHomePosition(3246.57f, 551.263f, 58.6164f, 4.66003f); achievProgress = 0; @@ -297,7 +297,7 @@ public: Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON)); if (pTenebron) { - pTenebron->SetHomePosition(3239.07, 657.235, 86.8775, 4.74729); + pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); if(pTenebron->isAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -315,7 +315,7 @@ public: } if (pShadron) { - pShadron->SetHomePosition(3363.06, 525.28, 98.362, 4.76475); + pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); if(pShadron->isAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -333,7 +333,7 @@ public: } if (pVesperon) { - pVesperon->SetHomePosition(3145.68, 520.71, 89.7, 4.64258); + pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); if(pVesperon->isAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index a79b28323f2..1d9a009c4ab 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -76,11 +76,11 @@ struct Locations static Locations PipeLocations[] = { - {1295.44, 734.07, 200.3}, //left - {1297.7, 595.6, 199.9} //right + {1295.44f, 734.07f, 200.3f}, //left + {1297.7f, 595.6f, 199.9f} //right }; -static Locations CenterPoint = {1295.21, 667.157, 189.691}; +static Locations CenterPoint = {1295.21f, 667.157f, 189.691f}; class boss_sjonnir : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 72e81faeb2a..5956c21e131 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -128,8 +128,8 @@ enum Achievements static Position SpawnLocations[]= { - {946.992, 397.016, 208.374}, - {960.748, 382.944, 208.374}, + {946.992f, 397.016f, 208.374f}, + {960.748f, 382.944f, 208.374f}, }; class mob_tribuna_controller : public CreatureScript @@ -195,13 +195,13 @@ public: { if (uiPositionCounter == 0) { - (*itr)->GetMap()->CreatureRelocation((*itr), 927.265, 333.200, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(927.265, 333.200, 218.780, 0, (*itr)->GetMovementFlags(), 1); + (*itr)->GetMap()->CreatureRelocation((*itr), 927.265f, 333.200f, 218.780f, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(927.265f, 333.200f, 218.780f, 0, (*itr)->GetMovementFlags(), 1); } else { - (*itr)->GetMap()->CreatureRelocation((*itr), 921.745, 328.076, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(921.745, 328.076, 218.780, 0, (*itr)->GetMovementFlags(), 1); + (*itr)->GetMap()->CreatureRelocation((*itr), 921.745f, 328.076f, 218.780f, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(921.745f, 328.076f, 218.780f, 0, (*itr)->GetMovementFlags(), 1); } } ++uiPositionCounter; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index c367fe85923..3b196abb212 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -44,19 +44,6 @@ enum Creatures CREATURE_DARK_MATTER = 33089 }; -#define NORDRASSIL_X 1614.288574 -#define NORDRASSIL_Y -320.713287 -#define NORDRASSIL_Z 417.321167 -#define NORDRASSIL_X 1614.276245 -#define NORDRASSIL_Y -287.016632 -#define NORDRASSIL_Z 417.321106 -#define NORDRASSIL_X 1650.428467 -#define NORDRASSIL_Y -292.331390 -#define NORDRASSIL_Z 417.321167 -#define NORDRASSIL_X 1649.501831 -#define NORDRASSIL_Y -324.609222 -#define NORDRASSIL_Z 417.322174 - enum Yells { SAY_AGGRO = -1603000, @@ -200,8 +187,8 @@ public: void SummonCollapsingStar(Unit* target) { DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0,target->GetPositionY()+15.0,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0,target->GetPositionY()+15.0,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); + me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); + me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); } void UpdateAI(const uint32 diff) @@ -218,7 +205,7 @@ public: if (HealthBelowPct(2)) { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667, -295.101166,417.321381,0,0,0,0,0,0); + me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f,417.321381f,0,0,0,0,0,0); // All of them. or random? DoScriptText(SAY_DEATH_1, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 0dcaf2d5e62..9c98646e604 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -167,34 +167,34 @@ enum eAchievementData static Position Center[]= { - {354.8771, -12.90240, 409.803650}, + {354.8771f, -12.90240f, 409.803650f}, }; const Position PosSiege[5] = { - {-814.59,-64.54,429.92,5.969}, - {-784.37,-33.31,429.92,5.096}, - {-808.99,-52.10,429.92,5.668}, - {-798.59,-44.00,429.92,5.663}, - {-812.83,-77.71,429.92,0.046}, + {-814.59f,-64.54f,429.92f,5.969f}, + {-784.37f,-33.31f,429.92f,5.096f}, + {-808.99f,-52.10f,429.92f,5.668f}, + {-798.59f,-44.00f,429.92f,5.663f}, + {-812.83f,-77.71f,429.92f,0.046f}, }; const Position PosChopper[5] = { - {-717.83,-106.56,430.02,0.122}, - {-717.83,-114.23,430.44,0.122}, - {-717.83,-109.70,430.22,0.122}, - {-718.45,-118.24,430.26,0.052}, - {-718.45,-123.58,430.41,0.085}, + {-717.83f,-106.56f,430.02f,0.122f}, + {-717.83f,-114.23f,430.44f,0.122f}, + {-717.83f,-109.70f,430.22f,0.122f}, + {-718.45f,-118.24f,430.26f,0.052f}, + {-718.45f,-123.58f,430.41f,0.085f}, }; const Position PosDemolisher[5] = { - {-724.12,-176.64,430.03,2.543}, - {-766.70,-225.03,430.50,1.710}, - {-729.54,-186.26,430.12,1.902}, - {-756.01,-219.23,430.50,2.369}, - {-798.01,-227.24,429.84,1.446}, + {-724.12f,-176.64f,430.03f,2.543f}, + {-766.70f,-225.03f,430.50f,1.710f}, + {-729.54f,-186.26f,430.12f,1.902f}, + {-756.01f,-219.23f,430.50f,2.369f}, + {-798.01f,-227.24f,429.84f,1.446f}, }; class boss_flame_leviathan : public CreatureScript @@ -421,7 +421,7 @@ public: events.CancelEvent(EVENT_THORIM_S_HAMMER); return; case EVENT_MIMIRON_S_INFERNO: // Tower of Flames - me->SummonCreature(MOB_MIMIRON_BEACON, 390.93, -13.91, 409.81); + me->SummonCreature(MOB_MIMIRON_BEACON, 390.93f, -13.91f, 409.81f); DoScriptText(SAY_TOWER_FLAME, me); events.CancelEvent(EVENT_MIMIRON_S_INFERNO); return; @@ -451,10 +451,10 @@ public: void StartFreyaEvent()//summon these 4 on each corner wich wil spawn additional hostile mobs { - me->SummonCreature(MOB_FREYA_BEACON, 377.02, -119.10, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 377.02, 54.78, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 185.62, 54.78, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 185.62, -119.10, 409.81); + me->SummonCreature(MOB_FREYA_BEACON, 377.02f, -119.10f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 377.02f, 54.78f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 185.62f, 54.78f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 185.62f, -119.10f, 409.81f); } void DoAction(const int32 uiAction) @@ -462,8 +462,8 @@ public: // Start encounter if (uiAction == 10) { - me->SetHomePosition(354.8771, -12.90240, 409.803, 0); - me->GetMotionMaster()->MoveCharge(354.8771, -12.90240, 409.803); //position center + me->SetHomePosition(354.8771f, -12.90240f, 409.803f, 0); + me->GetMotionMaster()->MoveCharge(354.8771f, -12.90240f, 409.803f); //position center me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 8cbb746b0f1..424a80e6c48 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -272,8 +272,8 @@ public: void FlyPhase(uint8 Phase, const uint32 /*diff*/) { - const float x = 587.54; - const float y = -174.92; + const float x = 587.54f; + const float y = -174.92f; const float GroundLevel = me->GetBaseMap()->GetHeight(x, y, MAX_HEIGHT); const float FlightHeight = GroundLevel + 4.0f; // TODO: Fly out of range of attacks (442 is sufficient height for this), minus ~(10*number of harpoon gun chains attached to Razorscale) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 69b25956213..7cb8dba721f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -646,9 +646,9 @@ public: } InstanceScript* m_pInstance; - int32 uiArcingSmashTimer; - int32 uiTrampleTimer; - int32 uiUppercutTimer; + uint32 uiArcingSmashTimer; + uint32 uiTrampleTimer; + uint32 uiUppercutTimer; void Reset() { diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp index 8d76879a78e..7508230eb32 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp @@ -52,25 +52,25 @@ public: switch(action) { case BASE_CAMP: - pPlayer->TeleportTo(603, -706.122, -92.6024, 429.876, 0); + pPlayer->TeleportTo(603, -706.122f, -92.6024f, 429.876f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case GROUNDS: - pPlayer->TeleportTo(603, 131.248, -35.3802, 409.804, 0); + pPlayer->TeleportTo(603, 131.248f, -35.3802f, 409.804f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case FORGE: - pPlayer->TeleportTo(603, 553.233, -12.3247, 409.679, 0); + pPlayer->TeleportTo(603, 553.233f, -12.3247f, 409.679f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case SCRAPYARD: - pPlayer->TeleportTo(603, 926.292, -11.4635, 418.595, 0); + pPlayer->TeleportTo(603, 926.292f, -11.4635f, 418.595f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case ANTECHAMBER: - pPlayer->TeleportTo(603, 1498.09, -24.246, 420.967, 0); + pPlayer->TeleportTo(603, 1498.09f, -24.246f, 420.967f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case WALKWAY: - pPlayer->TeleportTo(603, 1859.45, -24.1, 448.9, 0); + pPlayer->TeleportTo(603, 1859.45f, -24.1f, 448.9f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case CONSERVATORY: - pPlayer->TeleportTo(603, 2086.27, -24.3134, 421.239, 0); + pPlayer->TeleportTo(603, 2086.27f, -24.3134f, 421.239f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 071c3583de6..a06ca389d34 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -45,18 +45,18 @@ enum eEnums SAY_DEATH = -1574004 }; -#define SKELETONSPAWN_Z 42.8668 +#define SKELETONSPAWN_Z 42.8668f float SkeletonSpawnPoint[5][5]= { - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, }; -float AttackLoc[3]={197.636, 194.046, 40.8164}; +float AttackLoc[3]={197.636f, 194.046f, 40.8164f}; bool ShatterFrostTomb; // needed for achievement: On The Rocks(1919) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index f23ab4b9d47..3dfb7206e0a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -67,12 +67,12 @@ struct Locations struct Locations moveLocs[]= { - {261.6,-449.3,109.5}, - {263.3,-454.0,109.5}, - {291.5,-450.4,109.5}, - {291.5,-454.0,109.5}, - {310.0,-453.4,109.5}, - {238.6,-460.7,109.5} + {261.6f,-449.3f,109.5f}, + {263.3f,-454.0f,109.5f}, + {291.5f,-450.4f,109.5f}, + {291.5f,-454.0f,109.5f}, + {310.0f,-453.4f,109.5f}, + {238.6f,-460.7f,109.5f} }; enum Phase diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 2192c6442ed..6c5c7dd53d6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -43,85 +43,85 @@ enum eYells SAY_DRAKE_BREATH_3 = -1575013, }; -static Position SpawnLoc = {468.931, -513.555, 104.723}; +static Position SpawnLoc = {468.931f, -513.555f, 104.723f}; static Position Location[]= { // Boss - {341.740997, -516.955017, 104.66900}, // 0 - {293.299, -505.95, 142.03}, // 1 - {301.664, -535.164, 146.097}, // 2 - {521.031006, -544.667847, 128.80064}, // 3 - {477.311981, -509.296814, 104.72308}, // 4 - {341.740997, -516.955017, 104.66900}, // 5 - {341.740997, -516.955017, 104.66900}, // 6 - {341.740997, -516.955017, 104.66900}, // 7 + {341.740997f, -516.955017f, 104.66900f}, // 0 + {293.299f, -505.95f, 142.03f}, // 1 + {301.664f, -535.164f, 146.097f}, // 2 + {521.031006f, -544.667847f, 128.80064f}, // 3 + {477.311981f, -509.296814f, 104.72308f}, // 4 + {341.740997f, -516.955017f, 104.66900f}, // 5 + {341.740997f, -516.955017f, 104.66900f}, // 6 + {341.740997f, -516.955017f, 104.66900f}, // 7 // Triggers Left - {469.661, -484.546, 104.712}, // 8 - {483.315, -485.028, 104.718}, // 9 - {476.87, -487.994, 104.735}, //10 - {477.512, -497.772, 104.728}, //11 - {486.287, -500.759, 104.722}, //12 - {480.1, -503.895, 104.722}, //13 - {472.391, -505.103, 104.723}, //14 - {478.885, -510.803, 104.723}, //15 - {489.529, -508.615, 104.723}, //16 - {484.272, -508.589, 104.723}, //17 - {465.328, -506.495, 104.427}, //18 - {456.885, -508.104, 104.447}, //19 - {450.177, -507.989, 105.247}, //20 - {442.273, -508.029, 104.813}, //21 - {434.225, -508.19, 104.787}, //22 - {423.902, -508.525, 104.274}, //23 - {414.551, -508.645, 105.136}, //24 - {405.787, -508.755, 104.988}, //25 - {398.812, -507.224, 104.82}, //26 - {389.702, -506.846, 104.729}, //27 - {381.856, -506.76, 104.756}, //28 - {372.881, -507.254, 104.779}, //29 - {364.978, -508.182, 104.673}, //30 - {357.633, -508.075, 104.647}, //31 - {350.008, -506.826, 104.588}, //32 - {341.69, -506.77, 104.499}, //33 - {335.31, -505.745, 105.18}, //34 - {471.178, -510.74, 104.723}, //35 - {461.759, -510.365, 104.199}, //36 - {424.07287, -510.082916, 104.711082}, //37 + {469.661f, -484.546f, 104.712f}, // 8 + {483.315f, -485.028f, 104.718f}, // 9 + {476.87f, -487.994f, 104.735f}, //10 + {477.512f, -497.772f, 104.728f}, //11 + {486.287f, -500.759f, 104.722f}, //12 + {480.1f, -503.895f, 104.722f}, //13 + {472.391f, -505.103f, 104.723f}, //14 + {478.885f, -510.803f, 104.723f}, //15 + {489.529f, -508.615f, 104.723f}, //16 + {484.272f, -508.589f, 104.723f}, //17 + {465.328f, -506.495f, 104.427f}, //18 + {456.885f, -508.104f, 104.447f}, //19 + {450.177f, -507.989f, 105.247f}, //20 + {442.273f, -508.029f, 104.813f}, //21 + {434.225f, -508.19f, 104.787f}, //22 + {423.902f, -508.525f, 104.274f}, //23 + {414.551f, -508.645f, 105.136f}, //24 + {405.787f, -508.755f, 104.988f}, //25 + {398.812f, -507.224f, 104.82f}, //26 + {389.702f, -506.846f, 104.729f}, //27 + {381.856f, -506.76f, 104.756f}, //28 + {372.881f, -507.254f, 104.779f}, //29 + {364.978f, -508.182f, 104.673f}, //30 + {357.633f, -508.075f, 104.647f}, //31 + {350.008f, -506.826f, 104.588f}, //32 + {341.69f, -506.77f, 104.499f}, //33 + {335.31f, -505.745f, 105.18f}, //34 + {471.178f, -510.74f, 104.723f}, //35 + {461.759f, -510.365f, 104.199f}, //36 + {424.07287f, -510.082916f, 104.711082f}, //37 // Triggers Right - {489.46, -513.297, 105.413}, //38 - {485.706, -517.175, 104.724}, //39 - {480.98, -519.313, 104.724}, //40 - {475.05, -520.52, 104.724}, //41 - {482.97, -512.099, 104.724}, //42 - {477.082, -514.172, 104.724}, //43 - {468.991, -516.691, 104.724}, //44 - {461.722, -517.063, 104.627}, //45 - {455.88, -517.681, 104.707}, //46 - {450.499, -519.099, 104.701}, //47 - {444.889, -518.963, 104.82}, //48 - {440.181, -518.893, 104.861}, //49 - {434.393, -518.758, 104.891}, //50 - {429.328, -518.583, 104.904}, //51 - {423.844, -518.394, 105.004}, //52 - {418.707, -518.266, 105.135}, //53 - {413.377, -518.085, 105.153}, //54 - {407.277, -517.844, 104.893}, //55 - {401.082, -517.443, 104.723}, //56 - {394.933, -514.64, 104.724}, //57 - {388.917, -514.688, 104.734}, //58 - {383.814, -515.834, 104.73}, //59 - {377.887, -518.653, 104.777}, //60 - {371.376, -518.289, 104.781}, //61 - {365.669, -517.822, 104.758}, //62 - {359.572, -517.314, 104.706}, //63 - {353.632, -517.146, 104.647}, //64 - {347.998, -517.038, 104.538}, //65 - {341.803, -516.98, 104.584}, //66 - {335.879, -516.674, 104.628}, //67 - {329.871, -515.92, 104.711}, //68 + {489.46f, -513.297f, 105.413f}, //38 + {485.706f, -517.175f, 104.724f}, //39 + {480.98f, -519.313f, 104.724f}, //40 + {475.05f, -520.52f, 104.724f}, //41 + {482.97f, -512.099f, 104.724f}, //42 + {477.082f, -514.172f, 104.724f}, //43 + {468.991f, -516.691f, 104.724f}, //44 + {461.722f, -517.063f, 104.627f}, //45 + {455.88f, -517.681f, 104.707f}, //46 + {450.499f, -519.099f, 104.701f}, //47 + {444.889f, -518.963f, 104.82f}, //48 + {440.181f, -518.893f, 104.861f}, //49 + {434.393f, -518.758f, 104.891f}, //50 + {429.328f, -518.583f, 104.904f}, //51 + {423.844f, -518.394f, 105.004f}, //52 + {418.707f, -518.266f, 105.135f}, //53 + {413.377f, -518.085f, 105.153f}, //54 + {407.277f, -517.844f, 104.893f}, //55 + {401.082f, -517.443f, 104.723f}, //56 + {394.933f, -514.64f, 104.724f}, //57 + {388.917f, -514.688f, 104.734f}, //58 + {383.814f, -515.834f, 104.73f}, //59 + {377.887f, -518.653f, 104.777f}, //60 + {371.376f, -518.289f, 104.781f}, //61 + {365.669f, -517.822f, 104.758f}, //62 + {359.572f, -517.314f, 104.706f}, //63 + {353.632f, -517.146f, 104.647f}, //64 + {347.998f, -517.038f, 104.538f}, //65 + {341.803f, -516.98f, 104.584f}, //66 + {335.879f, -516.674f, 104.628f}, //67 + {329.871f, -515.92f, 104.711f}, //68 // Breach Zone - {485.4577, -511.2515, 115.3011}, //69 - {435.1892, -514.5232, 118.6719}, //70 - {413.9327, -540.9407, 138.2614}, //71 + {485.4577f, -511.2515f, 115.3011f}, //69 + {435.1892f, -514.5232f, 118.6719f}, //70 + {413.9327f, -540.9407f, 138.2614f}, //71 }; enum eCombatPhase diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 2624c5acb7a..1db99f14f2e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -77,12 +77,12 @@ enum CombatPhase static Position RitualChannelerPos[]= { - {296.42, -355.01, 90.94}, - {302.36, -352.01, 90.54}, - {291.39, -350.89, 90.54} + {296.42f, -355.01f, 90.94f}, + {302.36f, -352.01f, 90.54f}, + {291.39f, -350.89f, 90.54f} }; -static Position ArthasPos = { 295.81, -366.16, 92.57, 1.58 }; -static Position SvalaPos = { 296.632, -346.075, 90.6307, 1.58 }; +static Position ArthasPos = { 295.81f, -366.16f, 92.57f, 1.58f }; +static Position SvalaPos = { 296.632f, -346.075f, 90.6307f, 1.58f }; class boss_svala : public CreatureScript { @@ -160,28 +160,28 @@ public: case 0: DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 1: DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 2: DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 3: DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 4: DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me); DoCast(me, SPELL_SVALA_TRANSFORMING1); ++uiIntroPhase; - uiIntroTimer = 2.8*IN_MILLISECONDS; + uiIntroTimer = 2.8f*IN_MILLISECONDS; break; case 5: DoCast(me, SPELL_SVALA_TRANSFORMING2); @@ -287,7 +287,7 @@ public: Phase = NORMAL; - DoTeleportTo(296.632, -346.075, 90.6307); + DoTeleportTo(296.632f, -346.075f, 90.6307f); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); summons.DespawnAll(); @@ -348,9 +348,9 @@ public: DoScriptText(RAND(SAY_SACRIFICE_PLAYER_1,SAY_SACRIFICE_PLAYER_2,SAY_SACRIFICE_PLAYER_3,SAY_SACRIFICE_PLAYER_4,SAY_SACRIFICE_PLAYER_5),me); DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD); //Spell doesn't teleport - DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6); + DoTeleportPlayer(pSacrificeTarget, 296.632f, -346.075f, 90.63f, 4.6f); me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY); - DoTeleportTo(296.632, -346.075, 120.85); + DoTeleportTo(296.632f, -346.075f, 120.85f); Phase = SACRIFICING; if (pInstance) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 78743164a60..6c17e0c764b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -91,10 +91,10 @@ struct ActiveBoatStruct static ActiveBoatStruct ActiveBot[4] = { - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379, -335.335, 104.756, 413.594, -335.408, 107.995, 3.157}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813, -335.069, 104.756, 369.994, -334.771, 107.995, 6.232}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546, -314.362, 104.756, 370.841, -314.426, 107.995, 6.232}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310, -314.761, 104.756, 413.992, -314.703, 107.995, 3.157} + {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, + {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, + {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, + {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} }; class boss_ymiron : public CreatureScript @@ -271,7 +271,7 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { pTemp->SetSpeed(MOVE_RUN, 0.4f); pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 664a377b20c..5052457c5e3 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -48,10 +48,10 @@ struct Position TempestMinions[MAX_TEMPEST_MINIONS] = { - {-203.980103, -281.287720, 91.650223, 1.598807}, - {-233.489410, -281.139282, 91.652412, 1.598807}, - {-233.267578, -297.104645, 91.681915, 1.598807}, - {-203.842529, -297.097015, 91.745163, 1.598807} + {-203.980103f, -281.287720f, 91.650223f, 1.598807f}, + {-233.489410f, -281.139282f, 91.652412f, 1.598807f}, + {-233.267578f, -297.104645f, 91.681915f, 1.598807f}, + {-203.842529f, -297.097015f, 91.745163f, 1.598807f} }; /*###### diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 1700fb6ec32..3ffafc93f15 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -33,7 +33,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_frozen_orb' WHERE `entry`='3845 // Spells Frost Warder #define SPELL_FROST_BLAST RAID_MODE(72123,72124) // don't know cd... using 20 secs. -#define SPELL_FROZEN_MALLET 72122 +#define SPELL_FROZEN_MALLET_2 72122 // Spell Frozen Orb #define SPELL_FROZEN_ORB_DMG 72081 // priodic dmg aura @@ -166,7 +166,7 @@ public: { DoZoneInCombat(); - DoCast(me, SPELL_FROZEN_MALLET); + DoCast(me, SPELL_FROZEN_MALLET_2); events.ScheduleEvent(EVENT_FROST_BLAST, 5000); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 341e671ca57..0425fc24712 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -64,11 +64,11 @@ enum Actions #define MAX_SPAWN_LOC 5 static Position SpawnLoc[MAX_SPAWN_LOC]= { - {1840.64, 795.407, 44.079, 1.676}, - {1886.24, 757.733, 47.750, 5.201}, - {1877.91, 845.915, 43.417, 3.560}, - {1918.97, 850.645, 47.225, 4.136}, - {1935.50, 796.224, 52.492, 4.224}, + {1840.64f, 795.407f, 44.079f, 1.676f}, + {1886.24f, 757.733f, 47.750f, 5.201f}, + {1877.91f, 845.915f, 43.417f, 3.560f}, + {1918.97f, 850.645f, 47.225f, 4.136f}, + {1935.50f, 796.224f, 52.492f, 4.224f}, }; class boss_ichoron : public CreatureScript @@ -162,7 +162,7 @@ public: switch(param) { case ACTION_WATER_ELEMENT_HIT: - me->SetHealth(me->GetHealth() + me->GetMaxHealth() * 0.01); + me->SetHealth(me->GetHealth() + me->GetMaxHealth() * 0.01f); if (bIsExploded) DoExplodeCompleted(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 01eee6c6963..65625c48bc6 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -67,26 +67,26 @@ enum Events const Position PortalLocation[] = { - {1877.51, 850.104, 44.6599, 4.7822 }, // WP 1 - {1918.37, 853.437, 47.1624, 4.12294}, // WP 2 - {1936.07, 803.198, 53.3749, 3.12414}, // WP 3 - {1927.61, 758.436, 51.4533, 2.20891}, // WP 4 - {1890.64, 753.471, 48.7224, 1.71042}, // WP 5 - {1908.31, 809.657, 38.7037, 3.08701} // WP 6 + {1877.51f, 850.104f, 44.6599f, 4.7822f }, // WP 1 + {1918.37f, 853.437f, 47.1624f, 4.12294f}, // WP 2 + {1936.07f, 803.198f, 53.3749f, 3.12414f}, // WP 3 + {1927.61f, 758.436f, 51.4533f, 2.20891f}, // WP 4 + {1890.64f, 753.471f, 48.7224f, 1.71042f}, // WP 5 + {1908.31f, 809.657f, 38.7037f, 3.08701f} // WP 6 }; -const Position BossStartMove1 = {1894.684448, 739.390503, 47.668003}; -const Position BossStartMove2 = {1875.173950, 860.832703, 43.333565}; -const Position BossStartMove21 = {1858.854614, 855.071411, 43.333565}; -const Position BossStartMove22 = {1891.926636, 863.388977, 43.333565}; -const Position BossStartMove3 = {1916.138062, 778.152222, 35.772308}; -const Position BossStartMove4 = {1853.618286, 758.557617, 38.657505}; -const Position BossStartMove5 = {1906.683960, 842.348022, 38.637459}; -const Position BossStartMove6 = {1928.207031, 852.864441, 47.200813}; - -const Position CyanigosasSpawnLocation = {1930.281250, 804.407715, 52.410946, 3.139621}; -const Position MiddleRoomLocation = {1892.291260, 805.696838, 38.438862, 3.139621}; -const Position MiddleRoomPortalSaboLocation = {1896.622925, 804.854126, 38.504772, 3.139621}; +const Position BossStartMove1 = {1894.684448f, 739.390503f, 47.668003f}; +const Position BossStartMove2 = {1875.173950f, 860.832703f, 43.333565f}; +const Position BossStartMove21 = {1858.854614f, 855.071411f, 43.333565f}; +const Position BossStartMove22 = {1891.926636f, 863.388977f, 43.333565f}; +const Position BossStartMove3 = {1916.138062f, 778.152222f, 35.772308f}; +const Position BossStartMove4 = {1853.618286f, 758.557617f, 38.657505f}; +const Position BossStartMove5 = {1906.683960f, 842.348022f, 38.637459f}; +const Position BossStartMove6 = {1928.207031f, 852.864441f, 47.200813f}; + +const Position CyanigosasSpawnLocation = {1930.281250f, 804.407715f, 52.410946f, 3.139621f}; +const Position MiddleRoomLocation = {1892.291260f, 805.696838f, 38.438862f, 3.139621f}; +const Position MiddleRoomPortalSaboLocation = {1896.622925f, 804.854126f, 38.504772f, 3.139621f}; //Cyanigosa's prefight event data enum Yells diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index a228bef2d09..aacee53a801 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -127,126 +127,126 @@ enum eSinclari float FirstPortalWPs [6][3] = { - {1877.670288, 842.280273, 43.333591}, - {1877.338867, 834.615356, 38.762287}, - {1872.161011, 823.854309, 38.645401}, - {1864.860474, 815.787170, 38.784843}, - {1858.953735, 810.048950, 44.008759}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1877.670288f, 842.280273f, 43.333591f}, + {1877.338867f, 834.615356f, 38.762287f}, + {1872.161011f, 823.854309f, 38.645401f}, + {1864.860474f, 815.787170f, 38.784843f}, + {1858.953735f, 810.048950f, 44.008759f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float SecondPortalFirstWPs [9][3] = { - {1902.561401, 853.334656, 47.106117}, - {1895.486084, 855.376404, 44.334591}, - {1882.805176, 854.993286, 43.333591}, - {1877.670288, 842.280273, 43.333591}, - {1877.338867, 834.615356, 38.762287}, - {1872.161011, 823.854309, 38.645401}, - {1864.860474, 815.787170, 38.784843}, - {1858.953735, 810.048950, 44.008759}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1902.561401f, 853.334656f, 47.106117f}, + {1895.486084f, 855.376404f, 44.334591f}, + {1882.805176f, 854.993286f, 43.333591f}, + {1877.670288f, 842.280273f, 43.333591f}, + {1877.338867f, 834.615356f, 38.762287f}, + {1872.161011f, 823.854309f, 38.645401f}, + {1864.860474f, 815.787170f, 38.784843f}, + {1858.953735f, 810.048950f, 44.008759f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float SecondPortalSecondWPs [8][3] = { - {1929.392212, 837.614990, 47.136166}, - {1928.290649, 824.750427, 45.474411}, - {1915.544922, 826.919373, 38.642811}, - {1900.933960, 818.855652, 38.801647}, - {1886.810547, 813.536621, 38.490490}, - {1869.079712, 808.701538, 38.689003}, - {1860.843384, 806.645020, 44.008789}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1929.392212f, 837.614990f, 47.136166f}, + {1928.290649f, 824.750427f, 45.474411f}, + {1915.544922f, 826.919373f, 38.642811f}, + {1900.933960f, 818.855652f, 38.801647f}, + {1886.810547f, 813.536621f, 38.490490f}, + {1869.079712f, 808.701538f, 38.689003f}, + {1860.843384f, 806.645020f, 44.008789f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float ThirdPortalWPs [8][3] = { - {1934.049438, 815.778503, 52.408699}, - {1928.290649, 824.750427, 45.474411}, - {1915.544922, 826.919373, 38.642811}, - {1900.933960, 818.855652, 38.801647}, - {1886.810547, 813.536621, 38.490490}, - {1869.079712, 808.701538, 38.689003}, - {1860.843384, 806.645020, 44.008789}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1934.049438f, 815.778503f, 52.408699f}, + {1928.290649f, 824.750427f, 45.474411f}, + {1915.544922f, 826.919373f, 38.642811f}, + {1900.933960f, 818.855652f, 38.801647f}, + {1886.810547f, 813.536621f, 38.490490f}, + {1869.079712f, 808.701538f, 38.689003f}, + {1860.843384f, 806.645020f, 44.008789f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float FourthPortalWPs [9][3] = { - {1921.658447, 761.657043, 50.866741}, - {1910.559814, 755.780457, 47.701447}, - {1896.664673, 752.920898, 47.667004}, - {1887.398804, 763.633240, 47.666851}, - {1879.020386, 775.396973, 38.705990}, - {1872.439087, 782.568604, 38.808292}, - {1863.573364, 791.173584, 38.743660}, - {1857.811890, 796.765564, 43.950329}, - {1845.577759, 800.681152, 44.104248} - //{1827.100342, 801.605957, 44.363358} + {1921.658447f, 761.657043f, 50.866741f}, + {1910.559814f, 755.780457f, 47.701447f}, + {1896.664673f, 752.920898f, 47.667004f}, + {1887.398804f, 763.633240f, 47.666851f}, + {1879.020386f, 775.396973f, 38.705990f}, + {1872.439087f, 782.568604f, 38.808292f}, + {1863.573364f, 791.173584f, 38.743660f}, + {1857.811890f, 796.765564f, 43.950329f}, + {1845.577759f, 800.681152f, 44.104248f} + //{1827.100342f, 801.605957f, 44.363358f} }; float FifthPortalWPs [6][3] = { - {1887.398804, 763.633240, 47.666851}, - {1879.020386, 775.396973, 38.705990}, - {1872.439087, 782.568604, 38.808292}, - {1863.573364, 791.173584, 38.743660}, - {1857.811890, 796.765564, 43.950329}, - {1845.577759, 800.681152, 44.104248} - //{1827.100342, 801.605957, 44.363358} + {1887.398804f, 763.633240f, 47.666851f}, + {1879.020386f, 775.396973f, 38.705990f}, + {1872.439087f, 782.568604f, 38.808292f}, + {1863.573364f, 791.173584f, 38.743660f}, + {1857.811890f, 796.765564f, 43.950329f}, + {1845.577759f, 800.681152f, 44.104248f} + //{1827.100342f, 801.605957f, 44.363358f} }; float SixthPoralWPs [4][3] = { - {1888.861084, 805.074768, 38.375790}, - {1869.793823, 804.135804, 38.647018}, - {1861.541504, 804.149780, 43.968292}, - {1843.567017, 804.288208, 44.139091} - //{1826.889648, 803.929993, 44.363239} + {1888.861084f, 805.074768f, 38.375790f}, + {1869.793823f, 804.135804f, 38.647018f}, + {1861.541504f, 804.149780f, 43.968292f}, + {1843.567017f, 804.288208f, 44.139091f} + //{1826.889648f, 803.929993f, 44.363239f} }; const float SaboteurFinalPos1[3][3] = { - {1892.502319, 777.410767, 38.630402}, - {1891.165161, 762.969421, 47.666920}, - {1893.168091, 740.919189, 47.666920} + {1892.502319f, 777.410767f, 38.630402f}, + {1891.165161f, 762.969421f, 47.666920f}, + {1893.168091f, 740.919189f, 47.666920f} }; const float SaboteurFinalPos2[3][3] = { - {1882.242676, 834.818726, 38.646786}, - {1879.220825, 842.224854, 43.333641}, - {1873.842896, 863.892456, 43.333641} + {1882.242676f, 834.818726f, 38.646786f}, + {1879.220825f, 842.224854f, 43.333641f}, + {1873.842896f, 863.892456f, 43.333641f} }; const float SaboteurFinalPos3[2][3] = { - {1904.298340, 792.400391, 38.646782}, - {1935.716919, 758.437073, 30.627895} + {1904.298340f, 792.400391f, 38.646782f}, + {1935.716919f, 758.437073f, 30.627895f} }; const float SaboteurFinalPos4[3] = { - 1855.006104, 760.641724, 38.655266 + 1855.006104f, 760.641724f, 38.655266f }; const float SaboteurFinalPos5[3] = { - 1906.667358, 841.705566, 38.637894 + 1906.667358f, 841.705566f, 38.637894f }; const float SaboteurFinalPos6[5][3] = { - {1911.437012, 821.289246, 38.684128}, - {1920.734009, 822.978027, 41.525414}, - {1928.262939, 830.836609, 44.668266}, - {1929.338989, 837.593933, 47.137596}, - {1931.063354, 848.468445, 47.190434} + {1911.437012f, 821.289246f, 38.684128f}, + {1920.734009f, 822.978027f, 41.525414f}, + {1928.262939f, 830.836609f, 44.668266f}, + {1929.338989f, 837.593933f, 47.137596f}, + {1931.063354f, 848.468445f, 47.190434f} }; -const Position MovePosition = {1806.955566, 803.851807, 44.363323}; -const Position playerTeleportPosition = {1830.531006, 803.939758, 44.340508, 6.281611}; -const Position sinclariOutsidePosition = {1817.315674, 804.060608, 44.363998}; +const Position MovePosition = {1806.955566f, 803.851807f, 44.363323f}; +const Position playerTeleportPosition = {1830.531006f, 803.939758f, 44.340508f, 6.281611f}; +const Position sinclariOutsidePosition = {1817.315674f, 804.060608f, 44.363998f}; class npc_sinclari_vh : public CreatureScript { @@ -492,30 +492,30 @@ public: case 1: for(int i=0;i<3;i++) AddWaypoint(i,SaboteurFinalPos1[i][0],SaboteurFinalPos1[i][1],SaboteurFinalPos1[i][2],0); - me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346); + me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346f); break; case 2: for(int i=0;i<3;i++) AddWaypoint(i,SaboteurFinalPos2[i][0],SaboteurFinalPos2[i][1],SaboteurFinalPos2[i][2],0); - me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674); + me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674f); break; case 3: for(int i=0;i<2;i++) AddWaypoint(i,SaboteurFinalPos3[i][0],SaboteurFinalPos3[i][1],SaboteurFinalPos3[i][2],0); - me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638); + me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638f); break; case 4: AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0); - me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108); + me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108f); break; case 5: AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0); - me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841); + me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841f); break; case 6: for(int i=0;i<5;i++) AddWaypoint(i,SaboteurFinalPos6[i][0],SaboteurFinalPos6[i][1],SaboteurFinalPos6[i][2],0); - me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031); + me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031f); break; } @@ -734,7 +734,7 @@ struct violet_hold_trashAI : public npc_escortAI case 0: for(int i=0;i<6;i++) AddWaypoint(i,FirstPortalWPs[i][0]+irand(-1,1),FirstPortalWPs[i][1]+irand(-1,1),FirstPortalWPs[i][2]+irand(-1,1),0); - me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439); + me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439f); break; case 1: secondPortalRouteID = urand(0,1); @@ -743,34 +743,34 @@ struct violet_hold_trashAI : public npc_escortAI case 0: for(int i=0;i<9;i++) AddWaypoint(i,SecondPortalFirstWPs[i][0]+irand(-1,1),SecondPortalFirstWPs[i][1]+irand(-1,1),SecondPortalFirstWPs[i][2],0); - me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439); + me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439f); break; case 1: for(int i=0;i<8;i++) AddWaypoint(i,SecondPortalSecondWPs[i][0]+irand(-1,1),SecondPortalSecondWPs[i][1]+irand(-1,1),SecondPortalSecondWPs[i][2],0); - me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439); + me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439f); break; } break; case 2: for(int i=0;i<8;i++) AddWaypoint(i,ThirdPortalWPs[i][0]+irand(-1,1),ThirdPortalWPs[i][1]+irand(-1,1),ThirdPortalWPs[i][2],0); - me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439); + me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439f); break; case 3: for(int i=0;i<9;i++) AddWaypoint(i,FourthPortalWPs[i][0]+irand(-1,1),FourthPortalWPs[i][1]+irand(-1,1),FourthPortalWPs[i][2],0); - me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439); + me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439f); break; case 4: for(int i=0;i<6;i++) AddWaypoint(i,FifthPortalWPs[i][0]+irand(-1,1),FifthPortalWPs[i][1]+irand(-1,1),FifthPortalWPs[i][2],0); - me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439); + me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439f); break; case 5: for(int i=0;i<4;i++) AddWaypoint(i,SixthPoralWPs[i][0]+irand(-1,1),SixthPoralWPs[i][1]+irand(-1,1),SixthPoralWPs[i][2],0); - me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439); + me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439f); break; } SetDespawnAtEnd(false); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 23776bac728..c98daec247e 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1022,19 +1022,19 @@ public: { case 3: SetEscortPaused(true); - if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313, 3518.689, 473.324, 1.562, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArthas = pArthas->GetGUID(); pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pArthas->SetReactState(REACT_PASSIVE); pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756,3564.841309,477.433014); + pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f,3564.841309f,477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23, 3614.936, 473.321, 4.462012, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977,3568.882080,477.433014); + pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f,3568.882080f,477.433014f); } me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -1112,19 +1112,19 @@ public: break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100, 3615.655029, 473.321533, 4.447805, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiArlos = pArlos->GetGUID(); pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArlos->GetMotionMaster()->MovePoint(0, 3735.570068, 3572.419922, 477.441010); + pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541, 3614.959717, 473.323486, 4.524959, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pLeryssa->SetReactState(REACT_PASSIVE); pLeryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971, 3571.439941, 477.441010); + pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971f, 3571.439941f, 477.441010f); } uiPhaseTimer = 2000; uiPhase = 0; @@ -1443,7 +1443,7 @@ public: pLeryssa->RemoveAura(SPELL_STUN); pLeryssa->clearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502, 3564.201660, 477.441437); + pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 4cc68b4585c..4b6db59974e 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -255,7 +255,7 @@ public: if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallard::npc_inquisitor_hallardAI, pCreature->AI())) { pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true); - pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); + pCreature->GetMotionMaster()->MovePoint(0, 3801.543f, -679.350f, 213.75f); } } return true; diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 8be061fc188..8e0a6f2c16d 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -184,7 +184,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451,952.472,547.554,0.38); + pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451f,952.472f,547.554f,0.38f); } return true; } @@ -211,7 +211,7 @@ public: { npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) { - pCreature->GetMotionMaster()->MovePoint(0,8599.258,963.951,547.553); + pCreature->GetMotionMaster()->MovePoint(0,8599.258f,963.951f,547.553f); pCreature->setFaction(35); //wrong faction in db? } diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index a77063669cc..e4c4d9d2459 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -363,8 +363,8 @@ public: break; case 1: DoScriptText(SAY_WP_3, me); - me->CastSpell(5918.33, 5372.91, -98.770, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->CastSpell(5918.33f, 5372.91f, -98.770f, SPELL_EXPLODE_CRYSTAL, true); + me->SummonGameObject(184743, 5918.33f, 5372.91f, -98.770f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 2: @@ -374,8 +374,8 @@ public: DoScriptText(SAY_WP_5, me); break; case 8: - me->CastSpell(5887.37, 5379.39, -91.289, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->CastSpell(5887.37f, 5379.39f, -91.289f, SPELL_EXPLODE_CRYSTAL, true); + me->SummonGameObject(184743, 5887.37f, 5379.39f, -91.289f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 9: @@ -432,7 +432,7 @@ public: { if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, pCreature->AI())) { - pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4, 0.4); + pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4f, 0.4f); pCreature->setFaction(113); pEscortAI->Start(false, false, pPlayer->GetGUID()); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 9af209179a0..c6df2334e33 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -292,29 +292,29 @@ static BossAndAdd Boss[]= const Position SpawnPosition[] = { - {5754.692, -2939.46, 286.276123, 5.156380}, // stinkbeard || orinoko || korrak - {5762.054199, -2954.385010, 273.826955, 5.108289}, //yggdras - {5776.855, -2989.77979, 272.96814, 5.194} // elementals + {5754.692f, -2939.46f, 286.276123f, 5.156380f}, // stinkbeard || orinoko || korrak + {5762.054199f, -2954.385010f, 273.826955f, 5.108289f}, //yggdras + {5776.855f, -2989.77979f, 272.96814f, 5.194f} // elementals }; const Position AddSpawnPosition[] = { - {5722.487, -3010.75, 312.751648, 0.478}, // caster location - {5724.983, -2969.89551, 286.359619, 0.478}, - {5733.76025, -3000.34644, 286.359619, 0.478}, - {5739.8125, -2981.524, 290.7671, 0.478}, // caster location - {5742.101, -2950.75586, 286.2643, 5.21}, - {5743.305, -3011.29736, 290.7671, 0.478}, // caster location - {5744.417, -3025.528, 286.35965, 0.478}, - {5763.189, -3029.67529, 290.7671, 0.478}, - {5769.401, -2935.121, 286.335754, 5.21}, - {5793.061, -2934.593, 286.359619, 3.53}, - {5797.32129, -2955.26855, 290.7671, 3.53}, // caster location - {5813.94531, -2956.74683, 286.359619, 3.53}, - {5816.85547, -2974.476, 290.7671, 3.53}, // caster location - {5820.30859, -3002.83716, 290.7671, 3.53}, // caster location - {5828.50244, -2981.737, 286.359619, 3.53}, - {5828.899, -2960.15479, 312.751648, 3.53}, // caster location + {5722.487f, -3010.75f, 312.751648f, 0.478f}, // caster location + {5724.983f, -2969.89551f, 286.359619f, 0.478f}, + {5733.76025f, -3000.34644f, 286.359619f, 0.478f}, + {5739.8125f, -2981.524f, 290.7671f, 0.478f}, // caster location + {5742.101f, -2950.75586f, 286.2643f, 5.21f}, + {5743.305f, -3011.29736f, 290.7671f, 0.478f}, // caster location + {5744.417f, -3025.528f, 286.35965f, 0.478f}, + {5763.189f, -3029.67529f, 290.7671f, 0.478f}, + {5769.401f, -2935.121f, 286.335754f, 5.21f}, + {5793.061f, -2934.593f, 286.359619f, 3.53f}, + {5797.32129f, -2955.26855f, 290.7671f, 3.53f}, // caster location + {5813.94531f, -2956.74683f, 286.359619f, 3.53f}, + {5816.85547f, -2974.476f, 290.7671f, 3.53f}, // caster location + {5820.30859f, -3002.83716f, 290.7671f, 3.53f}, // caster location + {5828.50244f, -2981.737f, 286.359619f, 3.53f}, + {5828.899f, -2960.15479f, 312.751648f, 3.53f}, // caster location }; class npc_gurgthock : public CreatureScript @@ -425,7 +425,7 @@ public: break; case 2: if (Creature* pSummon = Unit::GetCreature(*me, SummonGUID)) - pSummon->GetMotionMaster()->MoveJump(5776.319824, -2981.005371, 273.100037, 10.0f, 20.0f); + pSummon->GetMotionMaster()->MoveJump(5776.319824f, -2981.005371f, 273.100037f, 10.0f, 20.0f); uiPhase = 0; SummonGUID = 0; break; @@ -824,14 +824,14 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276) + if (me->getVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); @@ -947,14 +947,14 @@ public: if (Unit* victim = me->getVictim()) { - if (victim->GetPositionZ() >= 286.276) + if (victim->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); @@ -1092,14 +1092,14 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276) + if (me->getVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h index 8b9a3b569dc..966338ba9a6 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h @@ -131,18 +131,18 @@ enum EP_Towers const go_type EPCapturePoints[EP_TOWER_NUM] = { - {182097,0,2574.51,-4794.89,144.704,-1.45003,-0.097056,0.095578,-0.656229,0.742165}, - {181899,0,3181.08,-4379.36,174.123,-2.03472,-0.065392,0.119494,-0.842275,0.521553}, - {182098,0,2962.71,-3042.31,154.789,2.08426,-0.074807,-0.113837,0.855928,0.49883}, - {182096,0,1860.85,-3731.23,196.716,-2.53214,0.033967,-0.131914,0.944741,-0.298177} + {182097,0,2574.51f,-4794.89f,144.704f,-1.45003f,-0.097056f,0.095578f,-0.656229f,0.742165f}, + {181899,0,3181.08f,-4379.36f,174.123f,-2.03472f,-0.065392f,0.119494f,-0.842275f,0.521553f}, + {182098,0,2962.71f,-3042.31f,154.789f,2.08426f,-0.074807f,-0.113837f,0.855928f,0.49883f}, + {182096,0,1860.85f,-3731.23f,196.716f,-2.53214f,0.033967f,-0.131914f,0.944741f,-0.298177f} }; const go_type EPTowerFlags[EP_TOWER_NUM] = { - {182106,0,2569.60,-4772.93,115.399,2.72271,0,0,0.978148,0.207912}, - {182106,0,3148.17,-4365.51,145.029,1.53589,0,0,0.694658,0.71934}, - {182106,0,2992.63,-3022.95,125.593,3.03687,0,0,0.99863,0.052336}, - {182106,0,1838.42,-3703.56,167.713,0.890118,0,0,0.430511,0.902585} + {182106,0,2569.60f,-4772.93f,115.399f,2.72271f,0.0f,0.0f,0.978148f,0.207912f}, + {182106,0,3148.17f,-4365.51f,145.029f,1.53589f,0.0f,0.0f,0.694658f,0.71934f}, + {182106,0,2992.63f,-3022.95f,125.593f,3.03687f,0.0f,0.0f,0.99863f,0.052336f}, + {182106,0,1838.42f,-3703.56f,167.713f,0.890118f,0.0f,0.0f,0.430511f,0.902585f} }; const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705}; @@ -156,20 +156,20 @@ const uint32 EP_EWT_NUM_CREATURES = 5; // should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] = { - {17635,469,0, 3167.61,-4352.09,138.20,4.5811}, - {17647,469,0, 3172.74,-4352.99,139.14,4.9873}, - {17647,469,0, 3165.89,-4354.46,138.67,3.7244}, - {17647,469,0, 3164.65,-4350.26,138.22,2.4794}, - {17647,469,0, 3169.91,-4349.68,138.37,0.7444} + {17635,469,0, 3167.61f,-4352.09f,138.20f,4.5811f}, + {17647,469,0, 3172.74f,-4352.99f,139.14f,4.9873f}, + {17647,469,0, 3165.89f,-4354.46f,138.67f,3.7244f}, + {17647,469,0, 3164.65f,-4350.26f,138.22f,2.4794f}, + {17647,469,0, 3169.91f,-4349.68f,138.37f,0.7444f} }; const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] = { - {17995,67,0, 3167.61,-4352.09,138.20,4.5811}, - {17996,67,0, 3172.74,-4352.99,139.14,4.9873}, - {17996,67,0, 3165.89,-4354.46,138.67,3.7244}, - {17996,67,0, 3164.65,-4350.26,138.22,2.4794}, - {17996,67,0, 3169.91,-4349.68,138.37,0.7444} + {17995,67,0, 3167.61f,-4352.09f,138.20f,4.5811f}, + {17996,67,0, 3172.74f,-4352.99f,139.14f,4.9873f}, + {17996,67,0, 3165.89f,-4354.46f,138.67f,3.7244f}, + {17996,67,0, 3164.65f,-4350.26f,138.22f,2.4794f}, + {17996,67,0, 3169.91f,-4349.68f,138.37f,0.7444f} }; enum EP_TowerStates @@ -184,10 +184,10 @@ enum EP_TowerStates }; // when spawning, pay attention at setting the faction manually! -const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5,-3049.11,120.126,5.75959}; +const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5f,-3049.11f,120.126f,5.75959f}; // after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id); -const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72,-4355.91,138.785,1.69297,0,0,0.748956,0.66262}; +const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72f,-4355.91f,138.785f,1.69297f,0.0f,0.0f,0.748956f,0.66262f}; class OutdoorPvPEP; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h index 0e18a35ccc7..304cd78052b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h @@ -74,16 +74,16 @@ const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69}; const go_type HPCapturePoints[HP_TOWER_NUM] = { - {182175,530,-471.462,3451.09,34.6432,0.174533,0,0,0.087156,0.996195}, // 0 - Broken Hill - {182174,530,-184.889,3476.93,38.205,-0.017453,0,0,0.008727,-0.999962}, // 1 - Overlook - {182173,530,-290.016,3702.42,56.6729,0.034907,0,0,0.017452,0.999848} // 2 - Stadium + {182175,530,-471.462f,3451.09f,34.6432f,0.174533f,0.0f,0.0f,0.087156f,0.996195f}, // 0 - Broken Hill + {182174,530,-184.889f,3476.93f,38.205f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f}, // 1 - Overlook + {182173,530,-290.016f,3702.42f,56.6729f,0.034907f,0.0f,0.0f,0.017452f,0.999848f} // 2 - Stadium }; const go_type HPTowerFlags[HP_TOWER_NUM] = { - {183514,530,-467.078,3528.17,64.7121,3.14159,0,0,1,0}, // 0 broken hill - {182525,530,-187.887,3459.38,60.0403,-3.12414,0,0,0.999962,-0.008727}, // 1 overlook - {183515,530,-289.610,3696.83,75.9447,3.12414,0,0,0.999962,0.008727} // 2 stadium + {183514,530,-467.078f,3528.17f,64.7121f,3.14159f,0.0f,0.0f,1.0f,0.0f}, // 0 broken hill + {182525,530,-187.887f,3459.38f,60.0403f,-3.12414f,0.0f,0.0f,0.999962f,-0.008727f}, // 1 overlook + {183515,530,-289.610f,3696.83f,75.9447f,3.12414f,0.0f,0.0f,0.999962f,0.008727f} // 2 stadium }; class OPvPCapturePointHP : public OPvPCapturePoint diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 7f49dffe4fd..e0f3584f22f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -208,7 +208,7 @@ OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFactio m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0), m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) { - SetCapturePointData(182210,530,-1572.57,7945.3,-22.475,2.05949,0,0,0.857167,0.515038); + SetCapturePointData(182210,530,-1572.57f,7945.3f,-22.475f,2.05949f,0.0f,0.0f,0.857167f,0.515038f); } bool OutdoorPvPNA::SetupOutdoorPvP() diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 9bfadeef4e0..bc28581dbe1 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -120,39 +120,39 @@ enum FlightSpellsNA // spawned when the alliance is attacking, horde is in control const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = { - {182267,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //ALLY_ROOST_SOUTH - {182280,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //ALLY_ROOST_WEST - {182281,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //ALLY_ROOST_NORTH - {182282,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //ALLY_ROOST_EAST - - {182222,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //HORDE_BOMB_WAGON_SOUTH - {182272,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //HORDE_BOMB_WAGON_WEST - {182273,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //HORDE_BOMB_WAGON_NORTH - {182274,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //HORDE_BOMB_WAGON_EAST - - {182266,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_ALLY_ROOST_SOUTH - {182275,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_ALLY_ROOST_WEST - {182276,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_ALLY_ROOST_NORTH - {182277,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048} //DESTROYED_ALLY_ROOST_EAST + {182267,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_ROOST_SOUTH + {182280,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_ROOST_WEST + {182281,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_ROOST_NORTH + {182282,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_ROOST_EAST + + {182222,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_BOMB_WAGON_SOUTH + {182272,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_BOMB_WAGON_WEST + {182273,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_BOMB_WAGON_NORTH + {182274,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_BOMB_WAGON_EAST + + {182266,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH + {182275,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_ALLY_ROOST_WEST + {182276,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_ALLY_ROOST_NORTH + {182277,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_ALLY_ROOST_EAST }; // spawned when the horde is attacking, alliance is in control const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = { - {182301,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //HORDE_ROOST_SOUTH - {182302,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //HORDE_ROOST_WEST - {182303,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //HORDE_ROOST_NORTH - {182304,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //HORDE_ROOST_EAST - - {182305,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //ALLY_BOMB_WAGON_SOUTH - {182306,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //ALLY_BOMB_WAGON_WEST - {182307,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //ALLY_BOMB_WAGON_NORTH - {182308,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //ALLY_BOMB_WAGON_EAST - - {182297,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_HORDE_ROOST_SOUTH - {182298,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_HORDE_ROOST_WEST - {182299,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_HORDE_ROOST_NORTH - {182300,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048} //DESTROYED_HORDE_ROOST_EAST + {182301,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //HORDE_ROOST_SOUTH + {182302,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //HORDE_ROOST_WEST + {182303,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //HORDE_ROOST_NORTH + {182304,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //HORDE_ROOST_EAST + + {182305,530,-1825.4022f,8039.2602f,-26.08f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //ALLY_BOMB_WAGON_SOUTH + {182306,530,-1515.37f,8136.91f,-20.42f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //ALLY_BOMB_WAGON_WEST + {182307,530,-1377.95f,7773.44f,-10.31f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //ALLY_BOMB_WAGON_NORTH + {182308,530,-1659.87f,7733.15f,-15.75f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f}, //ALLY_BOMB_WAGON_EAST + + {182297,530,-1815.8f,8036.51f,-26.2354f,-2.89725f,0.0f,0.0f,0.992546f,-0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH + {182298,530,-1507.95f,8132.1f,-19.5585f,-1.3439f,0.0f,0.0f,0.622515f,-0.782608f}, //DESTROYED_HORDE_ROOST_WEST + {182299,530,-1384.52f,7779.33f,-11.1663f,-0.575959f,0.0f,0.0f,0.284015f,-0.95882f}, //DESTROYED_HORDE_ROOST_NORTH + {182300,530,-1650.11f,7732.56f,-15.4505f,-2.80998f,0.0f,0.0f,0.986286f,-0.165048f} //DESTROYED_HORDE_ROOST_EAST }; enum ControlNPCTypes @@ -184,50 +184,50 @@ enum ControlNPCTypes const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = { - {18816,67,530,-1523.92,7951.76,-17.6942,3.51172}, - {18821,67,530,-1527.75,7952.46,-17.6948,3.99317}, - {21474,67,530,-1520.14,7927.11,-20.2527,3.39389}, - {21484,67,530,-1524.84,7930.34,-20.182,3.6405}, - {21483,67,530,-1570.01,7993.8,-22.4505,5.02655}, - {18192,67,530,-1654.06,8000.46,-26.59,3.37}, - {18192,67,530,-1487.18,7899.1,-19.53,0.954}, - {18192,67,530,-1480.88,7908.79,-19.19,4.485}, - {18192,67,530,-1540.56,7995.44,-20.45,0.947}, - {18192,67,530,-1546.95,8000.85,-20.72,6.035}, - {18192,67,530,-1595.31,7860.53,-21.51,3.747}, - {18192,67,530,-1642.31,7995.59,-25.8,3.317}, - {18192,67,530,-1545.46,7995.35,-20.63,1.094}, - {18192,67,530,-1487.58,7907.99,-19.27,5.567}, - {18192,67,530,-1651.54,7988.56,-26.5289,2.98451}, - {18192,67,530,-1602.46,7866.43,-22.1177,4.74729}, - {18192,67,530,-1591.22,7875.29,-22.3536,4.34587}, - {18192,67,530,-1550.6,7944.45,-21.63,3.559}, - {18192,67,530,-1545.57,7935.83,-21.13,3.448}, - {18192,67,530,-1550.86,7937.56,-21.7,3.801} + {18816,67,530,-1523.92f,7951.76f,-17.6942f,3.51172f}, + {18821,67,530,-1527.75f,7952.46f,-17.6948f,3.99317f}, + {21474,67,530,-1520.14f,7927.11f,-20.2527f,3.39389f}, + {21484,67,530,-1524.84f,7930.34f,-20.182f,3.6405f}, + {21483,67,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, + {18192,67,530,-1654.06f,8000.46f,-26.59f,3.37f}, + {18192,67,530,-1487.18f,7899.1f,-19.53f,0.954f}, + {18192,67,530,-1480.88f,7908.79f,-19.19f,4.485f}, + {18192,67,530,-1540.56f,7995.44f,-20.45f,0.947f}, + {18192,67,530,-1546.95f,8000.85f,-20.72f,6.035f}, + {18192,67,530,-1595.31f,7860.53f,-21.51f,3.747f}, + {18192,67,530,-1642.31f,7995.59f,-25.8f,3.317f}, + {18192,67,530,-1545.46f,7995.35f,-20.63f,1.094f}, + {18192,67,530,-1487.58f,7907.99f,-19.27f,5.567f}, + {18192,67,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, + {18192,67,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, + {18192,67,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, + {18192,67,530,-1550.6f,7944.45f,-21.63f,3.559f}, + {18192,67,530,-1545.57f,7935.83f,-21.13f,3.448f}, + {18192,67,530,-1550.86f,7937.56f,-21.7f,3.801f} }; const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = { - {18817,469,530,-1591.18,8020.39,-22.2042,4.59022}, - {18822,469,530,-1588.0,8019.0,-22.2042,4.06662}, - {21485,469,530,-1521.93,7927.37,-20.2299,3.24631}, - {21487,469,530,-1540.33,7971.95,-20.7186,3.07178}, - {21488,469,530,-1570.01,7993.8,-22.4505,5.02655}, - {18256,469,530,-1654.06,8000.46,-26.59,3.37}, - {18256,469,530,-1487.18,7899.1,-19.53,0.954}, - {18256,469,530,-1480.88,7908.79,-19.19,4.485}, - {18256,469,530,-1540.56,7995.44,-20.45,0.947}, - {18256,469,530,-1546.95,8000.85,-20.72,6.035}, - {18256,469,530,-1595.31,7860.53,-21.51,3.747}, - {18256,469,530,-1642.31,7995.59,-25.8,3.317}, - {18256,469,530,-1545.46,7995.35,-20.63,1.094}, - {18256,469,530,-1487.58,7907.99,-19.27,5.567}, - {18256,469,530,-1651.54,7988.56,-26.5289,2.98451}, - {18256,469,530,-1602.46,7866.43,-22.1177,4.74729}, - {18256,469,530,-1591.22,7875.29,-22.3536,4.34587}, - {18256,469,530,-1603.75,8000.36,-24.18,4.516}, - {18256,469,530,-1585.73,7994.68,-23.29,4.439}, - {18256,469,530,-1595.5,7991.27,-23.53,4.738} + {18817,469,530,-1591.18f,8020.39f,-22.2042f,4.59022f}, + {18822,469,530,-1588.0f,8019.0f,-22.2042f,4.06662f}, + {21485,469,530,-1521.93f,7927.37f,-20.2299f,3.24631f}, + {21487,469,530,-1540.33f,7971.95f,-20.7186f,3.07178f}, + {21488,469,530,-1570.01f,7993.8f,-22.4505f,5.02655f}, + {18256,469,530,-1654.06f,8000.46f,-26.59f,3.37f}, + {18256,469,530,-1487.18f,7899.1f,-19.53f,0.954f}, + {18256,469,530,-1480.88f,7908.79f,-19.19f,4.485f}, + {18256,469,530,-1540.56f,7995.44f,-20.45f,0.947f}, + {18256,469,530,-1546.95f,8000.85f,-20.72f,6.035f}, + {18256,469,530,-1595.31f,7860.53f,-21.51f,3.747f}, + {18256,469,530,-1642.31f,7995.59f,-25.8f,3.317f}, + {18256,469,530,-1545.46f,7995.35f,-20.63f,1.094f}, + {18256,469,530,-1487.58f,7907.99f,-19.27f,5.567f}, + {18256,469,530,-1651.54f,7988.56f,-26.5289f,2.98451f}, + {18256,469,530,-1602.46f,7866.43f,-22.1177f,4.74729f}, + {18256,469,530,-1591.22f,7875.29f,-22.3536f,4.34587f}, + {18256,469,530,-1603.75f,8000.36f,-24.18f,4.516f}, + {18256,469,530,-1585.73f,7994.68f,-23.29f,4.439f}, + {18256,469,530,-1595.5f,7991.27f,-23.53f,4.738f} }; enum WyvernStates diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h index ffb36e6f827..ffeb3ffb6ce 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h @@ -56,11 +56,11 @@ enum OutdoorPvPTF_TowerType const go_type TFCapturePoints[TF_TOWER_NUM] = { - {183104,530,-3081.65,5335.03,17.1853,-2.14675,0,0,0.878817,-0.477159}, - {183411,530,-2939.9,4788.73,18.987,2.77507,0,0,0.983255,0.182236}, - {183412,530,-3174.94,4440.97,16.2281,1.86750,0,0.803857,0.594823}, - {183413,530,-3603.31,4529.15,20.9077,0.994838,0,0,0.477159,0.878817}, - {183414,530,-3812.37,4899.3,17.7249,0.087266,0,0,0.043619,0.999048} + {183104,530,-3081.65f,5335.03f,17.1853f,-2.14675f,0.0f,0.0f,0.878817f,-0.477159f}, + {183411,530,-2939.9f,4788.73f,18.987f,2.77507f,0.0f,0.0f,0.983255f,0.182236f}, + {183412,530,-3174.94f,4440.97f,16.2281f,1.86750f,0.0f,0.0f,0.803857f,0.594823f}, + {183413,530,-3603.31f,4529.15f,20.9077f,0.994838f,0.0f,0.0f,0.477159f,0.878817f}, + {183414,530,-3812.37f,4899.3f,17.7249f,0.087266f,0.0f,0.0f,0.043619f,0.999048f} }; struct tf_tower_world_state diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index 43fa96a5ac2..447823a0ee3 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -48,15 +48,15 @@ enum OutdoorPvPZMSpells }; // banners 182527, 182528, 182529, gotta check them ingame -const go_type ZM_Banner_A = { 182527,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 }; -const go_type ZM_Banner_H = { 182528,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 }; -const go_type ZM_Banner_N = { 182529,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 }; +const go_type ZM_Banner_A = { 182527,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; +const go_type ZM_Banner_H = { 182528,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; +const go_type ZM_Banner_N = { 182529,530,253.54f,7083.81f,36.7728f,-0.017453f,0.0f,0.0f,0.008727f,-0.999962f }; // horde field scout spawn data -const creature_type ZM_HordeFieldScout = {18564,67,530,296.625,7818.4,42.6294,5.18363}; +const creature_type ZM_HordeFieldScout = {18564,67,530,296.625f,7818.4f,42.6294f,5.18363f}; // alliance field scout spawn data -const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395,6230.08,22.8351,0.593412}; +const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395f,6230.08f,22.8351f,0.593412f}; enum ZMCreatureTypes { @@ -119,8 +119,8 @@ const uint32 ZMBeaconLooseH[ZM_NUM_BEACONS] = const go_type ZMCapturePoints[ZM_NUM_BEACONS] = { - {182523,530,303.243,6841.36,40.1245,-1.58825,0,0,0.71325,-0.700909}, - {182522,530,336.466,7340.26,41.4984,-1.58825,0,0,0.71325,-0.700909} + {182523,530,303.243f,6841.36f,40.1245f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f}, + {182522,530,336.466f,7340.26f,41.4984f,-1.58825f,0.0f,0.0f,0.71325f,-0.700909f} }; enum OutdoorPvPZMWorldStates diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index edb1c6e8e87..f436f5d56bd 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -51,15 +51,15 @@ EndScriptData */ #define MOB_VOID_PORTAL 19224 #define SPELL_VOID_PORTAL_VISUAL 33569 -float VorpilPosition[3] = {-252.8820,-264.3030,17.1}; +float VorpilPosition[3] = {-252.8820f,-264.3030f,17.1f}; float VoidPortalCoords[5][3] = { - {-283.5894, -239.5718, 12.7}, - {-306.5853, -258.4539, 12.7}, - {-295.8789, -269.0899, 12.7}, - {-209.3401, -262.7564, 17.1}, - {-261.4533, -297.3298, 17.1} + {-283.5894f, -239.5718f, 12.7f}, + {-306.5853f, -258.4539f, 12.7f}, + {-295.8789f, -269.0899f, 12.7f}, + {-209.3401f, -262.7564f, 17.1f}, + {-261.4533f, -297.3298f, 17.1f} }; class mob_voidtraveler : public CreatureScript diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index ae095960278..45b29900e7a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -69,7 +69,7 @@ const char* SAY_KILL2 = "This is too easy!"; /************** Spells *************/ // Normal Form -#define SPELL_SHEAR 37335 // 41032 is bugged, cannot be block/dodge/parry// Reduces Max. Health by 60% for 7 seconds. Can stack 19 times. 1.5 second cast +#define SPELL_SHEAR 37335 // 41032 is bugged, cannot be block/dodge/parry// Reduces Max. Health by 60% for 7 seconds. Can stack 19 times. 1.5f second cast #define SPELL_FLAME_CRASH 40832 // Summons an invis/unselect passive mob that has an aura of flame in a circle around him. #define SPELL_DRAW_SOUL 40904 // 5k Shadow Damage in front of him. Heals Illidan for 100k health (script effect) #define SPELL_PARASITIC_SHADOWFIEND 41917 // DoT of 3k Shadow every 2 seconds. Lasts 10 seconds. (Script effect: Summon 2 parasites once the debuff has ticked off) @@ -81,7 +81,7 @@ const char* SAY_KILL2 = "This is too easy!"; #define SPELL_THROW_GLAIVE 39635 // Throws a glaive on the ground #define SPELL_THROW_GLAIVE2 39849 // Animation for the above spell #define SPELL_GLAIVE_RETURNS 39873 // Glaive flies back to Illidan -#define SPELL_FIREBALL 40598 // 2.5k-3.5k damage in 10 yard radius. 2 second cast time. +#define SPELL_FIREBALL 40598 // 2.5fk-3.5fk damage in 10 yard radius. 2 second cast time. #define SPELL_DARK_BARRAGE 40585 // 10 second channeled spell, 3k shadow damage per second. // Demon Form #define SPELL_DEMON_TRANSFORM_1 40511 // First phase of animations for transforming into Dark Illidan (fall to ground) @@ -89,7 +89,7 @@ const char* SAY_KILL2 = "This is too easy!"; #define SPELL_DEMON_TRANSFORM_3 40510 // Final phase of animations (stand up and roar) #define SPELL_DEMON_FORM 40506 // Transforms into Demon Illidan. Has an Aura of Dread on him. #define SPELL_SHADOW_BLAST 41078 // 8k - 11k Shadow Damage. Targets highest threat. Has a splash effect, damaging anyone in 20 yards of the target. -#define SPELL_FLAME_BURST 41126 // Hurls fire at entire raid for ~3.5k damage every 10 seconds. Resistable. (Does not work: Script effect) +#define SPELL_FLAME_BURST 41126 // Hurls fire at entire raid for ~3.5fk damage every 10 seconds. Resistable. (Does not work: Script effect) #define SPELL_FLAME_BURST_EFFECT 41131 // The actual damage. Have each player cast it on itself (workaround) // Other Illidan spells #define SPELL_KNEEL 39656 // Before beginning encounter, this is how he appears (talking to skully). @@ -132,9 +132,9 @@ const char* SAY_KILL2 = "This is too easy!"; #define SPELL_FAN_BLADES 39954 // bugged visual // Other defines -#define CENTER_X 676.740 -#define CENTER_Y 305.297 -#define CENTER_Z 353.192 +#define CENTER_X 676.740f +#define CENTER_Y 305.297f +#define CENTER_Z 353.192f #define FLAME_ENRAGE_DISTANCE 30 #define FLAME_CHARGE_DISTANCE 50 @@ -298,47 +298,47 @@ struct Locations static Locations HoverPosition[]= { - {657, 340, 355}, - {657, 275, 355}, - {705, 275, 355}, - {705, 340, 355} + {657.0f, 340.0f, 355.0f}, + {657.0f, 275.0f, 355.0f}, + {705.0f, 275.0f, 355.0f}, + {705.0f, 340.0f, 355.0f} }; static Locations GlaivePosition[]= { - {695.105, 305.303, 354.256}, - {659.338, 305.303, 354.256},//the distance between two glaives is 36 - {700.105, 305.303, 354.256}, - {664.338, 305.303, 354.256} + {695.105f, 305.303f, 354.256f}, + {659.338f, 305.303f, 354.256f},//the distance between two glaives is 36 + {700.105f, 305.303f, 354.256f}, + {664.338f, 305.303f, 354.256f} }; static Locations EyeBlast[]= { - {677, 350, 354},//start point, pass through glaive point - {677, 260, 354} + {677.0f, 350.0f, 354.0f},//start point, pass through glaive point + {677.0f, 260.0f, 354.0f} }; static Locations AkamaWP[]= { - {770.01, 304.50, 312.29}, // Bottom of the first stairs, at the doors - {780.66, 304.50, 319.74}, // Top of the first stairs - {790.13, 319.68, 319.76}, // Bottom of the second stairs (left from the entrance) - {787.17, 347.38, 341.42}, // Top of the second stairs - {781.34, 350.31, 341.44}, // Bottom of the third stairs - {762.60, 361.06, 353.60}, // Top of the third stairs - {756.35, 360.52, 353.27}, // Before the door-thingy - {743.82, 342.21, 353.00}, // Somewhere further - {732.69, 305.13, 353.00}, // In front of Illidan - (8) - {738.11, 365.44, 353.00}, // in front of the door-thingy (the other one!) - {792.18, 366.62, 341.42}, // Down the first flight of stairs - {796.84, 304.89, 319.76}, // Down the second flight of stairs - {782.01, 304.55, 319.76} // Final location - back at the initial gates. This is where he will fight the minions! (12) + {770.01f, 304.50f, 312.29f}, // Bottom of the first stairs, at the doors + {780.66f, 304.50f, 319.74f}, // Top of the first stairs + {790.13f, 319.68f, 319.76f}, // Bottom of the second stairs (left from the entrance) + {787.17f, 347.38f, 341.42f}, // Top of the second stairs + {781.34f, 350.31f, 341.44f}, // Bottom of the third stairs + {762.60f, 361.06f, 353.60f}, // Top of the third stairs + {756.35f, 360.52f, 353.27f}, // Before the door-thingy + {743.82f, 342.21f, 353.00f}, // Somewhere further + {732.69f, 305.13f, 353.00f}, // In front of Illidan - (8) + {738.11f, 365.44f, 353.00f}, // in front of the door-thingy (the other one!) + {792.18f, 366.62f, 341.42f}, // Down the first flight of stairs + {796.84f, 304.89f, 319.76f}, // Down the second flight of stairs + {782.01f, 304.55f, 319.76f} // Final location - back at the initial gates. This is where he will fight the minions! (12) }; -// 755.762, 304.0747, 312.1769 -- This is where Akama should be spawned +// 755.762f, 304.0747f, 312.1769f -- This is where Akama should be spawned static Locations SpiritSpawns[]= { - {755.5426, 309.9156, 312.2129}, - {755.5426, 298.7923, 312.0834} + {755.5426f, 309.9156f, 312.2129f}, + {755.5426f, 298.7923f, 312.0834f} }; struct Animation // For the demon transformation @@ -1024,7 +1024,7 @@ public: break; case EVENT_SHEAR: - // no longer exists in 3.0.2 + // no longer exists in 3.0f.2 //DoCast(me->getVictim(), SPELL_SHEAR); Timer[EVENT_SHEAR] = 25000 + (rand()%16 * 1000); break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index f5c632c9329..2247026b1fc 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -69,13 +69,13 @@ struct Locations static Locations TeleportPoint[]= { - {959.996, 212.576, 193.843}, - {932.537, 231.813, 193.838}, - {958.675, 254.767, 193.822}, - {946.955, 201.316, 192.535}, - {944.294, 149.676, 197.551}, - {930.548, 284.888, 193.367}, - {965.997, 278.398, 195.777} + {959.996f, 212.576f, 193.843f}, + {932.537f, 231.813f, 193.838f}, + {958.675f, 254.767f, 193.822f}, + {946.955f, 201.316f, 192.535f}, + {944.294f, 149.676f, 197.551f}, + {930.548f, 284.888f, 193.367f}, + {965.997f, 278.398f, 195.777f} }; class boss_mother_shahraz : public CreatureScript diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 5ec21ce3840..70f5bb2300f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -93,12 +93,12 @@ struct Position2d static Position2d Coords[]= { - {450.4, 212.3}, - {542.1, 212.3}, - {542.1, 168.3}, - {542.1, 137.4}, - {450.4, 137.4}, - {450.4, 168.3} + {450.4f, 212.3f}, + {542.1f, 212.3f}, + {542.1f, 168.3f}, + {542.1f, 137.4f}, + {450.4f, 137.4f}, + {450.4f, 168.3f} }; class npc_enslaved_soul : public CreatureScript diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 3e6ee542a4d..71fc2dfc5db 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -42,52 +42,52 @@ struct Location static Location ChannelerLocations[]= { - {463.161285, 401.219757, 3.141592}, - {457.377625, 391.227661, 2.106461}, - {446.012421, 391.227661, 1.071904}, - {439.533783, 401.219757, 0.000000}, - {446.012421, 411.211853, 5.210546}, - {457.377625, 411.211853, 4.177494} + {463.161285f, 401.219757f, 3.141592f}, + {457.377625f, 391.227661f, 2.106461f}, + {446.012421f, 391.227661f, 1.071904f}, + {439.533783f, 401.219757f, 0.000000f}, + {446.012421f, 411.211853f, 5.210546f}, + {457.377625f, 411.211853f, 4.177494f} }; static Location SpawnLocations[]= { - {498.652740, 461.728119, 0}, - {498.505003, 339.619324, 0} + {498.652740f, 461.728119f, 0.0f}, + {498.505003f, 339.619324f, 0.0f} }; static Location AkamaWP[]= { - {482.352448, 401.162720, 0, 112.783928}, - {469.597443, 402.264404, 0, 118.537910} + {482.352448f, 401.162720f, 0.0f, 112.783928f}, + {469.597443f, 402.264404f, 0.0f, 118.537910f} }; static Location BrokenCoords[]= { - {541.375916, 401.439575, M_PI, 112.783997}, // The place where Akama channels - {534.130005, 352.394531, 2.164150, 112.783737}, // Behind a 'pillar' which is behind the east alcove - {499.621185, 341.534729, 1.652856, 112.783730}, // East Alcove - {499.151093, 461.036438, 4.770888, 112.78370}, // West Alcove + {541.375916f, 401.439575f, M_PI, 112.783997f}, // The place where Akama channels + {534.130005f, 352.394531f, 2.164150f, 112.783737f}, // Behind a 'pillar' which is behind the east alcove + {499.621185f, 341.534729f, 1.652856f, 112.783730f}, // East Alcove + {499.151093f, 461.036438f, 4.770888f, 112.78370f}, // West Alcove }; static Location BrokenWP[]= { - {492.491638, 400.744690, 3.122336, 112.783737}, - {494.335724, 382.221771, 2.676230, 112.783737}, - {489.555939, 373.507202, 2.416263, 112.783737}, - {491.136353, 427.868774, 3.519748, 112.783737}, + {492.491638f, 400.744690f, 3.122336f, 112.783737f}, + {494.335724f, 382.221771f, 2.676230f, 112.783737f}, + {489.555939f, 373.507202f, 2.416263f, 112.783737f}, + {491.136353f, 427.868774f, 3.519748f, 112.783737f}, }; // Locations -#define Z1 118.543144 -#define Z2 120.783768 -#define Z_SPAWN 113.537949 -#define AGGRO_X 482.793182 -#define AGGRO_Y 401.270172 -#define AGGRO_Z 112.783928 -#define AKAMA_X 514.583984 -#define AKAMA_Y 400.601013 -#define AKAMA_Z 112.783997 +#define Z1 118.543144f +#define Z2 120.783768f +#define Z_SPAWN 113.537949f +#define AGGRO_X 482.793182f +#define AGGRO_Y 401.270172f +#define AGGRO_Z 112.783928f +#define AKAMA_X 514.583984f +#define AKAMA_Y 400.601013f +#define AKAMA_Z 112.783997f // Spells #define SPELL_VERTEX_SHADE_BLACK 39833 diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 00b0bf1080a..f90c59a1278 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -64,17 +64,17 @@ EndScriptData */ #define ENTRY_TAINTED_SPAWN 22036 #define ENTRY_BEAM_DUMMY 21934 -#define HYDROSS_X -239.439 -#define HYDROSS_Y -363.481 - -#define SPAWN_X_DIFF1 6.934003 -#define SPAWN_Y_DIFF1 -11.255012 -#define SPAWN_X_DIFF2 -6.934003 -#define SPAWN_Y_DIFF2 11.255012 -#define SPAWN_X_DIFF3 -12.577011 -#define SPAWN_Y_DIFF3 -4.72702 -#define SPAWN_X_DIFF4 12.577011 -#define SPAWN_Y_DIFF4 4.72702 +#define HYDROSS_X -239.439f +#define HYDROSS_Y -363.481f + +#define SPAWN_X_DIFF1 6.934003f +#define SPAWN_Y_DIFF1 -11.255012f +#define SPAWN_X_DIFF2 -6.934003f +#define SPAWN_Y_DIFF2 11.255012f +#define SPAWN_X_DIFF3 -12.577011f +#define SPAWN_Y_DIFF3 -4.72702f +#define SPAWN_X_DIFF4 12.577011f +#define SPAWN_Y_DIFF4 4.72702f class boss_hydross_the_unstable : public CreatureScript { @@ -137,7 +137,7 @@ public: void SummonBeams() { - Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0); + Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0); if (beamer) { beamer->CastSpell(me,SPELL_BLUE_BEAM,true); @@ -145,7 +145,7 @@ public: beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); beams[0]=beamer->GetGUID(); } - beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0); + beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0); if (beamer) { beamer->CastSpell(me,SPELL_BLUE_BEAM,true); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index e81196d79c1..f31a36c8240 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -54,14 +54,14 @@ EndScriptData */ #define SPELL_TOXIC_SPORES 38575 #define SPELL_MAGIC_BARRIER 38112 -#define MIDDLE_X 30.134 -#define MIDDLE_Y -923.65 -#define MIDDLE_Z 42.9 +#define MIDDLE_X 30.134f +#define MIDDLE_Y -923.65f +#define MIDDLE_Z 42.9f -#define SPOREBAT_X 30.977156 -#define SPOREBAT_Y -925.297761 -#define SPOREBAT_Z 77.176567 -#define SPOREBAT_O 5.223932 +#define SPOREBAT_X 30.977156f +#define SPOREBAT_Y -925.297761f +#define SPOREBAT_Z 77.176567f +#define SPOREBAT_O 5.223932f #define SHIED_GENERATOR_CHANNEL 19870 #define ENCHANTED_ELEMENTAL 21958 @@ -76,60 +76,60 @@ EndScriptData */ float ElementPos[8][4] = { - {8.3, -835.3, 21.9, 5}, - {53.4, -835.3, 21.9, 4.5}, - {96, -861.9, 21.8, 4}, - {96, -986.4, 21.4, 2.5}, - {54.4, -1010.6, 22, 1.8}, - {9.8, -1012, 21.7, 1.4}, - {-35, -987.6, 21.5, 0.8}, - {-58.9, -901.6, 21.5, 6} + {8.3f, -835.3f, 21.9f, 5.0f}, + {53.4f, -835.3f, 21.9f, 4.5f}, + {96.0f, -861.9f, 21.8f, 4.0f}, + {96.0f, -986.4f, 21.4f, 2.5f}, + {54.4f, -1010.6f, 22, 1.8f}, + {9.8f, -1012, 21.7f, 1.4f}, + {-35.0f, -987.6f, 21.5f, 0.8f}, + {-58.9f, -901.6f, 21.5f, 6.0f} }; float ElementWPPos[8][3] = { - {71.700752, -883.905884, 41.097168}, - {45.039848, -868.022827, 41.097015}, - {14.585141, -867.894470, 41.097061}, - {-25.415508, -906.737732, 41.097061}, - {-11.801594, -963.405884, 41.097067}, - {14.556657, -979.051514, 41.097137}, - {43.466549, -979.406677, 41.097027}, - {69.945908, -964.663940, 41.097054} + {71.700752f, -883.905884f, 41.097168f}, + {45.039848f, -868.022827f, 41.097015f}, + {14.585141f, -867.894470f, 41.097061f}, + {-25.415508f, -906.737732f, 41.097061f}, + {-11.801594f, -963.405884f, 41.097067f}, + {14.556657f, -979.051514f, 41.097137f}, + {43.466549f, -979.406677f, 41.097027f}, + {69.945908f, -964.663940f, 41.097054f} }; float SporebatWPPos[8][3] = { - {31.6,-896.3,59.1}, - {9.1, -913.9, 56}, - {5.2, -934.4, 52.4}, - {20.7, -946.9, 49.7}, - {41, -941.9, 51}, - {47.7, -927.3, 55}, - {42.2, -912.4, 51.7}, - {27, -905.9, 50} + {31.6f, -896.3f, 59.1f}, + {9.1f, -913.9f, 56.0f}, + {5.2f, -934.4f, 52.4f}, + {20.7f, -946.9f, 49.7f}, + {41.0f, -941.9f, 51.0f}, + {47.7f, -927.3f, 55.0f}, + {42.2f, -912.4f, 51.7f}, + {27.0f, -905.9f, 50.0f} }; float CoilfangElitePos[3][4] = { - {28.84, -923.28, 42.9, 6}, - {31.183281, -953.502625, 41.523602, 1.640957}, - {58.895180, -923.124268, 41.545307, 3.152848} + {28.84f, -923.28f, 42.9f, 6.0f}, + {31.183281f, -953.502625f, 41.523602f, 1.640957f}, + {58.895180f, -923.124268f, 41.545307f, 3.152848f} }; float CoilfangStriderPos[3][4] = { - {66.427010, -948.778503, 41.262245, 2.584220}, - {7.513962, -959.538208, 41.300422, 1.034629}, - {-12.843201, -907.798401, 41.239620, 6.087094} + {66.427010f, -948.778503f, 41.262245f, 2.584220f}, + {7.513962f, -959.538208f, 41.300422f, 1.034629f}, + {-12.843201f, -907.798401f, 41.239620f, 6.087094f} }; float ShieldGeneratorChannelPos[4][4] = { - {49.6262, -902.181, 43.0975, 3.95683}, - {10.988, -901.616, 42.5371, 5.4373}, - {10.3859, -944.036, 42.5446, 0.779888}, - {49.3126, -943.398, 42.5501, 2.40174} + {49.6262f, -902.181f, 43.0975f, 3.95683f}, + {10.988f, -901.616f, 42.5371f, 5.4373f}, + {10.3859f, -944.036f, 42.5446f, 0.779888f}, + {49.3126f, -943.398f, 42.5501f, 2.40174f} }; //Lady Vashj AI @@ -603,8 +603,8 @@ public: void Reset() { - me->SetSpeed(MOVE_WALK,0.6);//walk - me->SetSpeed(MOVE_RUN,0.6);//run + me->SetSpeed(MOVE_WALK,0.6f);//walk + me->SetSpeed(MOVE_RUN,0.6f);//run move = 0; phase = 1; @@ -649,7 +649,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); if (phase == 1) me->GetMotionMaster()->MovePoint(0, x, y, z); - if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1)) + if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f)) phase = 2; if (phase == 2) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index ccec4d0badb..d80ce007fd5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -55,15 +55,15 @@ EndScriptData */ float AddPos[9][3] = { - {2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z - {12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z - {51.366653, -460.836060, -19.182686}, //MOVE_AMBUSHER_3 X, Y, Z - {62.597980, -457.433044, -19.182686}, //MOVE_AMBUSHER_4 X, Y, Z - {77.607452, -384.302765, -19.182686}, //MOVE_AMBUSHER_5 X, Y, Z - {63.897900, -378.984924, -19.182686}, //MOVE_AMBUSHER_6 X, Y, Z - {34.447250, -387.333618, -19.182686}, //MOVE_GUARDIAN_1 X, Y, Z - {14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z - {42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z + {2.8553810f, -459.823914f, -19.182686f}, //MOVE_AMBUSHER_1 X, Y, Z + {12.400000f, -466.042267f, -19.182686f}, //MOVE_AMBUSHER_2 X, Y, Z + {51.366653f, -460.836060f, -19.182686f}, //MOVE_AMBUSHER_3 X, Y, Z + {62.597980f, -457.433044f, -19.182686f}, //MOVE_AMBUSHER_4 X, Y, Z + {77.607452f, -384.302765f, -19.182686f}, //MOVE_AMBUSHER_5 X, Y, Z + {63.897900f, -378.984924f, -19.182686f}, //MOVE_AMBUSHER_6 X, Y, Z + {34.447250f, -387.333618f, -19.182686f}, //MOVE_GUARDIAN_1 X, Y, Z + {14.388216f, -423.468018f, -19.625271f}, //MOVE_GUARDIAN_2 X, Y, Z + {42.471519f, -445.115295f, -19.769423f} //MOVE_GUARDIAN_3 X, Y, Z }; class boss_the_lurker_below : public CreatureScript diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 73e2347fd70..9a9221cc244 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -60,11 +60,11 @@ enum eKelidan const float ShadowmoonChannelers[5][4]= { - {302,-87,-24.4,0.157}, - {321,-63.5,-24.6,4.887}, - {346,-74.5,-24.6,3.595}, - {344,-103.5,-24.5,2.356}, - {316,-109,-24.6,1.257} + {302.0f,-87.0f,-24.4f,0.157f}, + {321.0f,-63.5f,-24.6f,4.887f}, + {346.0f,-74.5f,-24.6f,3.595f}, + {344.0f,-103.5f,-24.5f,2.356f}, + {316.0f,-109.0f,-24.6f,1.257f} }; class boss_kelidan_the_breaker : public CreatureScript diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index bbf92447624..eb17117abee 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -64,7 +64,7 @@ enum eSays EMOTE = -1543025, }; -const float VazrudenMiddle[3] = {-1406.5, 1746.5, 81.2}; +const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f}; const float VazrudenRing[2][3] = { {-1430, 1705, 112}, @@ -371,7 +371,7 @@ class boss_vazruden_the_herald : public CreatureScript { CAST_AI(boss_nazan::boss_nazanAI, pSummoned->AI())->VazrudenGUID = VazrudenGUID; pSummoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - pSummoned->SetSpeed(MOVE_FLIGHT, 2.5); + pSummoned->SetSpeed(MOVE_FLIGHT, 2.5f); if (pVictim) AttackStartNoMove(pVictim); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 40567bbcc6f..2630dd6d16f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -55,9 +55,9 @@ enum eCreatures #define TARGET_NUM 5 -float AssassEntrance[3] = {275.136,-84.29,2.3}; // y -8 -float AssassExit[3] = {184.233,-84.29,2.3}; // y -8 -float AddsEntrance[3] = {306.036,-84.29,1.93}; +float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8 +float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8 +float AddsEntrance[3] = {306.036f,-84.29f,1.93f}; class boss_warchief_kargath_bladefist : public CreatureScript { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 7b6fa319cec..05a1b86f79c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -47,12 +47,12 @@ enum eSpells static float waypoint[6][3] = { - {340.15, 58.65, 17.71}, - {388.09, 31.54, 20.18}, - {388.18, -32.85, 20.18}, - {340.29, -60.19, 17.72}, - {332, 0.01, 39}, // better not use the same xy coord - {331, 0.01, -2.39} + {340.15f, 58.65f, 17.71f}, + {388.09f, 31.54f, 20.18f}, + {388.18f, -32.85f, 20.18f}, + {340.29f, -60.19f, 17.72f}, + {332.0f, 0.01f, 39.0f}, // better not use the same xy coord + {331.0f, 0.01f, -2.39f} }; enum WaitEventType @@ -502,7 +502,7 @@ class mob_ember_of_alar : public CreatureScript { if (Unit* Alar = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALAR))) { - int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03; + int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03f; if (AlarHealth > 0) Alar->SetHealth(AlarHealth); else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 0a7b58b3ec4..e9944578318 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -69,7 +69,7 @@ const float LARGE_PORTAL_RADIUS = 26.0f; const float PORTAL_Z = 17.005f; // x, y, z, o -static float SolarianPos[4] = {432.909, -373.424, 17.9608, 1.06421}; +static float SolarianPos[4] = {432.909f, -373.424f, 17.9608f, 1.06421f}; class boss_high_astromancer_solarian : public CreatureScript { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index cb63286167b..3799f1e1621 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -426,15 +426,15 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0,1)) { case 0: - me->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: - me->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; } break; case 3: - me->SummonCreature(ENTRY_MILLHOUSE,413.292,-148.378,42.56,6.27,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 4: DoScriptText(YELL_RELEASE2B, me); @@ -443,10 +443,10 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0,1)) { case 0: - me->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: - me->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; } break; @@ -454,15 +454,15 @@ class npc_warden_mellichar : public CreatureScript switch (urand(0,1)) { case 0: - me->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; case 1: - me->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break; } break; case 7: - me->SummonCreature(ENTRY_SKYRISS,445.763,-191.639,44.64,1.60,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); + me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); DoScriptText(YELL_WELCOME, me); break; } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index ee07fed2ffd..8565860a154 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -52,12 +52,12 @@ enum eOthers float treant_pos[6][3] = { - {24.301233, 427.221100, -27.060635}, - {16.795492, 359.678802, -27.355425}, - {53.493484, 345.381470, -26.196192}, - {61.867096, 439.362732, -25.921030}, - {109.861877, 423.201630, -27.356019}, - {106.780159, 355.582581, -27.593357} + {24.301233f, 427.221100f, -27.060635f}, + {16.795492f, 359.678802f, -27.355425f}, + {53.493484f, 345.381470f, -26.196192f}, + {61.867096f, 439.362732f, -25.921030f}, + {109.861877f, 423.201630f, -27.356019f}, + {106.780159f, 355.582581f, -27.593357f} }; /*##### diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp index 0f282c6d239..bdd5c1c56ba 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/hellfire_peninsula.cpp @@ -214,7 +214,7 @@ public: bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo) { - pGo->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000); + pGo->SummonCreature(C_AERANAS,-1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; } diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp index 72fd565dd55..6f511d2e787 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/nagrand.cpp @@ -73,9 +73,9 @@ public: float y = me->GetPositionY(); float z = me->GetPositionZ(); - Hitter->SummonCreature(18181,x+(0.7 * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + Hitter->SummonCreature(18181,x+(0.7f * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); - Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5 *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); + Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5f *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000); me->setDeathState(CORPSE); Spawn = true; } @@ -599,8 +599,8 @@ enum eMagharCaptive NPC_MURK_PUTRIFIER = 18202 }; -static float m_afAmbushA[]= {-1568.805786, 8533.873047, 1.958}; -static float m_afAmbushB[]= {-1491.554321, 8506.483398, 1.248}; +static float m_afAmbushA[]= {-1568.805786f, 8533.873047f, 1.958f}; +static float m_afAmbushB[]= {-1491.554321f, 8506.483398f, 1.248f}; class npc_maghar_captive : public CreatureScript { diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp index b3dc48c40fa..424a93085dc 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/netherstorm.cpp @@ -149,48 +149,48 @@ public: case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68,4162.55,164.00,1.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2927.36,4212.97,164.00); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68f,4162.55f,164.00f,1.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2927.36f,4212.97f,164.00f); } else { - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36,4212.97,164.00,4.94,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2933.68,4162.55,164.00); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36f,4212.97f,164.00f,4.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2933.68f,4162.55f,164.00f); } Wave_Timer = 30000; break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21,2765.26,134.49,3.93,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2424.21,2740.15,133.81); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86,2731.85,134.53,1.31,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2435.37,2766.04,133.81); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21f,2765.26f,134.49f,3.93f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2424.21f,2740.15f,133.81f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86f,2731.85f,134.53f,1.31f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2435.37f,2766.04f,133.81f); Wave_Timer = 20000; break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80,2205.36,165.37,3.74,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2985.15,2197.32,164.79); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91,2191.20,165.32,0.22,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2060.01,2185.27,164.67); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80f,2205.36f,165.37f,3.74f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2985.15f,2197.32f,164.79f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91f,2191.20f,165.32f,0.22f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2060.01f,2185.27f,164.67f); Wave_Timer = 15000; break; case ENTRY_ARA_C_CONSOLE: if (rand()%2) { - add = me->SummonCreature(ENTRY_ARA_TECH,4035.11,4038.97,194.27,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49); - add = me->SummonCreature(ENTRY_ARA_TECH,4033.66,4036.79,194.28,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49); - add = me->SummonCreature(ENTRY_ARA_TECH,4037.13,4037.30,194.23,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49); + add = me->SummonCreature(ENTRY_ARA_TECH,4035.11f,4038.97f,194.27f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH,4033.66f,4036.79f,194.28f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); + add = me->SummonCreature(ENTRY_ARA_TECH,4037.13f,4037.30f,194.23f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f); } else { - add = me->SummonCreature(ENTRY_ARA_TECH,3099.59,4049.30,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59); - add = me->SummonCreature(ENTRY_ARA_TECH,3999.72,4046.75,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59); - add = me->SummonCreature(ENTRY_ARA_TECH,3996.81,4048.26,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59); + add = me->SummonCreature(ENTRY_ARA_TECH,3099.59f,4049.30f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH,3999.72f,4046.75f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); + add = me->SummonCreature(ENTRY_ARA_TECH,3996.81f,4048.26f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f); } Wave_Timer = 15000; break; @@ -201,30 +201,30 @@ public: switch(pCreature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52,4201.42,163.47,3.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2927.49,4192.81,163.00); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52f,4201.42f,163.47f,3.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2927.49f,4192.81f,163.00f); break; case ENTRY_CORUU_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88,2737.85,133.27,2.59,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62,2735.32,134.49,1.97,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73,2754.50,134.49,3.29,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88f,2737.85f,133.27f,2.59f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62f,2735.32f,134.49f,1.97f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73f,2754.50f,134.49f,3.29f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f); break; case ENTRY_DURO_C_CONSOLE: - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18,2202.85,165.32,5.45,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48); - add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30,2211.50,165.32,4.55,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48); - add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02,2217.45,164.16,4.96,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18f,2202.85f,165.32f,5.45f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30f,2211.50f,165.32f,4.55f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); + add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02f,2217.45f,164.16f,4.96f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f); break; case ENTRY_ARA_C_CONSOLE: - add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51,4020.46,192.18,0.91,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4008.35,4035.04,192.70); - add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56,4059.35,193.59,4.44,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); - if (add) add->GetMotionMaster()->MovePoint(0,4016.62,4039.89,193.46); + add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51f,4020.46f,192.18f,0.91f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4008.35f,4035.04f,192.70f); + add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56f,4059.35f,193.59f,4.44f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); + if (add) add->GetMotionMaster()->MovePoint(0,4016.62f,4039.89f,193.46f); break; } } @@ -318,22 +318,22 @@ public: case 3726: //b'naar if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && pPlayer->HasItemCount(29366,1)) - manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95f,4189.98f,161.88f,0.34f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); break; case 3730: //coruu if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && pPlayer->HasItemCount(29396,1)) - manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77f,2750.38f,133.24f,2.14f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); break; case 3734: //duro if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && pPlayer->HasItemCount(29397,1)) - manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48f,2183.29f,163.20f,1.85f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); break; case 3722: //ara if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && pPlayer->HasItemCount(29411,1)) - manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); + manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71f,4028.76f,192.10f,1.25f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); break; } @@ -546,7 +546,7 @@ public: //Phase 4 Pathaleon spawns up to phase 9 case 4: //spawn pathaleon's image - me->SummonCreature(CreatureEntry[2], 2325.851563, 2799.534668, 133.084229, 6.038996, TEMPSUMMON_TIMED_DESPAWN, 90000); + me->SummonCreature(CreatureEntry[2], 2325.851563f, 2799.534668f, 133.084229f, 6.038996f, TEMPSUMMON_TIMED_DESPAWN, 90000); ++Phase; Phase_Timer = 500; break; @@ -897,14 +897,14 @@ public: switch(i) { case 3: //first spawn - me->SummonCreature(SPAWN_FIRST, 2449.67, 2183.11, 96.85, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, 2449.53, 2184.43, 96.36, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, 2449.85, 2186.34, 97.57, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, 2449.67f, 2183.11f, 96.85f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, 2449.53f, 2184.43f, 96.36f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, 2449.85f, 2186.34f, 97.57f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 7: - me->SummonCreature(SPAWN_SECOND, 2309.64, 2186.24, 92.25, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_SECOND, 2309.25, 2183.46, 91.75, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND, 2309.64f, 2186.24f, 92.25f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND, 2309.25f, 2183.46f, 91.75f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 12: diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp index 74198da7d7a..65cc54aafad 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/shadowmoon_valley.cpp @@ -793,7 +793,7 @@ public: { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83, 602.584, 85.2393, 4.92598, TEMPSUMMON_CORPSE_DESPAWN, 0); + Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83f, 602.584f, 85.2393f, 4.92598f, TEMPSUMMON_CORPSE_DESPAWN, 0); if (Illidan) { IllidanGUID = Illidan->GetGUID(); @@ -825,7 +825,7 @@ public: switch(Step) { case 0: return 0; break; - case 1: me->GetMotionMaster()->MovePoint(0, -5104.41, 595.297, 85.6838); return 9000; break; + case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break; case 2: DoScriptText(OVERLORD_YELL_1, me, plr); return 4500; break; case 3: me->SetInFront(plr); return 3200; break; case 4: DoScriptText(OVERLORD_SAY_2, me, plr); return 2000; break; @@ -909,7 +909,7 @@ public: Yarzill->CastSpell(plr, 41540, true); return 1000;} break; - case 32: me->GetMotionMaster()->MovePoint(0, -5085.77, 577.231, 86.6719); return 5000; break; + case 32: me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000; break; case 33: Reset(); return 100; break; default : return 0; @@ -1160,22 +1160,22 @@ struct Location static Location SpawnLocation[]= { //Cords used for: - {-4615.8556, 1342.2532, 139.9, 1.612},//Illidari Soldier - {-4598.9365, 1377.3182, 139.9, 3.917},//Illidari Soldier - {-4598.4697, 1360.8999, 139.9, 2.427},//Illidari Soldier - {-4589.3599, 1369.1061, 139.9, 3.165},//Illidari Soldier - {-4608.3477, 1386.0076, 139.9, 4.108},//Illidari Soldier - {-4633.1889, 1359.8033, 139.9, 0.949},//Illidari Soldier - {-4623.5791, 1351.4574, 139.9, 0.971},//Illidari Soldier - {-4607.2988, 1351.6099, 139.9, 2.416},//Illidari Soldier - {-4633.7764, 1376.0417, 139.9, 5.608},//Illidari Soldier - {-4600.2461, 1369.1240, 139.9, 3.056},//Illidari Mind Breaker - {-4631.7808, 1367.9459, 139.9, 0.020},//Illidari Mind Breaker - {-4600.2461, 1369.1240, 139.9, 3.056},//Illidari Highlord - {-4631.7808, 1367.9459, 139.9, 0.020},//Illidari Highlord - {-4615.5586, 1353.0031, 139.9, 1.540},//Illidari Highlord - {-4616.4736, 1384.2170, 139.9, 4.971},//Illidari Highlord - {-4627.1240, 1378.8752, 139.9, 2.544} //Torloth The Magnificent + {-4615.8556f, 1342.2532f, 139.9f, 1.612f},//Illidari Soldier + {-4598.9365f, 1377.3182f, 139.9f, 3.917f},//Illidari Soldier + {-4598.4697f, 1360.8999f, 139.9f, 2.427f},//Illidari Soldier + {-4589.3599f, 1369.1061f, 139.9f, 3.165f},//Illidari Soldier + {-4608.3477f, 1386.0076f, 139.9f, 4.108f},//Illidari Soldier + {-4633.1889f, 1359.8033f, 139.9f, 0.949f},//Illidari Soldier + {-4623.5791f, 1351.4574f, 139.9f, 0.971f},//Illidari Soldier + {-4607.2988f, 1351.6099f, 139.9f, 2.416f},//Illidari Soldier + {-4633.7764f, 1376.0417f, 139.9f, 5.608f},//Illidari Soldier + {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Mind Breaker + {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Mind Breaker + {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Highlord + {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Highlord + {-4615.5586f, 1353.0031f, 139.9f, 1.540f},//Illidari Highlord + {-4616.4736f, 1384.2170f, 139.9f, 4.971f},//Illidari Highlord + {-4627.1240f, 1378.8752f, 139.9f, 2.544f} //Torloth The Magnificent }; struct WaveData diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp index 006e39dfbbb..7ac677bfce4 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/terokkar_forest.cpp @@ -229,7 +229,7 @@ public: { if (CAST_PLR(who)->GetQuestStatus(10898) == QUEST_STATUS_INCOMPLETE) { - float Radius = 10.0; + float Radius = 10.0f; if (me->IsWithinDistInMap(who, Radius)) { Start(false, false, who->GetGUID()); @@ -679,8 +679,8 @@ public: switch(i) { case 3: - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99,5420.33,-34.53,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55,5412.79,-34.53,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99f,5420.33f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55f,5412.79f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 11: if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 14628cd67c2..f2c86b461eb 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -267,7 +267,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { if (!player->FindNearestCreature(NPC_LARKORWI_MATE,15)) - player->SummonCreature(NPC_LARKORWI_MATE, player->GetPositionX()+5, player->GetPositionY(), player->GetPositionZ(), 3.3, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 100000); + player->SummonCreature(NPC_LARKORWI_MATE, player->GetPositionX()+5, player->GetPositionY(), player->GetPositionZ(), 3.3f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 100000); } return false; @@ -303,13 +303,13 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript { case 5332: case 5338: - pPosition = WorldLocation(571,3733.68,3563.25,290.812,3.665192); + pPosition = WorldLocation(571,3733.68f,3563.25f,290.812f,3.665192f); break; case 5334: - pPosition = WorldLocation(571,3802.38,3585.95,49.5765,0); + pPosition = WorldLocation(571,3802.38f,3585.95f,49.5765f,0.0f); break; case 5340: - pPosition = WorldLocation(571,3687.91,3577.28,473.342,0); + pPosition = WorldLocation(571,3687.91f,3577.28f,473.342f,0.0f); break; default: return false; diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 7a4b97be9f3..a13a682ea86 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -193,7 +193,7 @@ public: { if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE) { - if (Creature* Stillblade = pPlayer->SummonCreature(NPC_STILLBLADE, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000)) + if (Creature* Stillblade = pPlayer->SummonCreature(NPC_STILLBLADE, 8106.11f, -7542.06f, 151.775f, 3.02598f, TEMPSUMMON_DEAD_DESPAWN, 60000)) Stillblade->AI()->AttackStart(pPlayer); } } @@ -402,7 +402,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject *pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) - pPlayer->SummonCreature(NPC_ARIKARA, -5008.338, -2118.894, 83.657, 0.874, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + pPlayer->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); return true; } @@ -783,7 +783,7 @@ public: { if (pPlayer->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { - pGO->SummonCreature(25318, 3485.089844, 6115.7422188, 70.966812, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + pGO->SummonCreature(25318, 3485.089844f, 6115.7422188f, 70.966812f, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); pPlayer->CastSpell(pPlayer, SPELL_ARCANE_PRISONER_KILL_CREDIT, true); return true; } else @@ -805,7 +805,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject *pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) - pPlayer->SummonCreature(NPC_ZELEMAR, -369.746, 166.759, -21.50, 5.235, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + pPlayer->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); return true; } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 9e27393f893..be38b41ccf4 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -500,34 +500,34 @@ struct Location static Location AllianceCoords[]= { - {-3757.38, -4533.05, 14.16, 3.62}, // Top-far-right bunk as seen from entrance - {-3754.36, -4539.13, 14.16, 5.13}, // Top-far-left bunk - {-3749.54, -4540.25, 14.28, 3.34}, // Far-right bunk - {-3742.10, -4536.85, 14.28, 3.64}, // Right bunk near entrance - {-3755.89, -4529.07, 14.05, 0.57}, // Far-left bunk - {-3749.51, -4527.08, 14.07, 5.26}, // Mid-left bunk - {-3746.37, -4525.35, 14.16, 5.22}, // Left bunk near entrance + {-3757.38f, -4533.05f, 14.16f, 3.62f}, // Top-far-right bunk as seen from entrance + {-3754.36f, -4539.13f, 14.16f, 5.13f}, // Top-far-left bunk + {-3749.54f, -4540.25f, 14.28f, 3.34f}, // Far-right bunk + {-3742.10f, -4536.85f, 14.28f, 3.64f}, // Right bunk near entrance + {-3755.89f, -4529.07f, 14.05f, 0.57f}, // Far-left bunk + {-3749.51f, -4527.08f, 14.07f, 5.26f}, // Mid-left bunk + {-3746.37f, -4525.35f, 14.16f, 5.22f}, // Left bunk near entrance }; //alliance run to where -#define A_RUNTOX -3742.96 -#define A_RUNTOY -4531.52 -#define A_RUNTOZ 11.91 +#define A_RUNTOX -3742.96f +#define A_RUNTOY -4531.52f +#define A_RUNTOZ 11.91f static Location HordeCoords[]= { - {-1013.75, -3492.59, 62.62, 4.34}, // Left, Behind - {-1017.72, -3490.92, 62.62, 4.34}, // Right, Behind - {-1015.77, -3497.15, 62.82, 4.34}, // Left, Mid - {-1019.51, -3495.49, 62.82, 4.34}, // Right, Mid - {-1017.25, -3500.85, 62.98, 4.34}, // Left, front - {-1020.95, -3499.21, 62.98, 4.34} // Right, Front + {-1013.75f, -3492.59f, 62.62f, 4.34f}, // Left, Behind + {-1017.72f, -3490.92f, 62.62f, 4.34f}, // Right, Behind + {-1015.77f, -3497.15f, 62.82f, 4.34f}, // Left, Mid + {-1019.51f, -3495.49f, 62.82f, 4.34f}, // Right, Mid + {-1017.25f, -3500.85f, 62.98f, 4.34f}, // Left, front + {-1020.95f, -3499.21f, 62.98f, 4.34f} // Right, Front }; //horde run to where -#define H_RUNTOX -1016.44 -#define H_RUNTOY -3508.48 -#define H_RUNTOZ 62.96 +#define H_RUNTOX -1016.44f +#define H_RUNTOY -3508.48f +#define H_RUNTOZ 62.96f const uint32 AllianceSoldierId[3] = { @@ -924,7 +924,7 @@ public: me->SetStandState(UNIT_STAND_STATE_KNEEL); //expect database to have RegenHealth=0 - me->SetHealth(int(me->GetMaxHealth()*0.7)); + me->SetHealth(int(me->GetMaxHealth()*0.7f)); } void EnterCombat(Unit * /*who*/) {} @@ -1904,7 +1904,7 @@ public: { npc_ebon_gargoyleAI(Creature *c) : CasterAI(c) {} - int despawnTimer; + uint32 despawnTimer; void InitializeAI() { @@ -2177,9 +2177,9 @@ public: case GOSSIP_ACTION_INFO_DEF + 1: //Borean Tundra pPlayer->CLOSE_GOSSIP_MENU(); if (roll) //At the moment we don't have chance on spell_target_position table so we hack this - pPlayer->TeleportTo(571, 4305.505859, 5450.839844, 63.005806, 0.627286); + pPlayer->TeleportTo(571, 4305.505859f, 5450.839844f, 63.005806f, 0.627286f); else - pPlayer->TeleportTo(571, 3201.936279, 5630.123535, 133.658798, 3.855272); + pPlayer->TeleportTo(571, 3201.936279f, 5630.123535f, 133.658798f, 3.855272f); break; case GOSSIP_ACTION_INFO_DEF + 2: //Howling Fjord pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index f1bfb05ba61..2c72d8b05a0 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -194,7 +194,7 @@ LocaleConstant GetLocaleByName(const std::string& name); #endif #ifndef M_PI -#define M_PI 3.14159265358979323846 +#define M_PI 3.14159265358979323846f #endif #endif |