araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 13:39:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core:

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

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-22 23:46:40 +06:00
parent d38135d1fd
commit 399e35f8f5
189 changed files with 2842 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+4 -4
View File
@@ -955,11 +955,11 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
{-910.14f,-229.959f,72.9279f,0.27677f},
{-851.563f,-88.6527f,68.5983f,3.61896f},
//boss
{-848.902f,-92.931f,68.6325f,3.33350},
{-848.902f,-92.931f,68.6325f,3.33350f},
//herald
{-48.459f,-288.802f,55.47f,1.0},
{-48.459f,-288.802f,55.47f,1.0f},
//triggers
{637.083,-32.6603,45.9715,1.14353}, //firstaid_station
{637.083f,-32.6603f,45.9715f,1.14353f}, //firstaid_station
{669.007f,-294.078f,30.2909f,2.77507f}, //stormpike_grave
{77.8013f,-404.7f,46.7549f,-0.872665f}, //stoneheart_grave
{-202.581f,-112.73f,78.4876f,-0.715585f}, //snowfall_grave
@@ -968,7 +968,7 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
{-1402.21f,-307.431f,89.4424f,0.191986f}, //frostwolf_hut
{553.779f,-78.6566f,51.9378f,-1.22173f}, //dunbaldar_south
{674.001f,-143.125f,63.6615f,0.994838f}, //dunbaldar_north
{203.281f,-360.366f,56.3869f,-0.925024}, //icewing_bunker
{203.281f,-360.366f,56.3869f,-0.925024f}, //icewing_bunker
{-152.437f,-441.758f,40.3982f,-1.95477f}, //stoneheart_bunker
{-571.88f,-262.777f,75.0087f,-0.802851f}, //iceblood_tower
{-768.907f,-363.71f,90.8949f,1.07991f}, //tower_point
src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ void BattlegroundBE::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundBE::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),6238.930176,262.963470,0.889519,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),6238.930176f,262.963470f,0.889519f,player->GetOrientation(),false);
return true;
}
src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
+7 -7
View File
@@ -145,7 +145,7 @@ void BattlegroundDS::HandleAreaTrigger(Player *Source, uint32 Trigger)
bool BattlegroundDS::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(), 1299.046, 784.825, 9.338, 2.422, false);
player->TeleportTo(GetMapId(), 1299.046f, 784.825f, 9.338f, 2.422f, false);
return true;
}
@@ -165,14 +165,14 @@ void BattlegroundDS::Reset()
bool BattlegroundDS::SetupBattleground()
{
// gates
if (!AddObject(BG_DS_OBJECT_DOOR_1, BG_DS_OBJECT_TYPE_DOOR_1, 1350.95, 817.2, 20.8096, 3.15, 0, 0, 0.99627, 0.0862864, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_DS_OBJECT_DOOR_2, BG_DS_OBJECT_TYPE_DOOR_2, 1232.65, 764.913, 20.0729, 6.3, 0, 0, 0.0310211, -0.999519, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_DS_OBJECT_DOOR_1, BG_DS_OBJECT_TYPE_DOOR_1, 1350.95f, 817.2f, 20.8096f, 3.15f, 0, 0, 0.99627f, 0.0862864f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_DS_OBJECT_DOOR_2, BG_DS_OBJECT_TYPE_DOOR_2, 1232.65f, 764.913f, 20.0729f, 6.3f, 0, 0, 0.0310211f, -0.999519f, RESPAWN_IMMEDIATELY)
// water
|| !AddObject(BG_DS_OBJECT_WATER_1, BG_DS_OBJECT_TYPE_WATER_1, 1291.56, 790.837, 7.1, 3.14238, 0, 0, 0.694215, -0.719768, 120)
|| !AddObject(BG_DS_OBJECT_WATER_2, BG_DS_OBJECT_TYPE_WATER_2, 1291.56, 790.837, 7.1, 3.14238, 0, 0, 0.694215, -0.719768, 120)
|| !AddObject(BG_DS_OBJECT_WATER_1, BG_DS_OBJECT_TYPE_WATER_1, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120)
|| !AddObject(BG_DS_OBJECT_WATER_2, BG_DS_OBJECT_TYPE_WATER_2, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120)
// buffs
|| !AddObject(BG_DS_OBJECT_BUFF_1, BG_DS_OBJECT_TYPE_BUFF_1, 1291.7, 813.424, 7.11472, 4.64562, 0, 0, 0.730314, -0.683111, 120)
|| !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7, 768.911, 7.11472, 1.55194, 0, 0, 0.700409, 0.713742, 120))
|| !AddObject(BG_DS_OBJECT_BUFF_1, BG_DS_OBJECT_TYPE_BUFF_1, 1291.7f, 813.424f, 7.11472f, 4.64562f, 0, 0, 0.730314f, -0.683111f, 120)
|| !AddObject(BG_DS_OBJECT_BUFF_2, BG_DS_OBJECT_TYPE_BUFF_2, 1291.7f, 768.911f, 7.11472f, 1.55194f, 0, 0, 0.700409f, 0.713742f, 120))
{
sLog.outErrorDb("BatteGroundDS: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
+7 -7
View File
@@ -110,7 +110,7 @@ void BattlegroundNA::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundNA::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),4055.504395,2919.660645,13.611241,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),4055.504395f,2919.660645f,13.611241f,player->GetOrientation(),false);
return true;
}
@@ -151,13 +151,13 @@ void BattlegroundNA::Reset()
bool BattlegroundNA::SetupBattleground()
{
// gates
if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854, 2966.833, 12.6462, -2.648788, 0, 0, 0.9697962, -0.2439165, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179, 2874.97, 12.39171, 0.4928045, 0, 0, 0.2439165, 0.9697962, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709, 2981.777, 10.70117, -2.648788, 0, 0, 0.9697962, -0.2439165, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064, 2858.438, 10.23631, 0.4928045, 0, 0, 0.2439165, 0.9697962, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.6462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179f, 2874.97f, 12.39171f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709f, 2981.777f, 10.70117f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064f, 2858.438f, 10.23631f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_NA_OBJECT_BUFF_1, BG_NA_OBJECT_TYPE_BUFF_1, 4009.189941, 2895.250000, 13.052700, -1.448624, 0, 0, 0.6626201, -0.7489557, 120)
|| !AddObject(BG_NA_OBJECT_BUFF_2, BG_NA_OBJECT_TYPE_BUFF_2, 4103.330078, 2946.350098, 13.051300, -0.06981307, 0, 0, 0.03489945, -0.9993908, 120))
|| !AddObject(BG_NA_OBJECT_BUFF_1, BG_NA_OBJECT_TYPE_BUFF_1, 4009.189941f, 2895.250000f, 13.052700f, -1.448624f, 0, 0, 0.6626201f, -0.7489557f, 120)
|| !AddObject(BG_NA_OBJECT_BUFF_2, BG_NA_OBJECT_TYPE_BUFF_2, 4103.330078f, 2946.350098f, 13.051300f, -0.06981307f, 0, 0, 0.03489945f, -0.9993908f, 120))
{
sLog.outErrorDb("BatteGroundNA: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
+5 -5
View File
@@ -110,7 +110,7 @@ void BattlegroundRL::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundRL::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(),1285.810547,1667.896851,39.957642,player->GetOrientation(),false);
player->TeleportTo(GetMapId(),1285.810547f,1667.896851f,39.957642f,player->GetOrientation(),false);
return true;
}
@@ -152,11 +152,11 @@ void BattlegroundRL::Reset()
bool BattlegroundRL::SetupBattleground()
{
// gates
if (!AddObject(BG_RL_OBJECT_DOOR_1, BG_RL_OBJECT_TYPE_DOOR_1, 1293.561, 1601.938, 31.60557, -1.457349, 0, 0, -0.6658813, 0.7460576, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RL_OBJECT_DOOR_2, BG_RL_OBJECT_TYPE_DOOR_2, 1278.648, 1730.557, 31.60557, 1.684245, 0, 0, 0.7460582, 0.6658807, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_RL_OBJECT_DOOR_1, BG_RL_OBJECT_TYPE_DOOR_1, 1293.561f, 1601.938f, 31.60557f, -1.457349f, 0, 0, -0.6658813f, 0.7460576f, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RL_OBJECT_DOOR_2, BG_RL_OBJECT_TYPE_DOOR_2, 1278.648f, 1730.557f, 31.60557f, 1.684245f, 0, 0, 0.7460582f, 0.6658807f, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_RL_OBJECT_BUFF_1, BG_RL_OBJECT_TYPE_BUFF_1, 1328.719971, 1632.719971, 36.730400, -1.448624, 0, 0, 0.6626201, -0.7489557, 120)
|| !AddObject(BG_RL_OBJECT_BUFF_2, BG_RL_OBJECT_TYPE_BUFF_2, 1243.300049, 1699.170044, 34.872601, -0.06981307, 0, 0, 0.03489945, -0.9993908, 120))
|| !AddObject(BG_RL_OBJECT_BUFF_1, BG_RL_OBJECT_TYPE_BUFF_1, 1328.719971f, 1632.719971f, 36.730400f, -1.448624f, 0, 0, 0.6626201f, -0.7489557f, 120)
|| !AddObject(BG_RL_OBJECT_BUFF_2, BG_RL_OBJECT_TYPE_BUFF_2, 1243.300049f, 1699.170044f, 34.872601f, -0.06981307f, 0, 0, 0.03489945f, -0.9993908f, 120))
{
sLog.outErrorDb("BatteGroundRL: Failed to spawn some object!");
return false;
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+23 -23
View File
@@ -156,7 +156,7 @@ void BattlegroundRV::HandleKillPlayer(Player *player, Player *killer)
bool BattlegroundRV::HandlePlayerUnderMap(Player *player)
{
player->TeleportTo(GetMapId(), 763.5, -284, 28.276, 2.422, false);
player->TeleportTo(GetMapId(), 763.5f, -284, 28.276f, 2.422f, false);
return true;
}
@@ -194,36 +194,36 @@ void BattlegroundRV::Reset()
bool BattlegroundRV::SetupBattleground()
{
// Fence
if (!AddObject(BG_RV_OBJECT_FENCE_1, BG_RV_OBJECT_TYPE_FENCE_1, 763.432373, -274.058197, 28.276695, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FENCE_2, BG_RV_OBJECT_TYPE_FENCE_2, 763.432373, -294.419464, 28.276684, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
if (!AddObject(BG_RV_OBJECT_FENCE_1, BG_RV_OBJECT_TYPE_FENCE_1, 763.432373f, -274.058197f, 28.276695f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FENCE_2, BG_RV_OBJECT_TYPE_FENCE_2, 763.432373f, -294.419464f, 28.276684f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// elevators
|| !AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377, -294.535767, 0.505383, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_2, BG_RV_OBJECT_TYPE_ELEVATOR_2, 763.506348, -273.873352, 0.505383, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377f, -294.535767f, 0.505383f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_2, BG_RV_OBJECT_TYPE_ELEVATOR_2, 763.506348f, -273.873352f, 0.505383f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_RV_OBJECT_BUFF_1, BG_RV_OBJECT_TYPE_BUFF_1, 735.551819, -284.794678, 28.276682, 0.034906, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_2, BG_RV_OBJECT_TYPE_BUFF_2, 791.224487, -284.794464, 28.276682, 2.600535, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_1, BG_RV_OBJECT_TYPE_BUFF_1, 735.551819f, -284.794678f, 28.276682f, 0.034906f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_BUFF_2, BG_RV_OBJECT_TYPE_BUFF_2, 791.224487f, -284.794464f, 28.276682f, 2.600535f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// fire
|| !AddObject(BG_RV_OBJECT_FIRE_1, BG_RV_OBJECT_TYPE_FIRE_1, 743.543457, -283.799469, 28.286655, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_2, BG_RV_OBJECT_TYPE_FIRE_2, 782.971802, -283.799469, 28.286655, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_1, BG_RV_OBJECT_TYPE_FIREDOOR_1, 743.711060, -284.099609, 27.542587, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_2, BG_RV_OBJECT_TYPE_FIREDOOR_2, 783.221252, -284.133362, 27.535686, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_1, BG_RV_OBJECT_TYPE_FIRE_1, 743.543457f, -283.799469f, 28.286655f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIRE_2, BG_RV_OBJECT_TYPE_FIRE_2, 782.971802f, -283.799469f, 28.286655f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_1, BG_RV_OBJECT_TYPE_FIREDOOR_1, 743.711060f, -284.099609f, 27.542587f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_FIREDOOR_2, BG_RV_OBJECT_TYPE_FIREDOOR_2, 783.221252f, -284.133362f, 27.535686f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Gear
|| !AddObject(BG_RV_OBJECT_GEAR_1, BG_RV_OBJECT_TYPE_GEAR_1, 763.664551, -261.872986, 26.686588, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_2, BG_RV_OBJECT_TYPE_GEAR_2, 763.578979, -306.146149, 26.665222, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_1, BG_RV_OBJECT_TYPE_GEAR_1, 763.664551f, -261.872986f, 26.686588f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_GEAR_2, BG_RV_OBJECT_TYPE_GEAR_2, 763.578979f, -306.146149f, 26.665222f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Pulley
|| !AddObject(BG_RV_OBJECT_PULLEY_1, BG_RV_OBJECT_TYPE_PULLEY_1, 700.722290, -283.990662, 39.517582, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_2, BG_RV_OBJECT_TYPE_PULLEY_2, 826.303833, -283.996429, 39.517582, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_1, BG_RV_OBJECT_TYPE_PULLEY_1, 700.722290f, -283.990662f, 39.517582f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PULLEY_2, BG_RV_OBJECT_TYPE_PULLEY_2, 826.303833f, -283.996429f, 39.517582f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// Pilars
|| !AddObject(BG_RV_OBJECT_PILAR_1, BG_RV_OBJECT_TYPE_PILAR_1, 763.632385, -306.162384, 25.909504, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_2, BG_RV_OBJECT_TYPE_PILAR_2, 723.644287, -284.493256, 24.648525, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_3, BG_RV_OBJECT_TYPE_PILAR_3, 763.611145, -261.856750, 25.909504, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_4, BG_RV_OBJECT_TYPE_PILAR_4, 802.211609, -284.493256, 24.648525, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_1, BG_RV_OBJECT_TYPE_PILAR_1, 763.632385f, -306.162384f, 25.909504f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_2, BG_RV_OBJECT_TYPE_PILAR_2, 723.644287f, -284.493256f, 24.648525f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_3, BG_RV_OBJECT_TYPE_PILAR_3, 763.611145f, -261.856750f, 25.909504f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_4, BG_RV_OBJECT_TYPE_PILAR_4, 802.211609f, -284.493256f, 24.648525f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
/*
// Pilars Collision - Fixme: Use the collision pilars - should make u break LoS
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_1, BG_RV_OBJECT_TYPE_PILAR_COLLISION_1, 763.632385, -306.162384, 30.639660, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_2, BG_RV_OBJECT_TYPE_PILAR_COLLISION_2, 723.644287, -284.493256, 32.382710, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_3, BG_RV_OBJECT_TYPE_PILAR_COLLISION_3, 763.611145, -261.856750, 30.639660, 0.000000, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_4, BG_RV_OBJECT_TYPE_PILAR_COLLISION_4, 802.211609, -284.493256, 32.382710, 3.141593, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_1, BG_RV_OBJECT_TYPE_PILAR_COLLISION_1, 763.632385f, -306.162384f, 30.639660f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_2, BG_RV_OBJECT_TYPE_PILAR_COLLISION_2, 723.644287f, -284.493256f, 32.382710f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_3, BG_RV_OBJECT_TYPE_PILAR_COLLISION_3, 763.611145f, -261.856750f, 30.639660f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_PILAR_COLLISION_4, BG_RV_OBJECT_TYPE_PILAR_COLLISION_4, 802.211609f, -284.493256f, 32.382710f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
*/
)
{
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
+96 -96
View File
@@ -162,24 +162,24 @@ const float BG_SA_NpcSpawnlocs[BG_SA_MAXNPC + BG_SA_DEMOLISHER_AMOUNT][4] =
{ 1236.213f, 92.287f, 64.965f, 5.751f },
{ 1215.11f, 57.772f, 64.739f, 5.78f } ,
//Demolishers
{ 1611.597656,-117.270073,8.719355,2.513274},
{ 1575.562500,-158.421875,5.024450,2.129302},
{ 1618.047729,61.424641,7.248210,3.979351},
{ 1575.103149,98.873344,2.830360,3.752458},
{ 1611.597656f,-117.270073f,8.719355f,2.513274f},
{ 1575.562500f,-158.421875f,5.024450f,2.129302f},
{ 1618.047729f,61.424641f,7.248210f,3.979351f},
{ 1575.103149f,98.873344f,2.830360f,3.752458f},
//trigger
{ 1453.49, -250.453, 30.896, 4.2883},
{ 1377.05, 97.036, 30.8605, 2.46539},
{ 1186.05, 58.8048, 56.5491, 2.75992},
{ 1042.83, -72.839, 84.8145, 3.58615},
{ 1233.62, -250.49, 55.4036, 3.7016},
{ 1453.49f, -250.453f, 30.896f, 4.2883f},
{ 1377.05f, 97.036f, 30.8605f, 2.46539f},
{ 1186.05f, 58.8048f, 56.5491f, 2.75992f},
{ 1042.83f, -72.839f, 84.8145f, 3.58615f},
{ 1233.62f, -250.49f, 55.4036f, 3.7016f},
//Npcs
{ 1348.644165, -298.786469, 31.080130, 1.710423},
{ 1358.191040, 195.527786, 31.018187, 4.171337},
{ 1348.644165f, -298.786469f, 31.080130f, 1.710423f},
{ 1358.191040f, 195.527786f, 31.018187f, 4.171337f},
//Demolishers2
{ 1371.055786, -317.071136, 35.007359, 1.947460},
{ 1424.034912, -260.195190, 31.084425, 2.820013},
{ 1353.139893, 223.745438, 35.265411, 4.343684},
{ 1404.809570, 197.027237, 32.046032, 3.605401}
{ 1371.055786f, -317.071136f, 35.007359f, 1.947460f},
{ 1424.034912f, -260.195190f, 31.084425f, 2.820013f},
{ 1353.139893f, 223.745438f, 35.265411f, 4.343684f},
{ 1404.809570f, 197.027237f, 32.046032f, 3.605401f}
};
enum BG_SA_Objects
@@ -223,8 +223,8 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 878.555f, -108.2f, 117.845f, 0.0f },
{ 836.5f, -108.8f, 120.219f, 0.0f },
//Ships
{ 2679.696777, -826.891235, 3.712860, 5.78367f}, //rot2 1 rot3 0.0002
{ 2574.003662, 981.261475, 2.603424, 0.807696},
{ 2679.696777f, -826.891235f, 3.712860f, 5.78367f}, //rot2 1 rot3 0.0002f
{ 2574.003662f, 981.261475f, 2.603424f, 0.807696f},
//Sigils
{ 1414.054f, 106.72f, 41.442f, 5.441f },
{ 1060.63f, -107.8f, 94.7f, 0.034f },
@@ -232,88 +232,88 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
{ 1230.75f, -210.724f, 67.611f, 0.5023f },
{ 1217.8f, 79.532f, 66.58f, 5.745f },
//Flagpoles
{ 1215.114258,-65.711861,70.084267,-3.124123},
{1338.863892,-153.336533,30.895121,-2.530723},
{1309.124268,9.410645,30.893402,-1.623156},
{ 1215.114258f,-65.711861f,70.084267f,-3.124123f},
{1338.863892f,-153.336533f,30.895121f,-2.530723f},
{1309.124268f,9.410645f,30.893402f,-1.623156f},
//Flags
{ 1215.108032,-65.715767,70.084267,-3.124123},
{ 1338.859253,-153.327316,30.895077,-2.530723},
{ 1309.192017,9.416233,30.893402,1.518436},
{ 1215.108032f,-65.715767f,70.084267f,-3.124123f},
{ 1338.859253f,-153.327316f,30.895077f,-2.530723f},
{ 1309.192017f,9.416233f,30.893402f,1.518436f},
//Portal
{1468.380005, -225.798996, 30.896200, 0.0}, //blue
{1394.270020, 72.551399, 31.054300, 0.0},//green
{1065.260010, -89.79501, 81.073402, 0.0},//yellow
{1216.069946, 47.904301, 54.278198,0.0}, //purple
{1255.569946, -233.548996, 56.43699, 0.0},//red
{1468.380005f, -225.798996f, 30.896200f, 0.0f}, //blue
{1394.270020f, 72.551399f, 31.054300f, 0.0f},//green
{1065.260010f, -89.79501f, 81.073402f, 0.0f},//yellow
{1216.069946f, 47.904301f, 54.278198f,0.0f}, //purple
{1255.569946f, -233.548996f, 56.43699f, 0.0f},//red
//Bombs
{1333.45, 211.354, 31.0538, 5.03666},
{1334.29, 209.582, 31.0532, 1.28088},
{1332.72, 210.049, 31.0532, 1.28088},
{1334.28, 210.78, 31.0538, 3.85856},
{1332.64, 211.39, 31.0532, 1.29266},
{1371.41, 194.028, 31.5107, 0.753095},
{1372.39, 194.951, 31.4679, 0.753095},
{1371.58, 196.942, 30.9349, 1.01777},
{1370.43, 196.614, 30.9349, 0.957299},
{1369.46, 196.877, 30.9351, 2.45348},
{1370.35, 197.361, 30.9349, 1.08689},
{1369.47, 197.941, 30.9349, 0.984787},
{1592.49, 47.5969, 7.52271, 4.63218},
{1593.91, 47.8036, 7.65856, 4.63218},
{1593.13, 46.8106, 7.54073, 4.63218},
{1589.22, 36.3616, 7.45975, 4.64396},
{1588.24, 35.5842, 7.55613, 4.79564},
{1588.14, 36.7611, 7.49675, 4.79564},
{1595.74, 35.5278, 7.46602, 4.90246},
{1596, 36.6475, 7.47991, 4.90246},
{1597.03, 36.2356, 7.48631, 4.90246},
{1597.93, 37.1214, 7.51725, 4.90246},
{1598.16, 35.888, 7.50018, 4.90246},
{1579.6, -98.0917, 8.48478, 1.37996},
{1581.2, -98.401, 8.47483, 1.37996},
{1580.38, -98.9556, 8.4772, 1.38781},
{1585.68, -104.966, 8.88551, 0.493246},
{1586.15, -106.033, 9.10616, 0.493246},
{1584.88, -105.394, 8.82985, 0.493246},
{1581.87, -100.899, 8.46164, 0.929142},
{1581.48, -99.4657, 8.46926, 0.929142},
{1583.2, -91.2291, 8.49227, 1.40038},
{1581.94, -91.0119, 8.49977, 1.40038},
{1582.33, -91.951, 8.49353, 1.1844},
{1342.06, -304.049, 30.9532, 5.59507},
{1340.96, -304.536, 30.9458, 1.28323},
{1341.22, -303.316, 30.9413, 0.486051},
{1342.22, -302.939, 30.986, 4.87643},
{1382.16, -287.466, 32.3063, 4.80968},
{1381, -287.58, 32.2805, 4.80968},
{1381.55, -286.536, 32.3929, 2.84225},
{1382.75, -286.354, 32.4099, 1.00442},
{1379.92, -287.34, 32.2872, 3.81615},
{1100.52, -2.41391, 70.2984, 0.131054},
{1099.35, -2.13851, 70.3375, 4.4586},
{1099.59, -1.00329, 70.238, 2.49903},
{1097.79, 0.571316, 70.159, 4.00307},
{1098.74, -7.23252, 70.7972, 4.1523},
{1098.46, -5.91443, 70.6715, 4.1523},
{1097.53, -7.39704, 70.7959, 4.1523},
{1097.32, -6.64233, 70.7424, 4.1523},
{1096.45, -5.96664, 70.7242, 4.1523},
{971.725, 0.496763, 86.8467, 2.09233},
{973.589, 0.119518, 86.7985, 3.17225},
{972.524, 1.25333, 86.8351, 5.28497},
{971.993, 2.05668, 86.8584, 5.28497},
{973.635, 2.11805, 86.8197, 2.36722},
{974.791, 1.74679, 86.7942, 1.5936},
{974.771, 3.0445, 86.8125, 0.647199},
{979.554, 3.6037, 86.7923, 1.69178},
{979.758, 2.57519, 86.7748, 1.76639},
{980.769, 3.48904, 86.7939, 1.76639},
{979.122, 2.87109, 86.7794, 1.76639},
{986.167, 4.85363, 86.8439, 1.5779},
{986.176, 3.50367, 86.8217, 1.5779},
{987.33, 4.67389, 86.8486, 1.5779},
{985.23, 4.65898, 86.8368, 1.5779},
{984.556, 3.54097, 86.8137, 1.5779},
{1333.45f, 211.354f, 31.0538f, 5.03666f},
{1334.29f, 209.582f, 31.0532f, 1.28088f},
{1332.72f, 210.049f, 31.0532f, 1.28088f},
{1334.28f, 210.78f, 31.0538f, 3.85856f},
{1332.64f, 211.39f, 31.0532f, 1.29266f},
{1371.41f, 194.028f, 31.5107f, 0.753095f},
{1372.39f, 194.951f, 31.4679f, 0.753095f},
{1371.58f, 196.942f, 30.9349f, 1.01777f},
{1370.43f, 196.614f, 30.9349f, 0.957299f},
{1369.46f, 196.877f, 30.9351f, 2.45348f},
{1370.35f, 197.361f, 30.9349f, 1.08689f},
{1369.47f, 197.941f, 30.9349f, 0.984787f},
{1592.49f, 47.5969f, 7.52271f, 4.63218f},
{1593.91f, 47.8036f, 7.65856f, 4.63218f},
{1593.13f, 46.8106f, 7.54073f, 4.63218f},
{1589.22f, 36.3616f, 7.45975f, 4.64396f},
{1588.24f, 35.5842f, 7.55613f, 4.79564f},
{1588.14f, 36.7611f, 7.49675f, 4.79564f},
{1595.74f, 35.5278f, 7.46602f, 4.90246f},
{1596, 36.6475f, 7.47991f, 4.90246f},
{1597.03f, 36.2356f, 7.48631f, 4.90246f},
{1597.93f, 37.1214f, 7.51725f, 4.90246f},
{1598.16f, 35.888f, 7.50018f, 4.90246f},
{1579.6f, -98.0917f, 8.48478f, 1.37996f},
{1581.2f, -98.401f, 8.47483f, 1.37996f},
{1580.38f, -98.9556f, 8.4772f, 1.38781f},
{1585.68f, -104.966f, 8.88551f, 0.493246f},
{1586.15f, -106.033f, 9.10616f, 0.493246f},
{1584.88f, -105.394f, 8.82985f, 0.493246f},
{1581.87f, -100.899f, 8.46164f, 0.929142f},
{1581.48f, -99.4657f, 8.46926f, 0.929142f},
{1583.2f, -91.2291f, 8.49227f, 1.40038f},
{1581.94f, -91.0119f, 8.49977f, 1.40038f},
{1582.33f, -91.951f, 8.49353f, 1.1844f},
{1342.06f, -304.049f, 30.9532f, 5.59507f},
{1340.96f, -304.536f, 30.9458f, 1.28323f},
{1341.22f, -303.316f, 30.9413f, 0.486051f},
{1342.22f, -302.939f, 30.986f, 4.87643f},
{1382.16f, -287.466f, 32.3063f, 4.80968f},
{1381, -287.58f, 32.2805f, 4.80968f},
{1381.55f, -286.536f, 32.3929f, 2.84225f},
{1382.75f, -286.354f, 32.4099f, 1.00442f},
{1379.92f, -287.34f, 32.2872f, 3.81615f},
{1100.52f, -2.41391f, 70.2984f, 0.131054f},
{1099.35f, -2.13851f, 70.3375f, 4.4586f},
{1099.59f, -1.00329f, 70.238f, 2.49903f},
{1097.79f, 0.571316f, 70.159f, 4.00307f},
{1098.74f, -7.23252f, 70.7972f, 4.1523f},
{1098.46f, -5.91443f, 70.6715f, 4.1523f},
{1097.53f, -7.39704f, 70.7959f, 4.1523f},
{1097.32f, -6.64233f, 70.7424f, 4.1523f},
{1096.45f, -5.96664f, 70.7242f, 4.1523f},
{971.725f, 0.496763f, 86.8467f, 2.09233f},
{973.589f, 0.119518f, 86.7985f, 3.17225f},
{972.524f, 1.25333f, 86.8351f, 5.28497f},
{971.993f, 2.05668f, 86.8584f, 5.28497f},
{973.635f, 2.11805f, 86.8197f, 2.36722f},
{974.791f, 1.74679f, 86.7942f, 1.5936f},
{974.771f, 3.0445f, 86.8125f, 0.647199f},
{979.554f, 3.6037f, 86.7923f, 1.69178f},
{979.758f, 2.57519f, 86.7748f, 1.76639f},
{980.769f, 3.48904f, 86.7939f, 1.76639f},
{979.122f, 2.87109f, 86.7794f, 1.76639f},
{986.167f, 4.85363f, 86.8439f, 1.5779f},
{986.176f, 3.50367f, 86.8217f, 1.5779f},
{987.33f, 4.67389f, 86.8486f, 1.5779f},
{985.23f, 4.65898f, 86.8368f, 1.5779f},
{984.556f, 3.54097f, 86.8137f, 1.5779f},
};
/* Ships:
src/server/game/Entities/Pet/Pet.h
+1 -1
View File
@@ -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
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -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
src/server/game/Entities/Unit/Unit.cpp
+5 -5
View File
@@ -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;
}
}
src/server/game/Spells/SpellEffects.cpp
+3 -4
View File
@@ -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);
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+68 -68
View File
@@ -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;
}
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+4 -4
View File
@@ -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
{
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+8 -8
View File
@@ -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_1X -39.355381f
#define ADD_1Y -513.456482f
#define ADD_1Z 88.472046f
#define ADD_1O 4.679872f
#define ADD_2X -49.875881
#define ADD_2Y -511.896942
#define ADD_2Z 88.195160
#define ADD_2O 4.613114
#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
{
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+8 -8
View File
@@ -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)
{
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+1 -1
View File
@@ -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()
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+21 -21
View File
@@ -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!
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+5 -5
View File
@@ -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]=
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+3 -3
View File
@@ -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{
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+8 -8
View File
@@ -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
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+19 -19
View File
@@ -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
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+1 -1
View File
@@ -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());
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+5 -5
View File
@@ -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);
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+6 -6
View File
@@ -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();
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+6 -6
View File
@@ -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[] =
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+1 -1
View File
@@ -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?"
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+23 -23
View File
@@ -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())
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+2 -2
View File
@@ -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:
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+32 -32
View File
@@ -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));
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+25 -25
View File
@@ -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;
}
}
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+1 -1
View File
@@ -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)
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+1 -1
View File
@@ -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();
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+42 -42
View File
@@ -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_1X 170.205f
#define ADD_1Y 99.413f
#define ADD_1Z 104.733f
#define ADD_1O 3.16f
#define ADD_2X 170.813
#define ADD_2Y 97.857
#define ADD_2Z 104.713
#define ADD_2O 3.16
#define ADD_2X 170.813f
#define ADD_2Y 97.857f
#define ADD_2Z 104.713f
#define ADD_2O 3.16f
#define ADD_3X 170.720
#define ADD_3Y 100.900
#define ADD_3Z 104.739
#define ADD_3O 3.16
#define ADD_3X 170.720f
#define ADD_3Y 100.900f
#define ADD_3Z 104.739f
#define ADD_3O 3.16f
#define ADD_4X 171.866
#define ADD_4Y 99.373
#define ADD_4Z 104.732
#define ADD_4O 3.16
#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;
src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+1 -1
View File
@@ -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);
}
}
src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+5 -5
View File
@@ -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
{
src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+24 -24
View File
@@ -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_1X 4017.403809f
#define ADD_1Y -3339.703369f
#define ADD_1Z 115.057655f
#define ADD_1O 5.487860f
#define ADD_2X 4013.189209
#define ADD_2Y -3351.808350
#define ADD_2Z 115.052254
#define ADD_2O 0.134280
#define ADD_2X 4013.189209f
#define ADD_2Y -3351.808350f
#define ADD_2Z 115.052254f
#define ADD_2O 0.134280f
#define ADD_3X 4017.738037
#define ADD_3Y -3363.478016
#define ADD_3Z 115.057274
#define ADD_3O 0.723313
#define ADD_3X 4017.738037f
#define ADD_3Y -3363.478016f
#define ADD_3Z 115.057274f
#define ADD_3O 0.723313f
#define ADD_4X 4048.877197
#define ADD_4Y -3363.223633
#define ADD_4Z 115.054253
#define ADD_4O 3.627735
#define ADD_4X 4048.877197f
#define ADD_4Y -3363.223633f
#define ADD_4Z 115.054253f
#define ADD_4O 3.627735f
#define ADD_5X 4051.777588
#define ADD_5Y -3350.893311
#define ADD_5Z 115.055351
#define ADD_5O 3.066176
#define ADD_5X 4051.777588f
#define ADD_5Y -3350.893311f
#define ADD_5Z 115.055351f
#define ADD_5O 3.066176f
#define ADD_6X 4048.375977
#define ADD_6Y -3339.966309
#define ADD_6Z 115.055222
#define ADD_6O 2.457497
#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
src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+36 -36
View File
@@ -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
src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+8 -8
View File
@@ -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
{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.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
{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
src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+1 -1
View File
@@ -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));
}
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+2 -2
View File
@@ -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);
src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+1 -1
View File
@@ -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;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+3 -3
View File
@@ -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*/) {}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+2 -2
View File
@@ -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
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+10 -10
View File
@@ -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
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+14 -14
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+5 -5
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+15 -15
View File
@@ -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
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+11 -11
View File
@@ -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;
}
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+8 -8
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+4 -4
View File
@@ -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
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+2 -2
View File
@@ -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)
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+6 -6
View File
@@ -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;
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+1 -1
View File
@@ -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);
src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+2 -2
View File
@@ -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;
src/server/scripts/EasternKingdoms/duskwood.cpp
+1 -1
View File
@@ -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);
src/server/scripts/EasternKingdoms/eversong_woods.cpp
+15 -15
View File
@@ -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
src/server/scripts/EasternKingdoms/ghostlands.cpp
+5 -5
View File
@@ -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)
src/server/scripts/EasternKingdoms/hinterlands.cpp
+4 -4
View File
@@ -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
src/server/scripts/EasternKingdoms/searing_gorge.cpp
+1 -1
View File
@@ -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;
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+6 -6
View File
@@ -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
src/server/scripts/EasternKingdoms/stormwind_city.cpp
+2 -2
View File
@@ -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;
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+1 -1
View File
@@ -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;
}
src/server/scripts/EasternKingdoms/undercity.cpp
+8 -8
View File
@@ -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);
}
src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+1 -1
View File
@@ -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;
src/server/scripts/EasternKingdoms/westfall.cpp
+12 -12
View File
@@ -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);
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+3 -3
View File
@@ -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);
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+9 -9
View File
@@ -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
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+9 -9
View File
@@ -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);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+5 -5
View File
@@ -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);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+9 -9
View File
@@ -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);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+9 -9
View File
@@ -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);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+8 -8
View File
@@ -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);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+235 -235
View File
@@ -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);
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+119 -119
View File
@@ -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;
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+52 -52
View File
@@ -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."
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+4 -4
View File
@@ -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
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+19 -19
View File
@@ -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
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+1 -1
View File
@@ -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;
}
}
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+33 -33
View File
@@ -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))
{
src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+1 -1
View File
@@ -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)
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+6 -6
View File
@@ -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;
src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+4 -4
View File
@@ -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;
}
src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+3 -3
View File
@@ -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);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+3 -3
View File
@@ -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);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+7 -7
View File
@@ -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;
src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+1 -1
View File
@@ -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);
src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+20 -20
View File
@@ -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)
src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+67 -67
View File
@@ -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());
src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+8 -8
View File
@@ -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;
}
src/server/scripts/Kalimdor/ashenvale.cpp
+16 -16
View File
@@ -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
{
src/server/scripts/Kalimdor/azshara.cpp
+60 -60
View File
@@ -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);
src/server/scripts/Kalimdor/azuremyst_isle.cpp
+3 -3
View File
@@ -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);
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+1 -1
View File
@@ -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
{
src/server/scripts/Kalimdor/feralas.cpp
+10 -10
View File
@@ -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);
src/server/scripts/Kalimdor/moonglade.cpp
+48 -48
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More