diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
37 files changed, 955 insertions, 955 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4daf10d09cb..624d75f44e5 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -30,7 +30,7 @@ enum eSpells #define GOSSIP_ITEM_MORRIDUNE "Please port me to Darnassus" -const Position HomePosition = {-815.817,-145.299,-25.870, 0}; +const Position HomePosition = {-815.817f,-145.299f,-25.870f, 0}; class go_blackfathom_altar : public GameObjectScript { @@ -207,7 +207,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->TeleportTo(1,9952.239,2284.277,1341.394,1.595); + pPlayer->TeleportTo(1,9952.239f,2284.277f,1341.394f,1.595f); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -242,7 +242,7 @@ public: { case 4: SetEscortPaused(true); - me->SetOrientation(1.775791); + me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); DoScriptText(SAY_MORRIDUNE_2,me); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index abdab32e384..a6fbcdc9e7b 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -36,19 +36,19 @@ EndScriptData */ const Position LorgusPosition[4] = { - { -458.500610, -38.343079, -33.474445 }, - { -469.423615, -88.400513, -39.265102 }, - { -622.354980, -10.350100, -22.777000 }, - { -759.640564, 16.658913, -29.159529 } + { -458.500610f, -38.343079f, -33.474445f }, + { -469.423615f, -88.400513f, -39.265102f }, + { -622.354980f, -10.350100f, -22.777000f }, + { -759.640564f, 16.658913f, -29.159529f } }; const Position SpawnsLocation[] = { - {-775.431, -153.853, -25.871, 3.207}, - {-775.404, -174.132, -25.871, 3.185}, - {-862.430, -154.937, -25.871, 0.060}, - {-862.193, -174.251, -25.871, 6.182}, - {-863.895, -458.899, -33.891, 5.637} + {-775.431f, -153.853f, -25.871f, 3.207f}, + {-775.404f, -174.132f, -25.871f, 3.185f}, + {-862.430f, -154.937f, -25.871f, 0.060f}, + {-862.193f, -174.251f, -25.871f, 6.182f}, + {-863.895f, -458.899f, -33.891f, 5.637f} }; class instance_blackfathom_deeps : public InstanceMapScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 8a67d32b924..4acb8da5e67 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -130,7 +130,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -154,14 +154,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); + AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); + AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); + AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); + AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); + AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); + AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); + AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); + AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 2da5ff0e496..4e2bc5ecc0b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -70,9 +70,9 @@ EndScriptData */ #define CREATURE_ANCIENT_WISP 17946 #define CREATURE_CHANNEL_TARGET 22418 -#define NORDRASSIL_X 5503.713 -#define NORDRASSIL_Y -3523.436 -#define NORDRASSIL_Z 1608.781 +#define NORDRASSIL_X 5503.713f +#define NORDRASSIL_Y -3523.436f +#define NORDRASSIL_Z 1608.781f class mob_ancient_wisp : public CreatureScript { @@ -412,11 +412,11 @@ public: void SummonDoomfire(Unit *pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0,pTarget->GetPositionY()+15.0,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()+15.0f,pTarget->GetPositionY()+15.0f,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0,pTarget->GetPositionY()-15.0,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()-15.0f,pTarget->GetPositionY()-15.0f,pTarget->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 57cdfb3fb54..b54f31d5036 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -123,7 +123,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -146,14 +146,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); + AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); + AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); + AddWaypoint(2, 5554.58f, -2514.66f, 1476.12f); + AddWaypoint(3, 5554.16f, -2567.23f, 1479.90f); + AddWaypoint(4, 5540.67f, -2625.99f, 1480.89f); + AddWaypoint(5, 5508.16f, -2659.2f, 1480.15f); + AddWaypoint(6, 5489.62f, -2704.05f, 1482.18f); + AddWaypoint(7, 5457.04f, -2726.26f, 1485.10f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 83428348bac..8d6e367a84f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -118,7 +118,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } @@ -141,14 +141,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); + AddWaypoint(0, 5492.91f, -2404.61f, 1462.63f); + AddWaypoint(1, 5531.76f, -2460.87f, 1469.55f); + AddWaypoint(2, 5554.58f, -2514.66f, 1476.12f); + AddWaypoint(3, 5554.16f, -2567.23f, 1479.90f); + AddWaypoint(4, 5540.67f, -2625.99f, 1480.89f); + AddWaypoint(5, 5508.16f, -2659.2f, 1480.15f); + AddWaypoint(6, 5489.62f, -2704.05f, 1482.18f); + AddWaypoint(7, 5457.04f, -2726.26f, 1485.10f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 302aaf538d2..57b3dc98b2d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -138,14 +138,14 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); + AddWaypoint(0, 4896.08f, -1576.35f, 1333.65f); + AddWaypoint(1, 4898.68f, -1615.02f, 1329.48f); + AddWaypoint(2, 4907.12f, -1667.08f, 1321.00f); + AddWaypoint(3, 4963.18f, -1699.35f, 1340.51f); + AddWaypoint(4, 4989.16f, -1716.67f, 1335.74f); + AddWaypoint(5, 5026.27f, -1736.89f, 1323.02f); + AddWaypoint(6, 5037.77f, -1770.56f, 1324.36f); + AddWaypoint(7, 5067.23f, -1789.95f, 1321.17f); Start(false, true); SetDespawnAtEnd(false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index a3045446692..1423f0dd74a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -40,274 +40,274 @@ EndScriptData */ // Locations for summoning gargoyls and frost wyrms in special cases float SpawnPointSpecial[3][3]= { - {5497.08, -2493.23, 1535.72}, //spawn point for the gargoyles near the horde gate - {5624.53, -2548.12, 1551.54}, //spawn point for the frost wyrm near the horde gate - {5604.41, -2811.98, 1547.77} //spawn point for the gargoyles and wyrms near the horde tower + {5497.08f, -2493.23f, 1535.72f}, //spawn point for the gargoyles near the horde gate + {5624.53f, -2548.12f, 1551.54f}, //spawn point for the frost wyrm near the horde gate + {5604.41f, -2811.98f, 1547.77f} //spawn point for the gargoyles and wyrms near the horde tower }; // Locations for summoning waves in Alliance base float AllianceBase[4][3]= { - {4928.48, -1526.38, 1326.83}, - {4923.54, -1514.29, 1327.98}, - {4928.41, -1510.35, 1327.99}, - {4938.35, -1521.00, 1326.69} + {4928.48f, -1526.38f, 1326.83f}, + {4923.54f, -1514.29f, 1327.98f}, + {4928.41f, -1510.35f, 1327.99f}, + {4938.35f, -1521.00f, 1326.69f} }; float JainaDummySpawn[2][4]= { - {5497.01, -2719.03, 1483.08, 2.90426}, - {5484.98, -2721.69, 1483.39, 6.00656} + {5497.01f, -2719.03f, 1483.08f, 2.90426f}, + {5484.98f, -2721.69f, 1483.39f, 6.00656f} }; // Locations for summoning waves in Horde base float HordeBase[4][3]= { - {5458.01, -2340.27, 1459.60}, - {5466.01, -2334.69, 1460.06}, - {5468.45, -2355.13, 1459.99}, - {5479.06, -2344.16, 1461.74} + {5458.01f, -2340.27f, 1459.60f}, + {5466.01f, -2334.69f, 1460.06f}, + {5468.45f, -2355.13f, 1459.99f}, + {5479.06f, -2344.16f, 1461.74f} }; // Lady Jaina's waypoints when retreathing float JainaWPs[2][3]= { - {5078.56, -1789.79, 1320.73},//next to the small stairs - {5037.38, -1778.39, 1322.61},//center of alliance base + {5078.56f, -1789.79f, 1320.73f},//next to the small stairs + {5037.38f, -1778.39f, 1322.61f},//center of alliance base }; float InfernalPos[8][3]=//spawn points for the infernals in the horde base { - {5453.59, -2764.52, 1493.50}, - {5478.4, -2781.77, 1497.52}, - {5506.09, -2780.53, 1496.32}, - {5532.1, -2763.42, 1492.37}, - {5544.16, -2733.99, 1487.14}, - {5536.19, -2708.18, 1480.01}, - {5510.16, -2691.75, 1479.66}, - {5482.39, -2689.19, 1481.09} + {5453.59f, -2764.52f, 1493.50f}, + {5478.4f, -2781.77f, 1497.52f}, + {5506.09f, -2780.53f, 1496.32f}, + {5532.1f, -2763.42f, 1492.37f}, + {5544.16f, -2733.99f, 1487.14f}, + {5536.19f, -2708.18f, 1480.01f}, + {5510.16f, -2691.75f, 1479.66f}, + {5482.39f, -2689.19f, 1481.09f} }; float InfernalSPWP[26][4]=//spawn points for the infernals in the horde base used in the cleaning wave { - {5490.96, -2718.72, 1482.96, 0.49773}, - {5449.51, -2723.32, 1485.69, 2.69685}, - {5520.83, -2624.68, 1483.82, 1.20459}, - {5558.28, -2629.26, 1485.76, 0.37992}, - {5567.97, -2758.69, 1494.10, 5.04125}, - {5384.90, -2793.47, 1503.90, 5.55412}, - {5495.33, -2814.06, 1501.56, 1.12055}, - {5472.63, -2929.39, 1538.31, 1.95777}, - {5334.72, -2952.29, 1534.34, 0.50869}, - {5398.36, -2872.46, 1512.38, 0.76787}, - {5514.39, -2768.63, 1492.30, 1.55721}, - {5598.91, -2703.75, 1495.64, 2.56644}, - {5467.80, -2655.93, 1482.27, 0.85819}, - {5399.83, -2985.24, 1545.04, 5.92559}, - {5232.13, -2967.05, 1553.09, 5.41351}, - {5272.02, -3082.52, 1567.09, 3.40681}, - {5343.26, -3120.71, 1582.92, 3.16727}, - {5371.26, -3175.24, 1587.41, 6.10466}, - {5434.67, -3177.91, 1579.25, 2.77850}, - {5237.39, -3149.25, 1593.59, 0.83855}, - {5202.15, -3016.64, 1566.28, 3.31256}, - {5302.54, -2914.37, 1528.53, 3.37146}, - {5439.04, -2834.81, 1508.80, 2.14231}, - {5421.33, -2771.04, 1494.28, 6.06223}, - {5549.76, -2692.93, 1482.68, 2.19414}, - {5459.78, -2755.71, 1490.68, 1.05139} + {5490.96f, -2718.72f, 1482.96f, 0.49773f}, + {5449.51f, -2723.32f, 1485.69f, 2.69685f}, + {5520.83f, -2624.68f, 1483.82f, 1.20459f}, + {5558.28f, -2629.26f, 1485.76f, 0.37992f}, + {5567.97f, -2758.69f, 1494.10f, 5.04125f}, + {5384.90f, -2793.47f, 1503.90f, 5.55412f}, + {5495.33f, -2814.06f, 1501.56f, 1.12055f}, + {5472.63f, -2929.39f, 1538.31f, 1.95777f}, + {5334.72f, -2952.29f, 1534.34f, 0.50869f}, + {5398.36f, -2872.46f, 1512.38f, 0.76787f}, + {5514.39f, -2768.63f, 1492.30f, 1.55721f}, + {5598.91f, -2703.75f, 1495.64f, 2.56644f}, + {5467.80f, -2655.93f, 1482.27f, 0.85819f}, + {5399.83f, -2985.24f, 1545.04f, 5.92559f}, + {5232.13f, -2967.05f, 1553.09f, 5.41351f}, + {5272.02f, -3082.52f, 1567.09f, 3.40681f}, + {5343.26f, -3120.71f, 1582.92f, 3.16727f}, + {5371.26f, -3175.24f, 1587.41f, 6.10466f}, + {5434.67f, -3177.91f, 1579.25f, 2.77850f}, + {5237.39f, -3149.25f, 1593.59f, 0.83855f}, + {5202.15f, -3016.64f, 1566.28f, 3.31256f}, + {5302.54f, -2914.37f, 1528.53f, 3.37146f}, + {5439.04f, -2834.81f, 1508.80f, 2.14231f}, + {5421.33f, -2771.04f, 1494.28f, 6.06223f}, + {5549.76f, -2692.93f, 1482.68f, 2.19414f}, + {5459.78f, -2755.71f, 1490.68f, 1.05139f} }; float VeinPos[14][8]=//spawn points of the ancient gem veins { - {5184.84, -1982.59, 1382.66, 2.58079, 0, 0, 0.960944, 0.276742}, //alliance - {5107.66, -2071.16, 1368.37, 2.65148, 0, 0, 0.970124, 0.242611}, //alliance - {5040.53, -2227.65, 1403.17, 3.35049, 0, 0, 0.99455, -0.104257}, //alliance - {5187.59, -2453.12, 1455.51, 5.87943, 0, 0, 0.20051, -0.979692}, //alliance - {5429.43, -2340.65, 1465.38, 4.7681, 0, 0, 0.687138, -0.726527}, //alliance - {5463.99, -2315.95, 1470.29, 1.52045, 0, 0, 0.689084, 0.724682}, //alliance - {5624.65, -2495.09, 1510.11, 0.0124869, 0, 0, 0.00624342, 0.999981}, //alliance - {5285.41, -3348.32, 1663.01, 1.57152, 0, 0, 0.707362, 0.706852}, //horde - {5417.69, -3372.52, 1656.31, 0.361993, 0, 0, 0.18001, 0.983665}, //horde - {5315.34, -3238.32, 1622.88, 3.03627, 0, 0, 0.998614, 0.0526347}, //horde - {5303.4, -3096.44, 1596.41, 1.72073, 0, 0, 0.758081, 0.65216}, //horde - {5265.13, -3177.27, 1616.22, 0.813604, 0, 0, 0.395674, 0.918391}, //horde - {5374.3, -3420.59, 1653.43, 1.45762, 0, 0, 0.665981, 0.745969}, //horde - {5441.54, -3321.59, 1651.55, 0.258306, 0, 0, 0.128794, 0.991671} //horde + {5184.84f, -1982.59f, 1382.66f, 2.58079f, 0, 0, 0.960944f, 0.276742f}, //alliance + {5107.66f, -2071.16f, 1368.37f, 2.65148f, 0, 0, 0.970124f, 0.242611f}, //alliance + {5040.53f, -2227.65f, 1403.17f, 3.35049f, 0, 0, 0.99455f, -0.104257f}, //alliance + {5187.59f, -2453.12f, 1455.51f, 5.87943f, 0, 0, 0.20051f, -0.979692f}, //alliance + {5429.43f, -2340.65f, 1465.38f, 4.7681f, 0, 0, 0.687138f, -0.726527f}, //alliance + {5463.99f, -2315.95f, 1470.29f, 1.52045f, 0, 0, 0.689084f, 0.724682f}, //alliance + {5624.65f, -2495.09f, 1510.11f, 0.0124869f, 0, 0, 0.00624342f, 0.999981f}, //alliance + {5285.41f, -3348.32f, 1663.01f, 1.57152f, 0, 0, 0.707362f, 0.706852f}, //horde + {5417.69f, -3372.52f, 1656.31f, 0.361993f, 0, 0, 0.18001f, 0.983665f}, //horde + {5315.34f, -3238.32f, 1622.88f, 3.03627f, 0, 0, 0.998614f, 0.0526347f}, //horde + {5303.4f, -3096.44f, 1596.41f, 1.72073f, 0, 0, 0.758081f, 0.65216f}, //horde + {5265.13f, -3177.27f, 1616.22f, 0.813604f, 0, 0, 0.395674f, 0.918391f}, //horde + {5374.3f, -3420.59f, 1653.43f, 1.45762f, 0, 0, 0.665981f, 0.745969f}, //horde + {5441.54f, -3321.59f, 1651.55f, 0.258306f, 0, 0, 0.128794f, 0.991671f} //horde }; float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun { - {5279.94, -2049.68, 1311.38, 0},//garg1 - {5289.15, -2219.06, 1291.12, 0},//garg2 - {5202.07, -2136.10, 1305.07, 2.8},//garg3 - {5071.52, -2425.63, 1454.48, 5.54},//garg4 - {5120.65, -2467.92, 1463.93, 2.54}//garg5 + {5279.94f, -2049.68f, 1311.38f, 0},//garg1 + {5289.15f, -2219.06f, 1291.12f, 0},//garg2 + {5202.07f, -2136.10f, 1305.07f, 2.8f},//garg3 + {5071.52f, -2425.63f, 1454.48f, 5.54f},//garg4 + {5120.65f, -2467.92f, 1463.93f, 2.54f}//garg5 }; float AllianceFirePos[92][8]=//spawn points for the fire visuals (GO) in the alliance base { - {5039.9, -1796.84, 1323.88, 2.59222, 0, 0, 0.962511, 0.271243}, - {5087.2, -1795.2, 1320.68, 1.03946, 0, 0, 0.496644, 0.867954}, - {5112.68, -1806.66, 1359.93, 1.37799, 0, 0, 0.63576, 0.771887}, - {5095.61, -1793.27, 1359.78, 0.580806, 0, 0, 0.286338, 0.958129}, - {5090.43, -1784.45, 1360.44, 0.796784, 0, 0, 0.387937, 0.921686}, - {5139.25, -1783.11, 1359.39, 3.30849, 0, 0, 0.99652, -0.0833509}, - {5112.16, -1763.72, 1361.35, 5.10312, 0, 0, 0.556388, -0.830922}, - {4981.18, -1793.98, 1335.7, 3.23072, 0, 0, 0.999007, -0.0445498}, - {4996.57, -1766.75, 1341.62, 3.5331, 0, 0, 0.980902, -0.194505}, - {4983.74, -1769.25, 1345.75, 3.79228, 0, 0, 0.947541, -0.319635}, - {4996.01, -1774.43, 1330.71, 3.07364, 0, 0, 0.999423, 0.0339693}, - {5094.2, -1726.13, 1330.55, 1.56175, 0, 0, 0.703901, 0.710298}, - {5079.82, -1721.24, 1336.26, 1.18868, 0, 0, 0.559964, 0.828517}, - {5077.68, -1717.15, 1327.78, 0.0145145, 0, 0, 0.00725717, 0.999974}, - {5122.27, -1738.22, 1341.67, 0.835256, 0, 0, 0.405593, 0.914054}, - {5131.88, -1741.15, 1335.25, 2.15472, 0, 0, 0.880712, 0.473653}, - {5196.93, -1772.99, 1345.2, 0.128397, 0, 0, 0.0641544, 0.99794}, - {5225.33, -1756.06, 1344.17, 3.04223, 0, 0, 0.998766, 0.0496599}, - {5224.84, -1767.05, 1360.06, 3.19538, 0, 0, 0.999638, -0.0268922}, - {5202.05, -1763.47, 1361.68, 2.59455, 0, 0, 0.962826, 0.270122}, - {5194.74, -1766.66, 1356.94, 0.0734191, 0, 0, 0.0367013, 0.999326}, - {5159.67, -1832.97, 1344.5, 5.17457, 0, 0, 0.526356, -0.850264}, - {5096.17, -1858.73, 1332.46, 5.30021, 0, 0, 0.471939, -0.881631}, - {5110.7, -1856.59, 1342.84, 5.97564, 0, 0, 0.153167, -0.9882}, - {5109.76, -1855.3, 1332.38, 4.89572, 0, 0, 0.639411, -0.768865}, - {5068.95, -1837.37, 1328.81, 2.61569, 0, 0, 0.965628, 0.25993}, - {5064.4, -1824.77, 1329.02, 2.16409, 0, 0, 0.88292, 0.469524}, - {5059.89, -1848.79, 1329.59, 0.0709955, 0, 0, 0.0354903, 0.99937}, - {5014.37, -1851.39, 1322.56, 4.66949, 0, 0, 0.722111, -0.691777}, - {5025.1, -1848.27, 1323.39, 4.44565, 0, 0, 0.794854, -0.606801}, - {4942.63, -1890.13, 1326.59, 3.28719, 0, 0, 0.997351, -0.0727343}, - {4937.95, -1888.71, 1352.41, 3.41678, 0, 0, 0.990549, -0.13716}, - {4922.48, -1881.92, 1352.41, 5.03077, 0, 0, 0.586075, -0.810257}, - {4915.35, -1894.32, 1351.24, 6.22457, 0, 0, 0.0293048, -0.999571}, - {4922.71, -1904.84, 1352.56, 1.37866, 0, 0, 0.63602, 0.771672}, - {4932.89, -1905.49, 1352.56, 1.89702, 0, 0, 0.812549, 0.582893}, - {5011.83, -1861.05, 1345.86, 4.43777, 0, 0, 0.797239, -0.603664}, - {5011.83, -1861.05, 1363.26, 4.748, 0, 0, 0.694406, -0.719583}, - {5021.46, -1858.35, 1342.17, 4.86188, 0, 0, 0.652329, -0.757936}, - {4995.02, -1698.3, 1370.38, 6.15779, 0, 0, 0.0626579, -0.998035}, - {5119.85, -1728.9, 1336.04, 5.87112, 0, 0, 0.204579, -0.97885}, - {5214.75, -1751.02, 1342.5, 5.08965, 0, 0, 0.561972, -0.827156}, - {5075.04, -1822.43, 1328.87, 3.99951, 0, 0, 0.9094, -0.415924}, - {5057.09, -1823.32, 1350.35, 3.88169, 0, 0, 0.93231, -0.361659}, - {4984.6, -1816.99, 1329.21, 3.05308, 0, 0, 0.999021, 0.0442417}, - {4983.35, -1811.55, 1356.82, 3.33975, 0, 0, 0.995096, -0.098917}, - {4984.11, -1825.73, 1350.76, 2.26375, 0, 0, 0.905211, 0.424962}, - {4968.47, -1786.46, 1354.09, 3.07663, 0, 0, 0.999473, 0.0324733}, - {5061.82, -1751.16, 1339.07, 5.94727, 0, 0, 0.167171, -0.985928}, - {5063.75, -1763, 1351.91, 0.759707, 0, 0, 0.370784, 0.928719}, - {5078.65, -1708.26, 1353.9, 1.27022, 0, 0, 0.593264, 0.805008}, - {4983.19, -1755.96, 1331.13, 4.28221, 0, 0, 0.841733, -0.539894}, - {4972.76, -1755.3, 1332.5, 4.21938, 0, 0, 0.858276, -0.513188}, - {4961.65, -1760.82, 1351.69, 3.56515, 0, 0, 0.977659, -0.210198}, - {5086.45, -1779.83, 1321.62, 6.23157, 0, 0, 0.0258051, -0.999667}, - {5063.15, -1756.74, 1328.56, 0.886926, 0, 0, 0.42907, 0.903271}, - {5042.45, -1800.61, 1323.88, 2.50093, 0, 0, 0.949131, 0.31488}, - {5084.74, -1725.35, 1327.89, 1.65034, 0, 0, 0.734663, 0.678432}, - {4993.25, -1758.1, 1331.07, 3.49995, 0, 0, 0.98399, -0.178223}, - {5078.53, -1867.85, 1348.91, 5.85612, 0, 0, 0.211913, -0.977288}, - {5080.74, -1869.73, 1333.18, 6.18206, 0, 0, 0.0505424, -0.998722}, - {5089.55, -1894.13, 1356.08, 1.52072, 0, 0, 0.689181, 0.724589}, - {5113.24, -1899.49, 1363.77, 1.50108, 0, 0, 0.682034, 0.731321}, - {4984.18, -1907.69, 1325.62, 3.82193, 0, 0, 0.942698, -0.333646}, - {5094.14, -2432.08, 1429.38, 4.70083, 0, 0, 0.711182, -0.703007}, - {5329.89, -2113.30, 1281.06, 5.60560, 0, 0, 0.332347, -0.943157}, - {5170.87, -2148.13, 1278.32, 1.63540, 0, 0, 0.729573, 0.683903 }, - {5132.94, -1960.25, 1367.8, 3.69787, 0, 0, 0.961568, -0.274566}, - {5280.82, -2351.55, 1431.57, 4.46913, 0, 0, 0.787677, -0.616088}, - {5176.78, -2121.43, 1295.27, 3.24153, 0, 0, 0.998752, -0.04995}, - {5332.75, -2101.41, 1296.37, 5.50350, 0, 0, 0.380043, -0.924969}, - {5265.70, -2050.27, 1287.57, 0.50051, 0, 0, 0.247655, 0.968848 }, - {5194.21, -2129.89, 1274.04, 3.08053, 0, 0, 0.999534, 0.0305272}, - {5225.81, -1985.50, 1364.15, 0.37247, 0, 0, 0.185163, 0.982708 }, - {5339.46, -2204.47, 1280.45, 0.99921, 0, 0, 0.479081, 0.877771 }, - {5269.63, -2020.57, 1299.62, 3.00201, 0, 0, 0.997566, 0.0697332}, - {5111.54, -2445.70, 1435.31, 2.70983, 0, 0, 0.976788, 0.214207 }, - {5111.24, -1901.14, 1355.33, 1.61028, 0, 0, 0.720929, 0.693009 }, - {5310.42, -2207.82, 1277.46, 0.50441, 0, 0, 0.249544, 0.968363 }, - {5150.81, -2042.13, 1394.3, 2.21031, 0, 0, 0.893534, 0.448995 }, - {5224.84, -2376.61, 1366.33, 5.0621, 0, 0, 0.573311, -0.819338}, - {5105.41, -2454.86, 1446.16, 4.64584, 0, 0, 0.730239, -0.683191}, - {5309.65, -2188.28, 1266.84, 5.56631, 0, 0, 0.350811, -0.936446}, - {5281.46, -2047.82, 1287.67, 2.44909, 0, 0, 0.940652, 0.339373 }, - {5325.45, -2189.41, 1309.6, 6.23783, 0, 0, 0.0226771, -0.999743}, - {5190.96, -2142.54, 1293.03, 6.25668, 0, 0, 0.0132544, -0.999912}, - {5089.99, -2467.49, 1441.8, 0.77381, 0, 0, 0.377326, 0.92608 }, - {5195.08, -2129.01, 1285.36, 3.55727, 0, 0, 0.978480, -0.206344}, - {5353.76, -2116.28, 1299.27, 6.17894, 0, 0, 0.0521006, -0.998642}, - {5271.14, -2037.38, 1299.24, 4.07879, 0, 0, 0.892201, -0.451638}, - {5332.5 , -2181.28, 1279.95, 4.6906, 0, 0, 0.714768, -0.699362}, - {5108.2 , -2429.84, 1427.73, 4.5194, 0, 0, 0.771943, -0.635691} + {5039.9f, -1796.84f, 1323.88f, 2.59222f, 0, 0, 0.962511f, 0.271243f}, + {5087.2f, -1795.2f, 1320.68f, 1.03946f, 0, 0, 0.496644f, 0.867954f}, + {5112.68f, -1806.66f, 1359.93f, 1.37799f, 0, 0, 0.63576f, 0.771887f}, + {5095.61f, -1793.27f, 1359.78f, 0.580806f, 0, 0, 0.286338f, 0.958129f}, + {5090.43f, -1784.45f, 1360.44f, 0.796784f, 0, 0, 0.387937f, 0.921686f}, + {5139.25f, -1783.11f, 1359.39f, 3.30849f, 0, 0, 0.99652f, -0.0833509f}, + {5112.16f, -1763.72f, 1361.35f, 5.10312f, 0, 0, 0.556388f, -0.830922f}, + {4981.18f, -1793.98f, 1335.7f, 3.23072f, 0, 0, 0.999007f, -0.0445498f}, + {4996.57f, -1766.75f, 1341.62f, 3.5331f, 0, 0, 0.980902f, -0.194505f}, + {4983.74f, -1769.25f, 1345.75f, 3.79228f, 0, 0, 0.947541f, -0.319635f}, + {4996.01f, -1774.43f, 1330.71f, 3.07364f, 0, 0, 0.999423f, 0.0339693f}, + {5094.2f, -1726.13f, 1330.55f, 1.56175f, 0, 0, 0.703901f, 0.710298f}, + {5079.82f, -1721.24f, 1336.26f, 1.18868f, 0, 0, 0.559964f, 0.828517f}, + {5077.68f, -1717.15f, 1327.78f, 0.0145145f, 0, 0, 0.00725717f, 0.999974f}, + {5122.27f, -1738.22f, 1341.67f, 0.835256f, 0, 0, 0.405593f, 0.914054f}, + {5131.88f, -1741.15f, 1335.25f, 2.15472f, 0, 0, 0.880712f, 0.473653f}, + {5196.93f, -1772.99f, 1345.2f, 0.128397f, 0, 0, 0.0641544f, 0.99794f}, + {5225.33f, -1756.06f, 1344.17f, 3.04223f, 0, 0, 0.998766f, 0.0496599f}, + {5224.84f, -1767.05f, 1360.06f, 3.19538f, 0, 0, 0.999638f, -0.0268922f}, + {5202.05f, -1763.47f, 1361.68f, 2.59455f, 0, 0, 0.962826f, 0.270122f}, + {5194.74f, -1766.66f, 1356.94f, 0.0734191f, 0, 0, 0.0367013f, 0.999326f}, + {5159.67f, -1832.97f, 1344.5f, 5.17457f, 0, 0, 0.526356f, -0.850264f}, + {5096.17f, -1858.73f, 1332.46f, 5.30021f, 0, 0, 0.471939f, -0.881631f}, + {5110.7f, -1856.59f, 1342.84f, 5.97564f, 0, 0, 0.153167f, -0.9882f}, + {5109.76f, -1855.3f, 1332.38f, 4.89572f, 0, 0, 0.639411f, -0.768865f}, + {5068.95f, -1837.37f, 1328.81f, 2.61569f, 0, 0, 0.965628f, 0.25993f}, + {5064.4f, -1824.77f, 1329.02f, 2.16409f, 0, 0, 0.88292f, 0.469524f}, + {5059.89f, -1848.79f, 1329.59f, 0.0709955f, 0, 0, 0.0354903f, 0.99937f}, + {5014.37f, -1851.39f, 1322.56f, 4.66949f, 0, 0, 0.722111f, -0.691777f}, + {5025.1f, -1848.27f, 1323.39f, 4.44565f, 0, 0, 0.794854f, -0.606801f}, + {4942.63f, -1890.13f, 1326.59f, 3.28719f, 0, 0, 0.997351f, -0.0727343f}, + {4937.95f, -1888.71f, 1352.41f, 3.41678f, 0, 0, 0.990549f, -0.13716f}, + {4922.48f, -1881.92f, 1352.41f, 5.03077f, 0, 0, 0.586075f, -0.810257f}, + {4915.35f, -1894.32f, 1351.24f, 6.22457f, 0, 0, 0.0293048f, -0.999571f}, + {4922.71f, -1904.84f, 1352.56f, 1.37866f, 0, 0, 0.63602f, 0.771672f}, + {4932.89f, -1905.49f, 1352.56f, 1.89702f, 0, 0, 0.812549f, 0.582893f}, + {5011.83f, -1861.05f, 1345.86f, 4.43777f, 0, 0, 0.797239f, -0.603664f}, + {5011.83f, -1861.05f, 1363.26f, 4.748f, 0, 0, 0.694406f, -0.719583f}, + {5021.46f, -1858.35f, 1342.17f, 4.86188f, 0, 0, 0.652329f, -0.757936f}, + {4995.02f, -1698.3f, 1370.38f, 6.15779f, 0, 0, 0.0626579f, -0.998035f}, + {5119.85f, -1728.9f, 1336.04f, 5.87112f, 0, 0, 0.204579f, -0.97885f}, + {5214.75f, -1751.02f, 1342.5f, 5.08965f, 0, 0, 0.561972f, -0.827156f}, + {5075.04f, -1822.43f, 1328.87f, 3.99951f, 0, 0, 0.9094f, -0.415924f}, + {5057.09f, -1823.32f, 1350.35f, 3.88169f, 0, 0, 0.93231f, -0.361659f}, + {4984.6f, -1816.99f, 1329.21f, 3.05308f, 0, 0, 0.999021f, 0.0442417f}, + {4983.35f, -1811.55f, 1356.82f, 3.33975f, 0, 0, 0.995096f, -0.098917f}, + {4984.11f, -1825.73f, 1350.76f, 2.26375f, 0, 0, 0.905211f, 0.424962f}, + {4968.47f, -1786.46f, 1354.09f, 3.07663f, 0, 0, 0.999473f, 0.0324733f}, + {5061.82f, -1751.16f, 1339.07f, 5.94727f, 0, 0, 0.167171f, -0.985928f}, + {5063.75f, -1763, 1351.91f, 0.759707f, 0, 0, 0.370784f, 0.928719f}, + {5078.65f, -1708.26f, 1353.9f, 1.27022f, 0, 0, 0.593264f, 0.805008f}, + {4983.19f, -1755.96f, 1331.13f, 4.28221f, 0, 0, 0.841733f, -0.539894f}, + {4972.76f, -1755.3f, 1332.5f, 4.21938f, 0, 0, 0.858276f, -0.513188f}, + {4961.65f, -1760.82f, 1351.69f, 3.56515f, 0, 0, 0.977659f, -0.210198f}, + {5086.45f, -1779.83f, 1321.62f, 6.23157f, 0, 0, 0.0258051f, -0.999667f}, + {5063.15f, -1756.74f, 1328.56f, 0.886926f, 0, 0, 0.42907f, 0.903271f}, + {5042.45f, -1800.61f, 1323.88f, 2.50093f, 0, 0, 0.949131f, 0.31488f}, + {5084.74f, -1725.35f, 1327.89f, 1.65034f, 0, 0, 0.734663f, 0.678432f}, + {4993.25f, -1758.1f, 1331.07f, 3.49995f, 0, 0, 0.98399f, -0.178223f}, + {5078.53f, -1867.85f, 1348.91f, 5.85612f, 0, 0, 0.211913f, -0.977288f}, + {5080.74f, -1869.73f, 1333.18f, 6.18206f, 0, 0, 0.0505424f, -0.998722f}, + {5089.55f, -1894.13f, 1356.08f, 1.52072f, 0, 0, 0.689181f, 0.724589f}, + {5113.24f, -1899.49f, 1363.77f, 1.50108f, 0, 0, 0.682034f, 0.731321f}, + {4984.18f, -1907.69f, 1325.62f, 3.82193f, 0, 0, 0.942698f, -0.333646f}, + {5094.14f, -2432.08f, 1429.38f, 4.70083f, 0, 0, 0.711182f, -0.703007f}, + {5329.89f, -2113.30f, 1281.06f, 5.60560f, 0, 0, 0.332347f, -0.943157f}, + {5170.87f, -2148.13f, 1278.32f, 1.63540f, 0, 0, 0.729573f, 0.683903f }, + {5132.94f, -1960.25f, 1367.8f, 3.69787f, 0, 0, 0.961568f, -0.274566f}, + {5280.82f, -2351.55f, 1431.57f, 4.46913f, 0, 0, 0.787677f, -0.616088f}, + {5176.78f, -2121.43f, 1295.27f, 3.24153f, 0, 0, 0.998752f, -0.04995f}, + {5332.75f, -2101.41f, 1296.37f, 5.50350f, 0, 0, 0.380043f, -0.924969f}, + {5265.70f, -2050.27f, 1287.57f, 0.50051f, 0, 0, 0.247655f, 0.968848f }, + {5194.21f, -2129.89f, 1274.04f, 3.08053f, 0, 0, 0.999534f, 0.0305272f}, + {5225.81f, -1985.50f, 1364.15f, 0.37247f, 0, 0, 0.185163f, 0.982708f }, + {5339.46f, -2204.47f, 1280.45f, 0.99921f, 0, 0, 0.479081f, 0.877771f }, + {5269.63f, -2020.57f, 1299.62f, 3.00201f, 0, 0, 0.997566f, 0.0697332f}, + {5111.54f, -2445.70f, 1435.31f, 2.70983f, 0, 0, 0.976788f, 0.214207f }, + {5111.24f, -1901.14f, 1355.33f, 1.61028f, 0, 0, 0.720929f, 0.693009f }, + {5310.42f, -2207.82f, 1277.46f, 0.50441f, 0, 0, 0.249544f, 0.968363f }, + {5150.81f, -2042.13f, 1394.3f, 2.21031f, 0, 0, 0.893534f, 0.448995f }, + {5224.84f, -2376.61f, 1366.33f, 5.0621f, 0, 0, 0.573311f, -0.819338f}, + {5105.41f, -2454.86f, 1446.16f, 4.64584f, 0, 0, 0.730239f, -0.683191f}, + {5309.65f, -2188.28f, 1266.84f, 5.56631f, 0, 0, 0.350811f, -0.936446f}, + {5281.46f, -2047.82f, 1287.67f, 2.44909f, 0, 0, 0.940652f, 0.339373f }, + {5325.45f, -2189.41f, 1309.6f, 6.23783f, 0, 0, 0.0226771f, -0.999743f}, + {5190.96f, -2142.54f, 1293.03f, 6.25668f, 0, 0, 0.0132544f, -0.999912f}, + {5089.99f, -2467.49f, 1441.8f, 0.77381f, 0, 0, 0.377326f, 0.92608f }, + {5195.08f, -2129.01f, 1285.36f, 3.55727f, 0, 0, 0.978480f, -0.206344f}, + {5353.76f, -2116.28f, 1299.27f, 6.17894f, 0, 0, 0.0521006f, -0.998642f}, + {5271.14f, -2037.38f, 1299.24f, 4.07879f, 0, 0, 0.892201f, -0.451638f}, + {5332.5f , -2181.28f, 1279.95f, 4.6906f, 0, 0, 0.714768f, -0.699362f}, + {5108.2f , -2429.84f, 1427.73f, 4.5194f, 0, 0, 0.771943f, -0.635691f} }; float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde base { - {5524.11, -2612.73, 1483.38, 1.96198, 0, 0, 0.831047, 0.556202}, - {5514.42, -2617.19, 1505.77, 1.82453, 0, 0, 0.790892, 0.611956}, - {5510.21, -2624.77, 1485.34, 1.71065, 0, 0, 0.754783, 0.655974}, - {5570.72, -2619.04, 1487.62, 0.728898, 0, 0, 0.356435, 0.93432}, - {5570.29, -2639.37, 1487.31, 1.49308, 0, 0, 0.679104, 0.734042}, - {5583.56, -2637.2, 1503.78, 1.46559, 0, 0, 0.668951, 0.743307}, - {5571.53, -2626.81, 1510.99, 0.362107, 0, 0, 0.180066, 0.983654}, - {5545.97, -2659.62, 1489.64, 5.07055, 0, 0, 0.569845, -0.821752}, - {5557.44, -2675.91, 1482.58, 1.70118, 0, 0, 0.751671, 0.659539}, - {5594.98, -2742.31, 1495.51, 4.5993, 0, 0, 0.74594, -0.666013}, - {5599.65, -2755.6, 1505.05, 1.66896, 0, 0, 0.740947, 0.671564}, - {5565.95, -2774.75, 1499.48, 6.22425, 0, 0, 0.0294611, -0.999566}, - {5567.1, -2769.7, 1511.17, 5.99257, 0, 0, 0.144799, -0.989461}, - {5572.84, -2774.16, 1527.06, 0.836428, 0, 0, 0.406129, 0.913816}, - {5538.32, -2805.94, 1498.87, 4.30082, 0, 0, 0.836674, -0.547701}, - {5515.66, -2801.74, 1503.53, 5.57316, 0, 0, 0.347602, -0.937642}, - {5516.76, -2827.14, 1501.15, 0.35026, 0, 0, 0.174236, 0.984704}, - {5536.13, -2813.51, 1537.21, 4.51681, 0, 0, 0.772765, -0.634692}, - {5525.05, -2825.16, 1538.53, 0.489275, 0, 0, 0.242205, 0.970225}, - {5534.42, -2815.45, 1562.84, 4.62834, 0, 0, 0.736191, -0.676774}, - {5519.64, -2831.12, 1526.46, 0.611008, 0, 0, 0.300774, 0.953696}, - {5551.04, -2827.55, 1523.5, 3.35206, 0, 0, 0.994468, -0.10504}, - {5469.22, -2802.87, 1503.5, 4.99509, 0, 0, 0.600436, -0.799673}, - {5427.8, -2737.26, 1487.12, 1.78673, 0, 0, 0.779186, 0.626793}, - {5454.1, -2709.1, 1485.92, 3.03552, 0, 0, 0.998594, 0.0530137}, - {5436.3, -2718.2, 1506.02, 2.7567, 0, 0, 0.981539, 0.191261}, - {5412.6, -2740.55, 1510.79, 2.98446, 0, 0, 0.996915, 0.0784832}, - {5406.12, -2752.48, 1521.01, 2.05769, 0, 0, 0.856705, 0.515807}, - {5445.24, -2676.35, 1521.89, 2.91378, 0, 0, 0.99352, 0.113661}, - {5481.4, -2665.08, 1482.23, 4.30001, 0, 0, 0.836895, -0.547363}, - {5443.51, -2675.44, 1487.12, 2.90986, 0, 0, 0.993295, 0.115606}, - {5391.72, -2647.3, 1528.9, 3.76987, 0, 0, 0.951063, -0.308997}, - {5421.09, -2734.12, 1521.01, 2.70567, 0, 0, 0.97634, 0.216242}, - {5405.39, -2710.33, 1533.77, 2.51324, 0, 0, 0.951052, 0.309032}, - {5423.96, -2703.76, 1516.34, 2.79206, 0, 0, 0.984767, 0.173879}, - {5444.75, -2735.23, 1486.37, 2.22657, 0, 0, 0.897155, 0.441715}, - {5570.98, -2747.91, 1495.7, 5.14433, 0, 0, 0.53915, -0.84221}, - {5567.79, -2673.9, 1484.66, 2.72529, 0, 0, 0.978415, 0.20665}, - {5600.71, -2696.8, 1500.42, 0.443704, 0, 0, 0.220036, 0.975492}, - {5600.7, -2693.04, 1515.2, 5.16003, 0, 0, 0.532522, -0.846416}, - {5627.56, -2839.66, 1510.53, 5.41527, 0, 0, 0.420463, -0.907309}, - {5622.02, -2868.71, 1516.22, 2.25482, 0, 0, 0.903303, 0.429002}, - {5586.61, -2878.97, 1510.34, 4.55604, 0, 0, 0.76017, -0.649724}, - {5583.78, -2843.71, 1509.54, 5.35715, 0, 0, 0.44665, -0.894709}, - {5580.95, -2811.3, 1513.3, 3.57587, 0, 0, 0.976518, -0.215434}, - {5542.52, -2869.31, 1523.13, 5.23304, 0, 0, 0.501275, -0.865288}, - {5557.35, -2866.36, 1518.76, 4.48299, 0, 0, 0.783388, -0.621533}, - {5380.91, -2849.36, 1512.81, 3.90962, 0, 0, 0.927168, -0.374646}, - {5395.76, -2881.41, 1521.11, 4.28426, 0, 0, 0.84118, -0.540755}, - {5374.87, -2859.63, 1528.98, 3.30252, 0, 0, 0.996765, -0.0803745}, - {5356.07, -2854.66, 1520.34, 5.83933, 0, 0, 0.220108, -0.975475}, - {5363.01, -2975.72, 1539.02, 4.13738, 0, 0, 0.87859, -0.477576}, - {5336.85, -2980.74, 1561.24, 5.11126, 0, 0, 0.553001, -0.83318}, - {5335.23, -2974.62, 1540.05, 5.04451, 0, 0, 0.580496, -0.814263}, - {5422.37, -2998.87, 1549.98, 4.51831, 0, 0, 0.772288, -0.635272}, - {5405.54, -3014.6, 1562.16, 5.86761, 0, 0, 0.206298, -0.978489}, - {5427.96, -3019.4, 1561.58, 3.53498, 0, 0, 0.980718, -0.19543}, - {5348.12, -2977.84, 1582.47, 3.94025, 0, 0, 0.921323, -0.388799}, - {5331.12, -2993.71, 1576.14, 0.0642734, 0, 0, 0.0321311, 0.999484}, - {5321.63, -2986.55, 1552.2, 5.29503, 0, 0, 0.474219, -0.880407}, - {5292.1, -2914.36, 1529.52, 2.9742, 0, 0, 0.996499, 0.083601}, - {5281.77, -2926.5, 1530.62, 1.67829, 0, 0, 0.744071, 0.6681}, - {5287.19, -2909.94, 1543.49, 3.31192, 0, 0, 0.996376, -0.0850591}, - {5534.15, -2679.35, 1483.61, 0.428685, 0, 0, 0.212705, 0.977116}, - {5545.43, -2647.82, 1483.05, 5.38848, 0, 0, 0.432578, -0.901596} + {5524.11f, -2612.73f, 1483.38f, 1.96198f, 0, 0, 0.831047f, 0.556202f}, + {5514.42f, -2617.19f, 1505.77f, 1.82453f, 0, 0, 0.790892f, 0.611956f}, + {5510.21f, -2624.77f, 1485.34f, 1.71065f, 0, 0, 0.754783f, 0.655974f}, + {5570.72f, -2619.04f, 1487.62f, 0.728898f, 0, 0, 0.356435f, 0.93432f}, + {5570.29f, -2639.37f, 1487.31f, 1.49308f, 0, 0, 0.679104f, 0.734042f}, + {5583.56f, -2637.2f, 1503.78f, 1.46559f, 0, 0, 0.668951f, 0.743307f}, + {5571.53f, -2626.81f, 1510.99f, 0.362107f, 0, 0, 0.180066f, 0.983654f}, + {5545.97f, -2659.62f, 1489.64f, 5.07055f, 0, 0, 0.569845f, -0.821752f}, + {5557.44f, -2675.91f, 1482.58f, 1.70118f, 0, 0, 0.751671f, 0.659539f}, + {5594.98f, -2742.31f, 1495.51f, 4.5993f, 0, 0, 0.74594f, -0.666013f}, + {5599.65f, -2755.6f, 1505.05f, 1.66896f, 0, 0, 0.740947f, 0.671564f}, + {5565.95f, -2774.75f, 1499.48f, 6.22425f, 0, 0, 0.0294611f, -0.999566f}, + {5567.1f, -2769.7f, 1511.17f, 5.99257f, 0, 0, 0.144799f, -0.989461f}, + {5572.84f, -2774.16f, 1527.06f, 0.836428f, 0, 0, 0.406129f, 0.913816f}, + {5538.32f, -2805.94f, 1498.87f, 4.30082f, 0, 0, 0.836674f, -0.547701f}, + {5515.66f, -2801.74f, 1503.53f, 5.57316f, 0, 0, 0.347602f, -0.937642f}, + {5516.76f, -2827.14f, 1501.15f, 0.35026f, 0, 0, 0.174236f, 0.984704f}, + {5536.13f, -2813.51f, 1537.21f, 4.51681f, 0, 0, 0.772765f, -0.634692f}, + {5525.05f, -2825.16f, 1538.53f, 0.489275f, 0, 0, 0.242205f, 0.970225f}, + {5534.42f, -2815.45f, 1562.84f, 4.62834f, 0, 0, 0.736191f, -0.676774f}, + {5519.64f, -2831.12f, 1526.46f, 0.611008f, 0, 0, 0.300774f, 0.953696f}, + {5551.04f, -2827.55f, 1523.5f, 3.35206f, 0, 0, 0.994468f, -0.10504f}, + {5469.22f, -2802.87f, 1503.5f, 4.99509f, 0, 0, 0.600436f, -0.799673f}, + {5427.8f, -2737.26f, 1487.12f, 1.78673f, 0, 0, 0.779186f, 0.626793f}, + {5454.1f, -2709.1f, 1485.92f, 3.03552f, 0, 0, 0.998594f, 0.0530137f}, + {5436.3f, -2718.2f, 1506.02f, 2.7567f, 0, 0, 0.981539f, 0.191261f}, + {5412.6f, -2740.55f, 1510.79f, 2.98446f, 0, 0, 0.996915f, 0.0784832f}, + {5406.12f, -2752.48f, 1521.01f, 2.05769f, 0, 0, 0.856705f, 0.515807f}, + {5445.24f, -2676.35f, 1521.89f, 2.91378f, 0, 0, 0.99352f, 0.113661f}, + {5481.4f, -2665.08f, 1482.23f, 4.30001f, 0, 0, 0.836895f, -0.547363f}, + {5443.51f, -2675.44f, 1487.12f, 2.90986f, 0, 0, 0.993295f, 0.115606f}, + {5391.72f, -2647.3f, 1528.9f, 3.76987f, 0, 0, 0.951063f, -0.308997f}, + {5421.09f, -2734.12f, 1521.01f, 2.70567f, 0, 0, 0.97634f, 0.216242f}, + {5405.39f, -2710.33f, 1533.77f, 2.51324f, 0, 0, 0.951052f, 0.309032f}, + {5423.96f, -2703.76f, 1516.34f, 2.79206f, 0, 0, 0.984767f, 0.173879f}, + {5444.75f, -2735.23f, 1486.37f, 2.22657f, 0, 0, 0.897155f, 0.441715f}, + {5570.98f, -2747.91f, 1495.7f, 5.14433f, 0, 0, 0.53915f, -0.84221f}, + {5567.79f, -2673.9f, 1484.66f, 2.72529f, 0, 0, 0.978415f, 0.20665f}, + {5600.71f, -2696.8f, 1500.42f, 0.443704f, 0, 0, 0.220036f, 0.975492f}, + {5600.7f, -2693.04f, 1515.2f, 5.16003f, 0, 0, 0.532522f, -0.846416f}, + {5627.56f, -2839.66f, 1510.53f, 5.41527f, 0, 0, 0.420463f, -0.907309f}, + {5622.02f, -2868.71f, 1516.22f, 2.25482f, 0, 0, 0.903303f, 0.429002f}, + {5586.61f, -2878.97f, 1510.34f, 4.55604f, 0, 0, 0.76017f, -0.649724f}, + {5583.78f, -2843.71f, 1509.54f, 5.35715f, 0, 0, 0.44665f, -0.894709f}, + {5580.95f, -2811.3f, 1513.3f, 3.57587f, 0, 0, 0.976518f, -0.215434f}, + {5542.52f, -2869.31f, 1523.13f, 5.23304f, 0, 0, 0.501275f, -0.865288f}, + {5557.35f, -2866.36f, 1518.76f, 4.48299f, 0, 0, 0.783388f, -0.621533f}, + {5380.91f, -2849.36f, 1512.81f, 3.90962f, 0, 0, 0.927168f, -0.374646f}, + {5395.76f, -2881.41f, 1521.11f, 4.28426f, 0, 0, 0.84118f, -0.540755f}, + {5374.87f, -2859.63f, 1528.98f, 3.30252f, 0, 0, 0.996765f, -0.0803745f}, + {5356.07f, -2854.66f, 1520.34f, 5.83933f, 0, 0, 0.220108f, -0.975475f}, + {5363.01f, -2975.72f, 1539.02f, 4.13738f, 0, 0, 0.87859f, -0.477576f}, + {5336.85f, -2980.74f, 1561.24f, 5.11126f, 0, 0, 0.553001f, -0.83318f}, + {5335.23f, -2974.62f, 1540.05f, 5.04451f, 0, 0, 0.580496f, -0.814263f}, + {5422.37f, -2998.87f, 1549.98f, 4.51831f, 0, 0, 0.772288f, -0.635272f}, + {5405.54f, -3014.6f, 1562.16f, 5.86761f, 0, 0, 0.206298f, -0.978489f}, + {5427.96f, -3019.4f, 1561.58f, 3.53498f, 0, 0, 0.980718f, -0.19543f}, + {5348.12f, -2977.84f, 1582.47f, 3.94025f, 0, 0, 0.921323f, -0.388799f}, + {5331.12f, -2993.71f, 1576.14f, 0.0642734f, 0, 0, 0.0321311f, 0.999484f}, + {5321.63f, -2986.55f, 1552.2f, 5.29503f, 0, 0, 0.474219f, -0.880407f}, + {5292.1f, -2914.36f, 1529.52f, 2.9742f, 0, 0, 0.996499f, 0.083601f}, + {5281.77f, -2926.5f, 1530.62f, 1.67829f, 0, 0, 0.744071f, 0.6681f}, + {5287.19f, -2909.94f, 1543.49f, 3.31192f, 0, 0, 0.996376f, -0.0850591f}, + {5534.15f, -2679.35f, 1483.61f, 0.428685f, 0, 0, 0.212705f, 0.977116f}, + {5545.43f, -2647.82f, 1483.05f, 5.38848f, 0, 0, 0.432578f, -0.901596f} }; hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) @@ -758,7 +758,7 @@ void hyjalAI::UpdateAI(const uint32 diff) { me->SetVisibility(VISIBILITY_OFF); HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5037.76, -1889.71); + HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); @@ -770,8 +770,8 @@ void hyjalAI::UpdateAI(const uint32 diff) { me->SetVisibility(VISIBILITY_OFF); HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); + HideNearPos(5563, -2763.19f); + HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); @@ -788,11 +788,11 @@ void hyjalAI::UpdateAI(const uint32 diff) RespawnNearPos(me->GetPositionX(), me->GetPositionY()); if (Faction == 0) { - RespawnNearPos(5037.76, -1889.71); + RespawnNearPos(5037.76f, -1889.71f); } else if (Faction == 1) { - RespawnNearPos(5563, -2763.19); - RespawnNearPos(5542.2, -2629.36); + RespawnNearPos(5563, -2763.19f); + RespawnNearPos(5542.2f, -2629.36f); } me->SetVisibility(VISIBILITY_ON); }else{ @@ -813,12 +813,12 @@ void hyjalAI::UpdateAI(const uint32 diff) switch(me->GetEntry()) { case JAINA://jaina - HideNearPos(5037.76, -1889.71); + HideNearPos(5037.76f, -1889.71f); break; case THRALL://thrall - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); - HideNearPos(5603.75, -2853.12); + HideNearPos(5563, -2763.19f); + HideNearPos(5542.2f, -2629.36f); + HideNearPos(5603.75f, -2853.12f); break; } me->SetVisibility(VISIBILITY_OFF); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 584fef4f05e..dfc86bee83c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -28,131 +28,131 @@ float HordeWPs[8][3]=//basic waypoints from spawn to leader { - {5492.91, -2404.61, 1462.63}, - {5531.76, -2460.87, 1469.55}, - {5554.58, -2514.66, 1476.12}, - {5554.16, -2567.23, 1479.90}, - {5540.67, -2625.99, 1480.89}, - {5508.16, -2659.20, 1480.15},//random rush starts from here - {5489.62, -2704.05, 1482.18}, - {5457.04, -2726.26, 1485.10} + {5492.91f, -2404.61f, 1462.63f}, + {5531.76f, -2460.87f, 1469.55f}, + {5554.58f, -2514.66f, 1476.12f}, + {5554.16f, -2567.23f, 1479.90f}, + {5540.67f, -2625.99f, 1480.89f}, + {5508.16f, -2659.20f, 1480.15f},//random rush starts from here + {5489.62f, -2704.05f, 1482.18f}, + {5457.04f, -2726.26f, 1485.10f} }; float AllianceWPs[8][3]=//basic waypoints from spawn to leader { - {4896.08, -1576.35, 1333.65}, - {4898.68, -1615.02, 1329.48}, - {4907.12, -1667.08, 1321.00}, - {4963.18, -1699.35, 1340.51}, - {4989.16, -1716.67, 1335.74},//first WP in the base, after the gate - {5026.27, -1736.89, 1323.02}, - {5037.77, -1770.56, 1324.36}, - {5067.23, -1789.95, 1321.17} + {4896.08f, -1576.35f, 1333.65f}, + {4898.68f, -1615.02f, 1329.48f}, + {4907.12f, -1667.08f, 1321.00f}, + {4963.18f, -1699.35f, 1340.51f}, + {4989.16f, -1716.67f, 1335.74f},//first WP in the base, after the gate + {5026.27f, -1736.89f, 1323.02f}, + {5037.77f, -1770.56f, 1324.36f}, + {5067.23f, -1789.95f, 1321.17f} }; float FrostWyrmWPs[3][3]=//waypoints for the frost wyrms in horde base { - {5580.82, -2628.83, 1528.28}, - {5550.90, -2667.16, 1505.45}, - {5459.64, -2725.91, 1484.83} + {5580.82f, -2628.83f, 1528.28f}, + {5550.90f, -2667.16f, 1505.45f}, + {5459.64f, -2725.91f, 1484.83f} }; float GargoyleWPs[3][3]=//waypoints for the gargoyles in horde base { - {5533.66, -2634.32, 1495.33}, - {5517.88, -2712.05, 1490.54}, - {5459.64, -2725.91, 1484.83} + {5533.66f, -2634.32f, 1495.33f}, + {5517.88f, -2712.05f, 1490.54f}, + {5459.64f, -2725.91f, 1484.83f} }; float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde base in wave 1/3 { - {5531.96, -2772.83, 1516.68}, - {5498.32, -2734.84, 1497.01}, - {5456.67, -2725.48, 1493.08} + {5531.96f, -2772.83f, 1516.68f}, + {5498.32f, -2734.84f, 1497.01f}, + {5456.67f, -2725.48f, 1493.08f} }; float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave { - {4976.37,-1708.02,1339.43},//0spawn - {4994.83,-1725.52,1333.25},//1 start - {4982.92,-1753.7,1330.69},//2 end - {4996.75,-1721.47,1332.95},//3 start - {5015.74,-1755.05,1322.49},//4 - {4998.68,-1773.44,1329.59},//5 - {4994.83,-1725.52,1333.25},//6 start - {5022.8,-1735.46,1323.53},//7 - {5052.15,-1729.02,1320.88},//8 - {5082.43,-1726.29,1327.87},//9 - {4994.83,-1725.52,1333.25},//10 start - {5018.92,-1751.14,1322.19},//11 - {5040.09,-1792.09,1322.1},//12 - {4994.83,-1725.52,1333.25},//13 start - {5023.47,-1748.1,1322.51},//14 - {5013.43,-1842.39,1322.07},//15 - {4994.83,-1725.52,1333.25},//16 start - {5020.8,-1756.86,1322.2},//17 - {5019.53,-1824.6,1321.96},//18 - {5043.42,-1853.75,1324.52},//19 - {5053.02,-1864.13,1330.36},//20 - {5062.49,-1852.47,1330.49},//21 - {5015.27, -1738.77, 1324.83},//35//start 22 - {5027.97, -1775.25, 1321.87},//34 23 - {5015.94, -1821.24, 1321.86},//33 24 - {4983.25, -1857.4, 1320.48},//32 25 - {4981.51, -1883.7, 1322.34},//31 26 - {5002.33, -1893.98, 1325.88},//30 27 - {5049.32, -1886.54, 1331.69},//29 28 - {5089.68, -1846.88, 1328.99},//28 29 - {5127.90, -1825.14, 1335.58},//27 30 - {5163.27, -1789.08, 1337.04},//26 31 - {5138.97, -1755.88, 1334.57},//25 32 - {5096.63, -1742.22, 1329.61},//24 33 - {5065.81, -1729.43, 1325.66},//23 34 - {5049.32, -1726.31, 1320.64},//22 start - {5081.07, -1902.10, 1346.36},//36 abo start - {5107.65, -1912.03, 1356.49},//37 - {5132.83, -1927.07, 1362.42},//38 - {5147.78, -1954.41, 1365.98},//39 - {5164.96, -1966.48, 1367.04},//40 - {5189.04, -1961.06, 1367.90},//41 - {5212.27, -1975.30, 1365.58},//42 - {5221.82, -1994.18, 1364.97},//43 end1 - {5202.23, -1994.94, 1367.59},//44 end2 - {5279.94, -2049.68, 1311.38},//45 garg1 - {5289.15, -2219.06, 1291.12},//46 garg2 - {5202.07, -2136.10, 1305.07},//47 garg3 - {5071.52, -2425.63, 1454.48},//48 garg4 - {5120.65, -2467.92, 1463.93},//49 garg5 - {5283.04, -2043.26, 1300.11},//50 garg target1 - {5313.22, -2207.60, 1290.06},//51 garg target2 - {5180.41, -2121.87, 1292.62},//52 garg target3 - {5088.68, -2432.04, 1441.73},//53 garg target4 - {5111.26, -2454.73, 1449.63}//54 garg target5 + {4976.37f,-1708.02f,1339.43f},//0spawn + {4994.83f,-1725.52f,1333.25f},//1 start + {4982.92f,-1753.7f,1330.69f},//2 end + {4996.75f,-1721.47f,1332.95f},//3 start + {5015.74f,-1755.05f,1322.49f},//4 + {4998.68f,-1773.44f,1329.59f},//5 + {4994.83f,-1725.52f,1333.25f},//6 start + {5022.8f,-1735.46f,1323.53f},//7 + {5052.15f,-1729.02f,1320.88f},//8 + {5082.43f,-1726.29f,1327.87f},//9 + {4994.83f,-1725.52f,1333.25f},//10 start + {5018.92f,-1751.14f,1322.19f},//11 + {5040.09f,-1792.09f,1322.1f},//12 + {4994.83f,-1725.52f,1333.25f},//13 start + {5023.47f,-1748.1f,1322.51f},//14 + {5013.43f,-1842.39f,1322.07f},//15 + {4994.83f,-1725.52f,1333.25f},//16 start + {5020.8f,-1756.86f,1322.2f},//17 + {5019.53f,-1824.6f,1321.96f},//18 + {5043.42f,-1853.75f,1324.52f},//19 + {5053.02f,-1864.13f,1330.36f},//20 + {5062.49f,-1852.47f,1330.49f},//21 + {5015.27f, -1738.77f, 1324.83f},//35//start 22 + {5027.97f, -1775.25f, 1321.87f},//34 23 + {5015.94f, -1821.24f, 1321.86f},//33 24 + {4983.25f, -1857.4f, 1320.48f},//32 25 + {4981.51f, -1883.7f, 1322.34f},//31 26 + {5002.33f, -1893.98f, 1325.88f},//30 27 + {5049.32f, -1886.54f, 1331.69f},//29 28 + {5089.68f, -1846.88f, 1328.99f},//28 29 + {5127.90f, -1825.14f, 1335.58f},//27 30 + {5163.27f, -1789.08f, 1337.04f},//26 31 + {5138.97f, -1755.88f, 1334.57f},//25 32 + {5096.63f, -1742.22f, 1329.61f},//24 33 + {5065.81f, -1729.43f, 1325.66f},//23 34 + {5049.32f, -1726.31f, 1320.64f},//22 start + {5081.07f, -1902.10f, 1346.36f},//36 abo start + {5107.65f, -1912.03f, 1356.49f},//37 + {5132.83f, -1927.07f, 1362.42f},//38 + {5147.78f, -1954.41f, 1365.98f},//39 + {5164.96f, -1966.48f, 1367.04f},//40 + {5189.04f, -1961.06f, 1367.90f},//41 + {5212.27f, -1975.30f, 1365.58f},//42 + {5221.82f, -1994.18f, 1364.97f},//43 end1 + {5202.23f, -1994.94f, 1367.59f},//44 end2 + {5279.94f, -2049.68f, 1311.38f},//45 garg1 + {5289.15f, -2219.06f, 1291.12f},//46 garg2 + {5202.07f, -2136.10f, 1305.07f},//47 garg3 + {5071.52f, -2425.63f, 1454.48f},//48 garg4 + {5120.65f, -2467.92f, 1463.93f},//49 garg5 + {5283.04f, -2043.26f, 1300.11f},//50 garg target1 + {5313.22f, -2207.60f, 1290.06f},//51 garg target2 + {5180.41f, -2121.87f, 1292.62f},//52 garg target3 + {5088.68f, -2432.04f, 1441.73f},//53 garg target4 + {5111.26f, -2454.73f, 1449.63f}//54 garg target5 }; float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave { - {5490.72,-2702.94,1482.14},//0 start - {5469.77,-2741.34,1486.95}, - {5439.47,-2771.02,1494.59}, - {5408.85,-2811.92,1505.68}, - {5423.87,-2857.80,1515.55}, - {5428.19,-2898.15,1524.61}, - {5394.59,-2930.05,1528.23}, - {5351.11,-2935.80,1532.24}, - {5312.37,-2959.06,1536.21}, - {5264.93,-2989.80,1545.70}, - {5256.63,-3056.16,1559.24}, - {5267.32,-3119.55,1575.36}, - {5305.61,-3139.88,1586.38}, - {5330.56,-3135.37,1588.58}, - {5365.87,-3139.78,1583.96}, - {5389.39,-3163.57,1582.57},//15 end - {5500.86,-2669.89,1481.04},//16 start - {5472.08,-2715.14,1483.55}, - {5450.11,-2721.47,1485.61}, - {5433.25,-2712.93,1493.02},//19 end 1 - {5429.91,-2718.44,1493.42}//20 end 2 + {5490.72f,-2702.94f,1482.14f},//0 start + {5469.77f,-2741.34f,1486.95f}, + {5439.47f,-2771.02f,1494.59f}, + {5408.85f,-2811.92f,1505.68f}, + {5423.87f,-2857.80f,1515.55f}, + {5428.19f,-2898.15f,1524.61f}, + {5394.59f,-2930.05f,1528.23f}, + {5351.11f,-2935.80f,1532.24f}, + {5312.37f,-2959.06f,1536.21f}, + {5264.93f,-2989.80f,1545.70f}, + {5256.63f,-3056.16f,1559.24f}, + {5267.32f,-3119.55f,1575.36f}, + {5305.61f,-3139.88f,1586.38f}, + {5330.56f,-3135.37f,1588.58f}, + {5365.87f,-3139.78f,1583.96f}, + {5389.39f,-3163.57f,1582.57f},//15 end + {5500.86f,-2669.89f,1481.04f},//16 start + {5472.08f,-2715.14f,1483.55f}, + {5450.11f,-2721.47f,1485.61f}, + {5433.25f,-2712.93f,1493.02f},//19 end 1 + {5429.91f,-2718.44f,1493.42f}//20 end 2 }; hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) @@ -436,7 +436,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -477,7 +477,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -564,11 +564,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -670,11 +670,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -785,11 +785,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -902,11 +902,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1004,11 +1004,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1097,11 +1097,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); } } } @@ -1193,7 +1193,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); DoCast(pTarget, SPELL_FROST_BREATH, true); } } @@ -1302,7 +1302,7 @@ public: void Reset() { forcemove = true; - Zpos = 10.0; + Zpos = 10.0f; StrikeTimer = 2000+rand()%5000; MoveTimer = 0; me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); @@ -1316,7 +1316,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0); + me->AddThreat(pTarget,0.0f); DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } @@ -1389,7 +1389,7 @@ public: float x,y,z; me->getVictim()->GetPosition(x,y,z); me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); - Zpos-=1.0; + Zpos-=1.0f; if (Zpos <= 0)Zpos=0; MoveTimer = 2000; } else MoveTimer-=diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index af05690362e..d1bec246942 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -137,59 +137,59 @@ enum float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= { { - {NPC_ZOMBIE, 2164.698975, 1255.392944, 135.040878, 0.490202}, - {NPC_ZOMBIE, 2183.501465, 1263.079102, 134.859055, 3.169981}, - {NPC_GHOUL, 2177.512939, 1247.313843, 135.846695, 1.696574}, - {NPC_GHOUL, 2171.991943, 1246.615845, 135.745026, 1.696574}, + {NPC_ZOMBIE, 2164.698975f, 1255.392944f, 135.040878f, 0.490202f}, + {NPC_ZOMBIE, 2183.501465f, 1263.079102f, 134.859055f, 3.169981f}, + {NPC_GHOUL, 2177.512939f, 1247.313843f, 135.846695f, 1.696574f}, + {NPC_GHOUL, 2171.991943f, 1246.615845f, 135.745026f, 1.696574f}, {0, 0, 0, 0, 0} }, { - {NPC_GHOUL, 2254.434326, 1163.427612, 138.055038, 2.077358}, - {NPC_GHOUL, 2254.703613, 1158.867798, 138.212234, 2.345532}, - {NPC_GHOUL, 2257.615723, 1162.310913, 138.091202, 2.077358}, - {NPC_NECROMANCER, 2258.258057, 1157.250732, 138.272873, 2.387766}, + {NPC_GHOUL, 2254.434326f, 1163.427612f, 138.055038f, 2.077358f}, + {NPC_GHOUL, 2254.703613f, 1158.867798f, 138.212234f, 2.345532f}, + {NPC_GHOUL, 2257.615723f, 1162.310913f, 138.091202f, 2.077358f}, + {NPC_NECROMANCER, 2258.258057f, 1157.250732f, 138.272873f, 2.387766f}, {0, 0, 0, 0, 0} }, { - {NPC_STALKER, 2348.120117, 1202.302490, 130.491104, 4.698538}, - {NPC_GHOUL, 2352.863525, 1207.819092, 130.424271, 4.949865}, - {NPC_GHOUL, 2343.593750, 1207.915039, 130.781311, 4.321547}, - {NPC_NECROMANCER, 2348.257324, 1212.202515, 130.670135, 4.450352}, + {NPC_STALKER, 2348.120117f, 1202.302490f, 130.491104f, 4.698538f}, + {NPC_GHOUL, 2352.863525f, 1207.819092f, 130.424271f, 4.949865f}, + {NPC_GHOUL, 2343.593750f, 1207.915039f, 130.781311f, 4.321547f}, + {NPC_NECROMANCER, 2348.257324f, 1212.202515f, 130.670135f, 4.450352f}, {0, 0, 0, 0, 0} }, { - {NPC_STALKER, 2139.825195, 1356.277100, 132.199615, 5.820131}, - {NPC_GHOUL, 2137.073486, 1362.464844, 132.271637, 5.820131}, - {NPC_GHOUL, 2134.075684, 1354.148071, 131.885864, 5.820131}, - {NPC_NECROMANCER, 2133.302246, 1358.907837, 132.037689, 5.820131}, + {NPC_STALKER, 2139.825195f, 1356.277100f, 132.199615f, 5.820131f}, + {NPC_GHOUL, 2137.073486f, 1362.464844f, 132.271637f, 5.820131f}, + {NPC_GHOUL, 2134.075684f, 1354.148071f, 131.885864f, 5.820131f}, + {NPC_NECROMANCER, 2133.302246f, 1358.907837f, 132.037689f, 5.820131f}, {0, 0, 0, 0, 0} }, { - {NPC_NECROMANCER, 2264.013428, 1174.055908, 138.093094, 2.860481}, - {NPC_GHOUL, 2264.207764, 1170.892700, 138.034973, 2.860481}, - {NPC_GHOUL, 2266.948975, 1176.898926, 137.976929, 2.860481}, - {NPC_STALKER, 2269.215576, 1170.109253, 137.742691, 2.860481}, - {NPC_FIEND, 2273.106689, 1176.101074, 137.880508, 2.860481} + {NPC_NECROMANCER, 2264.013428f, 1174.055908f, 138.093094f, 2.860481f}, + {NPC_GHOUL, 2264.207764f, 1170.892700f, 138.034973f, 2.860481f}, + {NPC_GHOUL, 2266.948975f, 1176.898926f, 137.976929f, 2.860481f}, + {NPC_STALKER, 2269.215576f, 1170.109253f, 137.742691f, 2.860481f}, + {NPC_FIEND, 2273.106689f, 1176.101074f, 137.880508f, 2.860481f} }, { - {NPC_GOLEM, 2349.701660, 1188.436646, 130.428864, 3.908642}, - {NPC_GHOUL, 2349.909180, 1194.582642, 130.417816, 3.577001}, - {NPC_EGHOUL, 2354.662598, 1185.692017, 130.552032, 3.577001}, - {NPC_EGHOUL, 2354.716797, 1191.614380, 130.539810, 3.577001}, + {NPC_GOLEM, 2349.701660f, 1188.436646f, 130.428864f, 3.908642f}, + {NPC_GHOUL, 2349.909180f, 1194.582642f, 130.417816f, 3.577001f}, + {NPC_EGHOUL, 2354.662598f, 1185.692017f, 130.552032f, 3.577001f}, + {NPC_EGHOUL, 2354.716797f, 1191.614380f, 130.539810f, 3.577001f}, {0, 0, 0, 0, 0} }, { - {NPC_CONSTRUCT, 2145.212891, 1355.288086, 132.288773, 6.004838}, - {NPC_NECROMANCER, 2137.078613, 1357.612671, 132.173340, 6.004838}, - {NPC_EGHOUL, 2139.402100, 1352.541626, 132.127518, 5.812850}, - {NPC_EGHOUL, 2142.408447, 1360.760620, 132.321564, 5.812850}, + {NPC_CONSTRUCT, 2145.212891f, 1355.288086f, 132.288773f, 6.004838f}, + {NPC_NECROMANCER, 2137.078613f, 1357.612671f, 132.173340f, 6.004838f}, + {NPC_EGHOUL, 2139.402100f, 1352.541626f, 132.127518f, 5.812850f}, + {NPC_EGHOUL, 2142.408447f, 1360.760620f, 132.321564f, 5.812850f}, {0, 0, 0, 0, 0} }, { - {NPC_GHOUL, 2172.686279, 1259.618164, 134.391754, 1.865499}, - {NPC_FIEND, 2177.649170, 1256.061157, 135.096512, 1.849572}, - {NPC_CONSTRUCT, 2170.782959, 1253.594849, 134.973022, 1.849572}, - {NPC_NECROMANCER, 2175.595703, 1249.041992, 135.603531, 1.849572}, + {NPC_GHOUL, 2172.686279f, 1259.618164f, 134.391754f, 1.865499f}, + {NPC_FIEND, 2177.649170f, 1256.061157f, 135.096512f, 1.849572f}, + {NPC_CONSTRUCT, 2170.782959f, 1253.594849f, 134.973022f, 1.849572f}, + {NPC_NECROMANCER, 2175.595703f, 1249.041992f, 135.603531f, 1.849572f}, {0, 0, 0, 0, 0} } }; @@ -197,25 +197,25 @@ float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= // Locations for rifts to spawn and draconians to go float RiftAndSpawnsLocations[ENCOUNTER_CHRONO_SPAWNS][5]= { - {NPC_TIME_RIFT, 2431.790039, 1190.670044, 148.076004, 0.187923}, - {NPC_INFINITE_ADVERSARY, 2433.857910, 1185.612061, 148.075974, 4.566168}, - {NPC_INFINITE_ADVERSARY, 2437.577881, 1188.241089, 148.075974, 0.196999}, - {NPC_INFINITE_AGENT, 2437.165527, 1192.294922, 148.075974, 0.169247}, - {NPC_INFINITE_HUNTER, 2434.989990, 1197.679565, 148.075974, 0.715971}, - {NPC_TIME_RIFT, 2403.954834, 1178.815430, 148.075943, 4.966126}, - {NPC_INFINITE_AGENT, 2403.676758, 1171.495850, 148.075607, 4.902797}, - {NPC_INFINITE_HUNTER, 2407.691162, 1172.162720, 148.075607, 4.963010}, - {NPC_TIME_RIFT, 2414.217041, 1133.446167, 148.076050, 1.706972}, - {NPC_INFINITE_ADVERSARY, 2416.024658, 1139.456177, 148.076431, 1.752129}, - {NPC_INFINITE_HUNTER, 2410.866699, 1139.680542, 148.076431, 1.752129}, - {NPC_TIME_RIFT, 2433.081543, 1099.869751, 148.076157, 1.809509}, - {NPC_INFINITE_ADVERSARY, 2426.947998, 1107.471680, 148.076019, 1.877580}, - {NPC_INFINITE_HUNTER, 2432.944580, 1108.896362, 148.208160, 2.199241}, - {NPC_TIME_RIFT, 2444.077637, 1114.366089, 148.076157, 3.049565}, - {NPC_INFINITE_ADVERSARY, 2438.190674, 1118.368164, 148.076172, 3.139232}, - {NPC_INFINITE_AGENT, 2435.861328, 1113.402954, 148.169327, 2.390271}, - {NPC_TIME_RIFT, 2463.131592, 1115.391724, 152.473129, 3.409651}, - {NPC_EPOCH, 2451.809326, 1112.901245, 149.220459, 3.363617} + {NPC_TIME_RIFT, 2431.790039f, 1190.670044f, 148.076004f, 0.187923f}, + {NPC_INFINITE_ADVERSARY, 2433.857910f, 1185.612061f, 148.075974f, 4.566168f}, + {NPC_INFINITE_ADVERSARY, 2437.577881f, 1188.241089f, 148.075974f, 0.196999f}, + {NPC_INFINITE_AGENT, 2437.165527f, 1192.294922f, 148.075974f, 0.169247f}, + {NPC_INFINITE_HUNTER, 2434.989990f, 1197.679565f, 148.075974f, 0.715971f}, + {NPC_TIME_RIFT, 2403.954834f, 1178.815430f, 148.075943f, 4.966126f}, + {NPC_INFINITE_AGENT, 2403.676758f, 1171.495850f, 148.075607f, 4.902797f}, + {NPC_INFINITE_HUNTER, 2407.691162f, 1172.162720f, 148.075607f, 4.963010f}, + {NPC_TIME_RIFT, 2414.217041f, 1133.446167f, 148.076050f, 1.706972f}, + {NPC_INFINITE_ADVERSARY, 2416.024658f, 1139.456177f, 148.076431f, 1.752129f}, + {NPC_INFINITE_HUNTER, 2410.866699f, 1139.680542f, 148.076431f, 1.752129f}, + {NPC_TIME_RIFT, 2433.081543f, 1099.869751f, 148.076157f, 1.809509f}, + {NPC_INFINITE_ADVERSARY, 2426.947998f, 1107.471680f, 148.076019f, 1.877580f}, + {NPC_INFINITE_HUNTER, 2432.944580f, 1108.896362f, 148.208160f, 2.199241f}, + {NPC_TIME_RIFT, 2444.077637f, 1114.366089f, 148.076157f, 3.049565f}, + {NPC_INFINITE_ADVERSARY, 2438.190674f, 1118.368164f, 148.076172f, 3.139232f}, + {NPC_INFINITE_AGENT, 2435.861328f, 1113.402954f, 148.169327f, 2.390271f}, + {NPC_TIME_RIFT, 2463.131592f, 1115.391724f, 152.473129f, 3.409651f}, + {NPC_EPOCH, 2451.809326f, 1112.901245f, 149.220459f, 3.363617f} }; #define GOSSIP_ITEM_ARTHAS_0 "I'm ready to start Culling of Stratholme." diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 8c9be6ce445..77f82a180db 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -39,10 +39,10 @@ inline uint32 RandRiftBoss() { return ((rand()%2) ? C_RKEEP : C_RLORD); } float PortalLocation[4][4]= { - {-2041.06, 7042.08, 29.99, 1.30}, - {-1968.18, 7042.11, 21.93, 2.12}, - {-1885.82, 7107.36, 22.32, 3.07}, - {-1928.11, 7175.95, 22.11, 3.44} + {-2041.06f, 7042.08f, 29.99f, 1.30f}, + {-1968.18f, 7042.11f, 21.93f, 2.12f}, + {-1885.82f, 7107.36f, 22.32f, 3.07f}, + {-1928.11f, 7175.95f, 22.11f, 3.44f} }; struct Wave diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index a811bed91d0..966642f9c98 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -78,25 +78,25 @@ struct Location static Location DrakeWP[]= { - {0, 2125.84, 88.2535, 54.8830}, - {1, 2111.01, 93.8022, 52.6356}, - {2, 2106.70, 114.753, 53.1965}, - {3, 2107.76, 138.746, 52.5109}, - {4, 2114.83, 160.142, 52.4738}, - {5, 2125.24, 178.909, 52.7283}, - {6, 2151.02, 208.901, 53.1551}, - {7, 2177.00, 233.069, 52.4409}, - {8, 2190.71, 227.831, 53.2742}, - {9, 2178.14, 214.219, 53.0779}, - {10, 2154.99, 202.795, 52.6446}, - {11, 2132.00, 191.834, 52.5709}, - {12, 2117.59, 166.708, 52.7686}, - {13, 2093.61, 139.441, 52.7616}, - {14, 2086.29, 104.950, 52.9246}, - {15, 2094.23, 81.2788, 52.6946}, - {16, 2108.70, 85.3075, 53.3294}, - {17, 2125.50, 88.9481, 54.7953}, - {18, 2128.20, 70.9763, 64.4221} + {0, 2125.84f, 88.2535f, 54.8830f}, + {1, 2111.01f, 93.8022f, 52.6356f}, + {2, 2106.70f, 114.753f, 53.1965f}, + {3, 2107.76f, 138.746f, 52.5109f}, + {4, 2114.83f, 160.142f, 52.4738f}, + {5, 2125.24f, 178.909f, 52.7283f}, + {6, 2151.02f, 208.901f, 53.1551f}, + {7, 2177.00f, 233.069f, 52.4409f}, + {8, 2190.71f, 227.831f, 53.2742f}, + {9, 2178.14f, 214.219f, 53.0779f}, + {10, 2154.99f, 202.795f, 52.6446f}, + {11, 2132.00f, 191.834f, 52.5709f}, + {12, 2117.59f, 166.708f, 52.7686f}, + {13, 2093.61f, 139.441f, 52.7616f}, + {14, 2086.29f, 104.950f, 52.9246f}, + {15, 2094.23f, 81.2788f, 52.6946f}, + {16, 2108.70f, 85.3075f, 53.3294f}, + {17, 2125.50f, 88.9481f, 54.7953f}, + {18, 2128.20f, 70.9763f, 64.4221f} }; class boss_lieutenant_drake : public CreatureScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 65c471c1afa..a6916fdb2e7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -146,7 +146,7 @@ public: if (mBarrelCount == 5) { UpdateQuestCredit(); - pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43, 71.01, 64.42, 1.74, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); + pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43f, 71.01f, 64.42f, 1.74f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); m_auiEncounter[0] = DONE; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index a3e0c6beb5b..e4d35ada722 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -228,7 +228,7 @@ public: case GOSSIP_ACTION_INFO_DEF+20: pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); + pCreature->SummonCreature(SKARLOC_MOUNT,2038.81f,270.26f,63.20f,5.41f,TEMPSUMMON_TIMED_DESPAWN,12000); if (pInstance) pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); @@ -304,7 +304,7 @@ public: { case 8: SetRun(false); - me->SummonCreature(18764,2181.87,112.46,89.45,0.26,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(18764,2181.87f,112.46f,89.45f,0.26f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 9: DoScriptText(SAY_TH_ARMORY, me); @@ -322,26 +322,26 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28,137.37,87.93,5.07,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44,131.83,87.93,0.78,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62,135.40,87.93,3.70,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75,130.13,87.93,1.48,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2200.28f,137.37f,87.93f,5.07f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2197.44f,131.83f,87.93f,0.78f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2203.62f,135.40f,87.93f,3.70f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2200.75f,130.13f,87.93f,1.48f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80,154.01,67.45,4.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36,151.87,67.74,4.46,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12,154.41,67.12,4.56,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08,155.38,67.24,4.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2135.80f,154.01f,67.45f,4.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2144.36f,151.87f,67.74f,4.46f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2142.12f,154.41f,67.12f,4.56f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2138.08f,155.38f,67.24f,4.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98,192.17,65.24,6.02,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48,198.75,65.18,5.15,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11,197.29,65.18,5.63,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18,194.82,65.18,5.75,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE,2102.98f,192.17f,65.24f,6.02f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2108.48f,198.75f,65.18f,5.15f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2106.11f,197.29f,65.18f,5.63f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2104.18f,194.82f,65.18f,5.75f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 29: DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(ENTRY_SCARLOC,2036.48f,271.22f,63.43f,5.27f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); //temporary,skarloc should rather be triggered to walk up to thrall break; case 30: @@ -356,12 +356,12 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26,522.16,56.87,3.99,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69,525.37,57.11,4.01,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65,524.55,56.63,3.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26f,522.16f,56.87f,3.99f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69f,525.37f,57.11f,4.01f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_SENTRY,2124.65f,524.55f,56.63f,3.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64,625.77,58.26,4.71,TEMPSUMMON_TIMED_DESPAWN,10000); + me->SummonCreature(SKARLOC_MOUNT,2488.64f,625.77f,58.26f,4.71f,TEMPSUMMON_TIMED_DESPAWN,10000); DoUnmount(); HadMount = false; SetRun(false); @@ -378,10 +378,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22,692.60,55.50,2.84,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13,696.55,55.51,3.38,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55,693.64,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94,695.81,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22f,692.60f,55.50f,2.84f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13f,696.55f,55.51f,3.38f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55f,693.64f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94f,695.81f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 71: SetRun(); @@ -390,10 +390,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33,646.82,56.03,4.28,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14,648.03,56.03,4.50,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32,649.60,56.03,4.38,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22,649.00,56.03,4.34,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33f,646.82f,56.03f,4.28f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14f,648.03f,56.03f,4.50f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32f,649.60f,56.03f,4.38f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22f,649.00f,56.03f,4.34f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); break; case 84: DoScriptText(SAY_TH_CHURCH_END, me); @@ -404,10 +404,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71,660.31,61.93,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96,662.59,61.93,0.79,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36,662.34,61.93,2.68,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39,659.77,61.93,2.61,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71f,660.31f,61.93f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96f,662.59f,61.93f,0.79f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36f,662.34f,61.93f,2.68f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39f,659.77f,61.93f,2.61f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); break; case 94: if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) @@ -455,7 +455,7 @@ public: } //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); + me->SummonCreature(EROZION_ENTRY,2646.47f,680.416f,55.38f,4.16f,TEMPSUMMON_TIMED_DESPAWN,120000); } break; case 108: @@ -599,7 +599,7 @@ public: { pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH,2639.13f,698.55f,65.43f,4.59f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index bc55b96d392..34612aa07ad 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -63,7 +63,7 @@ public: void JustDied(Unit* /*killer*/) { - me->SummonCreature(12238,28.067,61.875,-123.405,4.67,TEMPSUMMON_TIMED_DESPAWN,600000); + me->SummonCreature(12238,28.067f,61.875f,-123.405f,4.67f,TEMPSUMMON_TIMED_DESPAWN,600000); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 510366749b5..4c31c533ba7 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -87,17 +87,17 @@ static sOnyxMove aMoveData[]= {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f},//north }; -const Position MiddleRoomLocation = {-23.6155, -215.357, -55.7344}; +const Position MiddleRoomLocation = {-23.6155f, -215.357f, -55.7344f}; -const Position Phase2Location = {-80.924, -214.299, -82.942}; +const Position Phase2Location = {-80.924f, -214.299f, -82.942f}; static Position aSpawnLocations[3]= { //Whelps - {-30.127, -254.463, -89.440}, - {-30.817, -177.106, -89.258}, + {-30.127f, -254.463f, -89.440f}, + {-30.817f, -177.106f, -89.258f}, //Lair Guard - {-145.950, -212.831, -68.659} + {-145.950f, -212.831f, -68.659f} }; class boss_onyxia : public CreatureScript @@ -325,7 +325,7 @@ public: { uint32 uiMaxCount = sizeof(aMoveData)/sizeof(sOnyxMove); - int iTemp = rand()%(uiMaxCount-1); + uint32 iTemp = rand()%(uiMaxCount-1); if (iTemp >= m_uiMovePoint) ++iTemp; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index eb28b423162..8e218d882fb 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -158,17 +158,17 @@ public: } - if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635,844.140,46.896,0.633)) + if (Creature* pCreature = pGo->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = pGo->SummonCreature(uiCreature,2502.635 + float(irand(-5,5)),844.140 + float(irand(-5,5)),46.896,0.633)) - pSummon->GetMotionMaster()->MovePoint(0,2533.479 + float(irand(-5,5)),870.020 + float(irand(-5,5)),47.678); + if (Creature* pSummon = pGo->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f)) + pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); } } - pCreature->GetMotionMaster()->MovePoint(0,2533.479 + float(irand(-5,5)),870.020 + float(irand(-5,5)),47.678); + pCreature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); } break; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 150f697a3cf..b3156e2fd7e 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -87,7 +87,7 @@ public: DoScriptText(SAY_POINT, me, pPlayer); break; case 4: - me->SummonCreature(ENTRY_BOAR, 2137.66, 1843.98, 48.08, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 8: DoScriptText(SAY_BLUELEAF, me, pPlayer); @@ -99,7 +99,7 @@ public: DoScriptText(SAY_BAD, me, pPlayer); break; case 14: - me->SummonCreature(ENTRY_BOAR, 2078.91, 1704.54, 56.77, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 25: DoScriptText(SAY_THINK, me, pPlayer); @@ -111,7 +111,7 @@ public: DoScriptText(SAY_FINALY, me, pPlayer); break; case 43: - me->SummonCreature(ENTRY_BOAR, 1956.43, 1596.97, 81.75, 1.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: DoScriptText(SAY_WIN, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index c3aca926847..63283665518 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -148,7 +148,7 @@ public: switch(urand(0,2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142,1289.2900,-74.419533,5.112); + DoTeleportPlayer(pTarget, -8106.0142f,1289.2900f,-74.419533f,5.112f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -163,7 +163,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354,1155.1907,-78.849319,2.608); + DoTeleportPlayer(pTarget, -7990.135354f,1155.1907f,-78.849319f,2.608f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -178,7 +178,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget,-8159.7753,1127.9064,-76.868660,0.675); + DoTeleportPlayer(pTarget,-8159.7753f,1127.9064f,-76.868660f,0.675f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index c60bbc738ee..40e5bb57938 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -157,15 +157,15 @@ public: switch (urand(0,2)) { case 0: - me->GetMap()->CreatureRelocation(me, -8340.782227,2083.814453,125.648788,0.0f); + me->GetMap()->CreatureRelocation(me, -8340.782227f,2083.814453f,125.648788f,0.0f); DoResetThreat(); break; case 1: - me->GetMap()->CreatureRelocation(me, -8341.546875,2118.504639,133.058151,0.0f); + me->GetMap()->CreatureRelocation(me, -8341.546875f,2118.504639f,133.058151f,0.0f); DoResetThreat(); break; case 2: - me->GetMap()->CreatureRelocation(me, -8318.822266,2058.231201,133.058151,0.0f); + me->GetMap()->CreatureRelocation(me, -8318.822266f,2058.231201f,133.058151f,0.0f); DoResetThreat(); break; } @@ -174,7 +174,7 @@ public: Blink_Timer= 20000 + rand()%20000; } else Blink_Timer -= diff; - int procent = (int) (me->GetHealth()*100 / me->GetMaxHealth() +0.5); + int procent = (int) (me->GetHealth()*100 / me->GetMaxHealth() +0.5f); //Summoning 2 Images and teleporting to a random position on 75% health if ((!Images75 && !IsImage) && (procent <= 75 && procent > 70)) @@ -210,9 +210,9 @@ public: { DoScriptText(SAY_SPLIT, me); - ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227,2083.814453,125.648788,0); - ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875,2118.504639,133.058151,0); - ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266,2058.231201,133.058151,0); + ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f,2083.814453f,125.648788f,0); + ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f,2118.504639f,133.058151f,0); + ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f,2058.231201f,133.058151f,0); ov_mycoordinates *bossc=place1, *i1=place2, *i2=place3; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 2ac8e6a24a0..93ede297ad0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -251,7 +251,7 @@ public: continue; if (sent->isDead()) continue; - int h = sent->GetHealth() + (sent->GetMaxHealth() / 2); + uint32 h = sent->GetHealth() + (sent->GetMaxHealth() / 2); if (h > sent->GetMaxHealth()) h = sent->GetMaxHealth(); sent->SetHealth(h); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 1413720cec7..c980cbf8fd8 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -227,8 +227,8 @@ public: { ++eventProgress; DoScriptText(SAY_TEMPLE_OF_PROMISE, me); - me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763, 227.874, -93.3233, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506, 216.645, -93.6756, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763f, 227.874f, -93.3233f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506f, 216.645f, -93.6756f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } break; case TYPE_NARALEX_PART2: @@ -239,9 +239,9 @@ public: DoCast(me, SPELL_SERPENTINE_CLEANSING); //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); eventTimer = 30000; - me->SummonCreature(NPC_DEVIATE_VIPER, -61.5261, 273.676, -92.8442, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_VIPER, -58.4658, 280.799, -92.8393, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); - me->SummonCreature(NPC_DEVIATE_VIPER, -50.002, 278.578, -92.8442, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -61.5261f, 273.676f, -92.8442f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -58.4658f, 280.799f, -92.8393f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); + me->SummonCreature(NPC_DEVIATE_VIPER, -50.002f, 278.578f, -92.8442f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } else if (eventProgress == 2) @@ -278,9 +278,9 @@ public: eventTimer = 15000; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943, 199.701, -103.529, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08, 221.13, -103.609, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007, 227.428, -97.421, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007f, 227.428f, -97.421f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); } else if (eventProgress == 4) @@ -289,13 +289,13 @@ public: eventTimer = 30000; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413, 207.188, -102.469, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857, 218.645, -102.905, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102, 227.211, -102.752, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 153.372, 235.149, -102.826, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 149.524, 251.113, -102.558, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 136.208, 266.466, -102.977, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); - me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 126.167, 274.759, -102.962, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102f, 227.211f, -102.752f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 153.372f, 235.149f, -102.826f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 149.524f, 251.113f, -102.558f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 136.208f, 266.466f, -102.977f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); + me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 126.167f, 274.759f, -102.962f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); } else if (eventProgress == 5) @@ -303,7 +303,7 @@ public: ++eventProgress; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); - me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872, 262.905, -103.503, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); pInstance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } @@ -369,11 +369,11 @@ public: eventTimer = 2500; if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) { - naralex->GetMotionMaster()->MovePoint(0, 117.095512, 247.107971, -96.167870); - naralex->GetMotionMaster()->MovePoint(1, 90.388809, 276.135406, -83.389801); + naralex->GetMotionMaster()->MovePoint(0, 117.095512f, 247.107971f, -96.167870f); + naralex->GetMotionMaster()->MovePoint(1, 90.388809f, 276.135406f, -83.389801f); } - me->GetMotionMaster()->MovePoint(26, 117.095512, 247.107971, -96.167870); - me->GetMotionMaster()->MovePoint(27, 144.375443, 281.045837, -82.477135); + me->GetMotionMaster()->MovePoint(26, 117.095512f, 247.107971f, -96.167870f); + me->GetMotionMaster()->MovePoint(27, 144.375443f, 281.045837f, -82.477135f); } else if (eventProgress == 11) diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 4e29a71e21a..6552d008143 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y no z coordinat b/c they're all the same */ float pyramidSpawns [pyramidSpawnTotal][4] = { - {1,7789,1894.64,1206.29}, - {1,7787,1890.08,1218.68}, - {1,8876,1883.76,1222.3}, - {1,7789,1874.18,1221.24}, - {1,7787,1892.28,1225.49}, - {1,7788,1889.94,1212.21}, - {1,7787,1879.02,1223.06}, - {1,7789,1874.45,1204.44}, - {1,8876,1898.23,1217.97}, - {1,7787,1882.07,1225.7}, - {1,8877,1896.46,1205.62}, - {1,7787,1886.97,1225.86}, - {1,7787,1894.72,1221.91}, - {1,7787,1883.5,1218.25}, - {1,7787,1886.93,1221.4}, - {1,8876,1889.82,1222.51}, - {1,7788,1893.07,1215.26}, - {1,7788,1878.57,1214.16}, - {1,7788,1883.74,1212.35}, - {1,8877,1877,1207.27}, - {1,8877,1873.63,1204.65}, - {1,8876,1877.4,1216.41}, - {1,8877,1899.63,1202.52}, - {2,7789,1902.83,1223.41}, - {2,8876,1889.82,1222.51}, - {2,7787,1883.5,1218.25}, - {2,7788,1883.74,1212.35}, - {2,8877,1877,1207.27}, - {2,7787,1890.08,1218.68}, - {2,7789,1894.64,1206.29}, - {2,8876,1877.4,1216.41}, - {2,7787,1892.28,1225.49}, - {2,7788,1893.07,1215.26}, - {2,8877,1896.46,1205.62}, - {2,7789,1874.45,1204.44}, - {2,7789,1874.18,1221.24}, - {2,7787,1879.02,1223.06}, - {2,8876,1898.23,1217.97}, - {2,7787,1882.07,1225.7}, - {2,8877,1873.63,1204.65}, - {2,7787,1886.97,1225.86}, - {2,7788,1878.57,1214.16}, - {2,7787,1894.72,1221.91}, - {2,7787,1886.93,1221.4}, - {2,8876,1883.76,1222.3}, - {2,7788,1889.94,1212.21}, - {2,8877,1899.63,1202.52}, - {3,7788,1878.57,1214.16}, - {3,7787,1894.72,1221.91}, - {3,7787,1886.93,1221.4}, - {3,8876,1883.76,1222.3}, - {3,7788,1889.94,1212.21}, - {3,7275,1889.23,1207.72}, - {3,7796,1879.77,1207.96} + {1,7789,1894.64f,1206.29f}, + {1,7787,1890.08f,1218.68f}, + {1,8876,1883.76f,1222.3f}, + {1,7789,1874.18f,1221.24f}, + {1,7787,1892.28f,1225.49f}, + {1,7788,1889.94f,1212.21f}, + {1,7787,1879.02f,1223.06f}, + {1,7789,1874.45f,1204.44f}, + {1,8876,1898.23f,1217.97f}, + {1,7787,1882.07f,1225.7f}, + {1,8877,1896.46f,1205.62f}, + {1,7787,1886.97f,1225.86f}, + {1,7787,1894.72f,1221.91f}, + {1,7787,1883.5f,1218.25f}, + {1,7787,1886.93f,1221.4f}, + {1,8876,1889.82f,1222.51f}, + {1,7788,1893.07f,1215.26f}, + {1,7788,1878.57f,1214.16f}, + {1,7788,1883.74f,1212.35f}, + {1,8877,1877,1207.27f}, + {1,8877,1873.63f,1204.65f}, + {1,8876,1877.4f,1216.41f}, + {1,8877,1899.63f,1202.52f}, + {2,7789,1902.83f,1223.41f}, + {2,8876,1889.82f,1222.51f}, + {2,7787,1883.5f,1218.25f}, + {2,7788,1883.74f,1212.35f}, + {2,8877,1877,1207.27f}, + {2,7787,1890.08f,1218.68f}, + {2,7789,1894.64f,1206.29f}, + {2,8876,1877.4f,1216.41f}, + {2,7787,1892.28f,1225.49f}, + {2,7788,1893.07f,1215.26f}, + {2,8877,1896.46f,1205.62f}, + {2,7789,1874.45f,1204.44f}, + {2,7789,1874.18f,1221.24f}, + {2,7787,1879.02f,1223.06f}, + {2,8876,1898.23f,1217.97f}, + {2,7787,1882.07f,1225.7f}, + {2,8877,1873.63f,1204.65f}, + {2,7787,1886.97f,1225.86f}, + {2,7788,1878.57f,1214.16f}, + {2,7787,1894.72f,1221.91f}, + {2,7787,1886.93f,1221.4f}, + {2,8876,1883.76f,1222.3f}, + {2,7788,1889.94f,1212.21f}, + {2,8877,1899.63f,1202.52f}, + {3,7788,1878.57f,1214.16f}, + {3,7787,1894.72f,1221.91f}, + {3,7787,1886.93f,1221.4f}, + {3,8876,1883.76f,1222.3f}, + {3,7788,1889.94f,1212.21f}, + {3,7275,1889.23f,1207.72f}, + {3,7796,1879.77f,1207.96f} }; float Spawnsway[2][3] = { - {1884.86,1228.62,9}, - {1887.53,1263,41} + {1884.86f,1228.62f,9}, + {1887.53f,1263,41} }; class instance_zulfarrak : public InstanceMapScript @@ -269,11 +269,11 @@ public: if (major_wave_Timer<diff) { // move NPCs to bottom of stair - MoveNPCIfAlive(ENTRY_BLY,1887.92,1228.179,9.98,4.78); - MoveNPCIfAlive(ENTRY_MURTA,1891.57,1228.68,9.69,4.78); - MoveNPCIfAlive(ENTRY_ORO,1897.23,1228.34,9.43,4.78); - MoveNPCIfAlive(ENTRY_RAVEN,1883.68,1227.95,9.543,4.78); - MoveNPCIfAlive(ENTRY_WEEGLI,1878.02,1227.65,9.485,4.78); + MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f); + MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f); + MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f); + MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f); + MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f); SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); } else @@ -283,11 +283,11 @@ public: if (IsWaveAllDead()) // move NPCS to their final positions { SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS); - MoveNPCIfAlive(ENTRY_BLY,1883.82,1200.83,8.87,1.32); - MoveNPCIfAlive(ENTRY_MURTA,1891.83,1201.45,8.87,1.32); - MoveNPCIfAlive(ENTRY_ORO,1894.50,1204.40,8.87,1.32); - MoveNPCIfAlive(ENTRY_RAVEN,1874.11,1206.17,8.87,1.32); - MoveNPCIfAlive(ENTRY_WEEGLI,1877.52,1199.63,8.87,1.32); + MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f); + MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f); } break; }; @@ -313,7 +313,7 @@ public: { if (pyramidSpawns[i][0] == (float)wave) { - Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87, 0}; + Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0}; TempSummon* ts = instance->SummonCreature(pyramidSpawns[i][1],pos); ts->GetMotionMaster()->MoveRandom(10); addsAtBase.push_back(ts->GetGUID()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 18266d1a34a..02f95c23a7c 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -224,11 +224,11 @@ public: { pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance,ENTRY_BLY,1884.99,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_ORO,1886.47,1270.68,41.68); - initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52); - initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19,1272.03,41.60); + initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f); + initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f); + initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f); } return false; } @@ -362,7 +362,7 @@ public: { pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR); DoScriptText(SAY_WEEGLI_OHNO,me); - me->SetHomePosition(1882.69,1272.28,41.87,0); + me->SetHomePosition(1882.69f,1272.28f,41.87f,0); } else if (destroyingDoor) @@ -384,8 +384,8 @@ public: if (me->isAlive()) { me->setFaction(FACTION_FRIENDLY); - me->GetMotionMaster()->MovePoint(0, 1858.57,1146.35,14.745); - me->SetHomePosition(1858.57,1146.35,14.745,3.85); // in case he gets interrupted + me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f); + me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted DoScriptText(SAY_WEEGLI_OK_I_GO,me); destroyingDoor=true; } diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 9f03f29765a..f309db9ba08 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -85,9 +85,9 @@ class npc_torek : public CreatureScript break; case 19: //TODO: verify location and creatures amount. - me->SummonCreature(ENTRY_DURIEL,1776.73,-2049.06,109.83,1.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64,-2049.41,109.83,1.40,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73,-2049.50,109.83,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_DURIEL,1776.73f,-2049.06f,109.83f,1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64f,-2049.41f,109.83f,1.40f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73f,-2049.50f,109.83f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); break; case 20: DoScriptText(SAY_WIN, me, pPlayer); @@ -195,14 +195,14 @@ class npc_ruul_snowhoof : public CreatureScript Cage->SetGoState(GO_STATE_ACTIVE); break;} case 13: - me->SummonCreature(3922, 3449.218018, -587.825073, 174.978867, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3921, 3446.384521, -587.830872, 175.186279, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3926, 3444.218994, -587.835327, 175.380600, 4.714445, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3922, 3449.218018f, -587.825073f, 174.978867f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3921, 3446.384521f, -587.830872f, 175.186279f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3926, 3444.218994f, -587.835327f, 175.380600f, 4.714445f, TEMPSUMMON_DEAD_DESPAWN, 60000); break; case 19: - me->SummonCreature(3922, 3508.344482, -492.024261, 186.929031, 4.145029, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3921, 3506.265625, -490.531006, 186.740128, 4.239277, TEMPSUMMON_DEAD_DESPAWN, 60000); - me->SummonCreature(3926, 3503.682373, -489.393799, 186.629684, 4.349232, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3922, 3508.344482f, -492.024261f, 186.929031f, 4.145029f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3921, 3506.265625f, -490.531006f, 186.740128f, 4.239277f, TEMPSUMMON_DEAD_DESPAWN, 60000); + me->SummonCreature(3926, 3503.682373f, -489.393799f, 186.629684f, 4.349232f, TEMPSUMMON_DEAD_DESPAWN, 60000); break; case 21:{ @@ -283,19 +283,19 @@ enum eEnums static float m_afFirstNagaCoord[3][3]= { - {3603.504150, 1122.631104, 1.635}, // rider - {3589.293945, 1148.664063, 5.565}, // sorceress - {3609.925537, 1168.759521, -1.168} // razortail + {3603.504150f, 1122.631104f, 1.635f}, // rider + {3589.293945f, 1148.664063f, 5.565f}, // sorceress + {3609.925537f, 1168.759521f, -1.168f} // razortail }; static float m_afSecondNagaCoord[3][3]= { - {3609.925537, 1168.759521, -1.168}, // witch - {3645.652100, 1139.425415, 1.322}, // priest - {3583.602051, 1128.405762, 2.347} // myrmidon + {3609.925537f, 1168.759521f, -1.168f}, // witch + {3645.652100f, 1139.425415f, 1.322f}, // priest + {3583.602051f, 1128.405762f, 2.347f} // myrmidon }; -static float m_fVorshaCoord[]={3633.056885, 1172.924072, -5.388}; +static float m_fVorshaCoord[]={3633.056885f, 1172.924072f, -5.388f}; class npc_muglash : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 44ae137278c..5e0c38af632 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -200,64 +200,64 @@ public: float WPs[58][4] = { //pos_x pos_y pos_z orien -{3691.97, -3962.41, 35.9118, 3.67}, -{3675.02, -3960.49, 35.9118, 3.67}, -{3653.19, -3958.33, 33.9118, 3.59}, -{3621.12, -3958.51, 29.9118, 3.48}, -{3604.86, -3963, 29.9118, 3.48}, -{3569.94, -3970.25, 29.9118, 3.44}, -{3541.03, -3975.64, 29.9118, 3.41}, -{3510.84, -3978.71, 29.9118, 3.41}, -{3472.7, -3997.07, 29.9118, 3.35}, -{3439.15, -4014.55, 29.9118, 3.29}, -{3412.8, -4025.87, 29.9118, 3.25}, -{3384.95, -4038.04, 29.9118, 3.24}, -{3346.77, -4052.93, 29.9118, 3.22}, -{3299.56, -4071.59, 29.9118, 3.20}, -{3261.22, -4080.38, 30.9118, 3.19}, -{3220.68, -4083.09, 31.9118, 3.18}, -{3187.11, -4070.45, 33.9118, 3.16}, -{3162.78, -4062.75, 33.9118, 3.15}, -{3136.09, -4050.32, 33.9118, 3.07}, -{3119.47, -4044.51, 36.0363, 3.07}, -{3098.95, -4019.8, 33.9118, 3.07}, -{3073.07, -4011.42, 33.9118, 3.07}, -{3051.71, -3993.37, 33.9118, 3.02}, -{3027.52, -3978.6, 33.9118, 3.00}, -{3003.78, -3960.14, 33.9118, 2.98}, -{2977.99, -3941.98, 31.9118, 2.96}, -{2964.57, -3932.07, 30.9118, 2.96}, -{2947.9, -3921.31, 29.9118, 2.96}, -{2924.91, -3910.8, 29.9118, 2.94}, -{2903.04, -3896.42, 29.9118, 2.93}, -{2884.75, -3874.03, 29.9118, 2.90}, -{2868.19, -3851.48, 29.9118, 2.82}, -{2854.62, -3819.72, 29.9118, 2.80}, -{2825.53, -3790.4, 29.9118, 2.744}, -{2804.31, -3773.05, 29.9118, 2.71}, -{2769.78, -3763.57, 29.9118, 2.70}, -{2727.23, -3745.92, 30.9118, 2.69}, -{2680.12, -3737.49, 30.9118, 2.67}, -{2647.62, -3739.94, 30.9118, 2.66}, -{2616.6, -3745.75, 30.9118, 2.64}, -{2589.38, -3731.97, 30.9118, 2.61}, -{2562.94, -3722.35, 31.9118, 2.56}, -{2521.05, -3716.6, 31.9118, 2.55}, -{2485.26, -3706.67, 31.9118, 2.51}, -{2458.93, -3696.67, 31.9118, 2.51}, -{2432, -3692.03, 31.9118, 2.46}, -{2399.59, -3681.97, 31.9118, 2.45}, -{2357.75, -3666.6, 31.9118, 2.44}, -{2311.99, -3656.88, 31.9118, 2.94}, -{2263.41, -3649.55, 31.9118, 3.02}, -{2209.05, -3641.76, 31.9118, 2.99}, -{2164.83, -3637.64, 31.9118, 3.15}, -{2122.42, -3639, 31.9118, 3.21}, -{2075.73, -3643.59, 31.9118, 3.22}, -{2033.59, -3649.52, 31.9118, 3.42}, -{1985.22, -3662.99, 31.9118, 3.42}, -{1927.09, -3679.56, 33.9118, 3.42}, -{1873.57, -3695.32, 33.9118, 3.44} +{3691.97f, -3962.41f, 35.9118f, 3.67f}, +{3675.02f, -3960.49f, 35.9118f, 3.67f}, +{3653.19f, -3958.33f, 33.9118f, 3.59f}, +{3621.12f, -3958.51f, 29.9118f, 3.48f}, +{3604.86f, -3963, 29.9118f, 3.48f}, +{3569.94f, -3970.25f, 29.9118f, 3.44f}, +{3541.03f, -3975.64f, 29.9118f, 3.41f}, +{3510.84f, -3978.71f, 29.9118f, 3.41f}, +{3472.7f, -3997.07f, 29.9118f, 3.35f}, +{3439.15f, -4014.55f, 29.9118f, 3.29f}, +{3412.8f, -4025.87f, 29.9118f, 3.25f}, +{3384.95f, -4038.04f, 29.9118f, 3.24f}, +{3346.77f, -4052.93f, 29.9118f, 3.22f}, +{3299.56f, -4071.59f, 29.9118f, 3.20f}, +{3261.22f, -4080.38f, 30.9118f, 3.19f}, +{3220.68f, -4083.09f, 31.9118f, 3.18f}, +{3187.11f, -4070.45f, 33.9118f, 3.16f}, +{3162.78f, -4062.75f, 33.9118f, 3.15f}, +{3136.09f, -4050.32f, 33.9118f, 3.07f}, +{3119.47f, -4044.51f, 36.0363f, 3.07f}, +{3098.95f, -4019.8f, 33.9118f, 3.07f}, +{3073.07f, -4011.42f, 33.9118f, 3.07f}, +{3051.71f, -3993.37f, 33.9118f, 3.02f}, +{3027.52f, -3978.6f, 33.9118f, 3.00f}, +{3003.78f, -3960.14f, 33.9118f, 2.98f}, +{2977.99f, -3941.98f, 31.9118f, 2.96f}, +{2964.57f, -3932.07f, 30.9118f, 2.96f}, +{2947.9f, -3921.31f, 29.9118f, 2.96f}, +{2924.91f, -3910.8f, 29.9118f, 2.94f}, +{2903.04f, -3896.42f, 29.9118f, 2.93f}, +{2884.75f, -3874.03f, 29.9118f, 2.90f}, +{2868.19f, -3851.48f, 29.9118f, 2.82f}, +{2854.62f, -3819.72f, 29.9118f, 2.80f}, +{2825.53f, -3790.4f, 29.9118f, 2.744f}, +{2804.31f, -3773.05f, 29.9118f, 2.71f}, +{2769.78f, -3763.57f, 29.9118f, 2.70f}, +{2727.23f, -3745.92f, 30.9118f, 2.69f}, +{2680.12f, -3737.49f, 30.9118f, 2.67f}, +{2647.62f, -3739.94f, 30.9118f, 2.66f}, +{2616.6f, -3745.75f, 30.9118f, 2.64f}, +{2589.38f, -3731.97f, 30.9118f, 2.61f}, +{2562.94f, -3722.35f, 31.9118f, 2.56f}, +{2521.05f, -3716.6f, 31.9118f, 2.55f}, +{2485.26f, -3706.67f, 31.9118f, 2.51f}, +{2458.93f, -3696.67f, 31.9118f, 2.51f}, +{2432, -3692.03f, 31.9118f, 2.46f}, +{2399.59f, -3681.97f, 31.9118f, 2.45f}, +{2357.75f, -3666.6f, 31.9118f, 2.44f}, +{2311.99f, -3656.88f, 31.9118f, 2.94f}, +{2263.41f, -3649.55f, 31.9118f, 3.02f}, +{2209.05f, -3641.76f, 31.9118f, 2.99f}, +{2164.83f, -3637.64f, 31.9118f, 3.15f}, +{2122.42f, -3639, 31.9118f, 3.21f}, +{2075.73f, -3643.59f, 31.9118f, 3.22f}, +{2033.59f, -3649.52f, 31.9118f, 3.42f}, +{1985.22f, -3662.99f, 31.9118f, 3.42f}, +{1927.09f, -3679.56f, 33.9118f, 3.42f}, +{1873.57f, -3695.32f, 33.9118f, 3.44f} }; class mob_rizzle_sprysprocket : public CreatureScript @@ -352,8 +352,8 @@ public: Map* pMap = me->GetMap(); if (pMap) { - pMap->CreatureRelocation(me, 3706.39, -3969.15, 35.9118, 0); - me->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0); + pMap->CreatureRelocation(me, 3706.39f, -3969.15f, 35.9118f, 0); + me->AI_SendMoveToPacket(3706.39f, -3969.15f, 35.9118f, 0, 0, 0); } //begin swimming and summon depth charges Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 4c69c9ac27f..bed937d5a9d 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -433,7 +433,7 @@ enum eGeezle GO_NAGA_FLAG = 181694 }; -static float SparkPos[3] = {-5029.91, -11291.79, 8.096}; +static float SparkPos[3] = {-5029.91f, -11291.79f, 8.096f}; class npc_geezle : public CreatureScript { @@ -487,8 +487,8 @@ public: { case 0: if (Spark) - Spark->GetMotionMaster()->MovePoint(0, -5080.70, -11253.61, 0.56); - me->GetMotionMaster()->MovePoint(0, -5092.26, -11252, 0.71); + Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); + me->GetMotionMaster()->MovePoint(0, -5092.26f, -11252, 0.71f); return 9000; // NPCs are walking up to fire case 1: DespawnNagaFlag(true); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 9ef82d1c953..e572514f251 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -365,7 +365,7 @@ public: ## npc_zelfrax ######*/ -const Position MovePosition = {-2967.030,-3872.1799,35.620}; +const Position MovePosition = {-2967.030f,-3872.1799f,35.620f}; enum eZelfrax { diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 9efcf4c8f44..aae5dd6f854 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -131,24 +131,24 @@ public: // First Ambush(3 Yetis) case 11: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_YETI, -4841.01, 1593.91, 73.42, 3.98, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_YETI, -4837.61, 1568.58, 78.21, 3.13, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_YETI, -4841.89, 1569.95, 76.53, 0.68, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4841.01f, 1593.91f, 73.42f, 3.98f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4837.61f, 1568.58f, 78.21f, 3.13f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_YETI, -4841.89f, 1569.95f, 76.53f, 0.68f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Second Ambush(3 Gorillas) case 21: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_GORILLA, -4595.81, 2005.99, 53.08, 3.74, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_GORILLA, -4597.53, 2008.31, 52.70, 3.78, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_GORILLA, -4599.37, 2010.59, 52.77, 3.84, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4595.81f, 2005.99f, 53.08f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4597.53f, 2008.31f, 52.70f, 3.78f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_GORILLA, -4599.37f, 2010.59f, 52.77f, 3.84f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Third Ambush(4 Gnolls) case 30: DoScriptText(SAY_OOX_AMBUSH, me); - me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14, 2075.87, 47.77, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68, 2077.98, 47.57, 3.77, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33, 2080.24, 47.43, 3.87, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); - me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04, 2075.54, 46.83, 3.81, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_BRUTE , -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); + me->SummonCreature(NPC_WOODPAW_ALPHA , -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: DoScriptText(SAY_OOX_END, me); diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index b2402d9d4c3..ac959773822 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -221,58 +221,58 @@ public: float Clintar_spirit_WP[41][5] = { //pos_x pos_y pos_z orien waitTime -{7465.28, -3115.46, 439.327, 0.83, 4000}, -{7476.49, -3101, 443.457, 0.89, 0}, -{7486.57, -3085.59, 439.478, 1.07, 0}, -{7472.19, -3085.06, 443.142, 3.07, 0}, -{7456.92, -3085.91, 438.862, 3.24, 0}, -{7446.68, -3083.43, 438.245, 2.40, 0}, -{7446.17, -3080.21, 439.826, 1.10, 6000}, -{7452.41, -3085.8, 438.984, 5.78, 0}, -{7469.11, -3084.94, 443.048, 6.25, 0}, -{7483.79, -3085.44, 439.607, 6.25, 0}, -{7491.14, -3090.96, 439.983, 5.44, 0}, -{7497.62, -3098.22, 436.854, 5.44, 0}, -{7498.72, -3113.41, 434.596, 4.84, 0}, -{7500.06, -3122.51, 434.749, 5.17, 0}, -{7504.96, -3131.53, 434.475, 4.74, 0}, -{7504.31, -3133.53, 435.693, 3.84, 6000}, -{7504.55, -3133.27, 435.476, 0.68, 15000}, -{7501.99, -3126.01, 434.93, 1.83, 0}, -{7490.76, -3114.97, 434.431, 2.51, 0}, -{7479.64, -3105.51, 431.123, 1.83, 0}, -{7474.63, -3086.59, 428.994, 1.83, 2000}, -{7472.96, -3074.18, 427.566, 1.57, 0}, -{7472.25, -3063, 428.268, 1.55, 0}, -{7473.46, -3054.22, 427.588, 0.36, 0}, -{7475.08, -3053.6, 428.653, 0.36, 6000}, -{7474.66, -3053.56, 428.433, 3.19, 4000}, -{7471.81, -3058.84, 427.073, 4.29, 0}, -{7472.16, -3064.91, 427.772, 4.95, 0}, -{7471.56, -3085.36, 428.924, 4.72, 0}, -{7473.56, -3093.48, 429.294, 5.04, 0}, -{7478.94, -3104.29, 430.638, 5.23, 0}, -{7484.46, -3109.61, 432.769, 5.79, 0}, -{7490.23, -3111.08, 434.431, 0.02, 0}, -{7496.29, -3108, 434.783, 1.15, 0}, -{7497.46, -3100.66, 436.191, 1.50, 0}, -{7495.64, -3093.39, 438.349, 2.10, 0}, -{7492.44, -3086.01, 440.267, 1.38, 0}, -{7498.26, -3076.44, 440.808, 0.71, 0}, -{7506.4, -3067.35, 443.64, 0.77, 0}, -{7518.37, -3057.42, 445.584, 0.74, 0}, -{7517.51, -3056.3, 444.568, 2.49, 4500} +{7465.28f, -3115.46f, 439.327f, 0.83f, 4000}, +{7476.49f, -3101, 443.457f, 0.89f, 0}, +{7486.57f, -3085.59f, 439.478f, 1.07f, 0}, +{7472.19f, -3085.06f, 443.142f, 3.07f, 0}, +{7456.92f, -3085.91f, 438.862f, 3.24f, 0}, +{7446.68f, -3083.43f, 438.245f, 2.40f, 0}, +{7446.17f, -3080.21f, 439.826f, 1.10f, 6000}, +{7452.41f, -3085.8f, 438.984f, 5.78f, 0}, +{7469.11f, -3084.94f, 443.048f, 6.25f, 0}, +{7483.79f, -3085.44f, 439.607f, 6.25f, 0}, +{7491.14f, -3090.96f, 439.983f, 5.44f, 0}, +{7497.62f, -3098.22f, 436.854f, 5.44f, 0}, +{7498.72f, -3113.41f, 434.596f, 4.84f, 0}, +{7500.06f, -3122.51f, 434.749f, 5.17f, 0}, +{7504.96f, -3131.53f, 434.475f, 4.74f, 0}, +{7504.31f, -3133.53f, 435.693f, 3.84f, 6000}, +{7504.55f, -3133.27f, 435.476f, 0.68f, 15000}, +{7501.99f, -3126.01f, 434.93f, 1.83f, 0}, +{7490.76f, -3114.97f, 434.431f, 2.51f, 0}, +{7479.64f, -3105.51f, 431.123f, 1.83f, 0}, +{7474.63f, -3086.59f, 428.994f, 1.83f, 2000}, +{7472.96f, -3074.18f, 427.566f, 1.57f, 0}, +{7472.25f, -3063, 428.268f, 1.55f, 0}, +{7473.46f, -3054.22f, 427.588f, 0.36f, 0}, +{7475.08f, -3053.6f, 428.653f, 0.36f, 6000}, +{7474.66f, -3053.56f, 428.433f, 3.19f, 4000}, +{7471.81f, -3058.84f, 427.073f, 4.29f, 0}, +{7472.16f, -3064.91f, 427.772f, 4.95f, 0}, +{7471.56f, -3085.36f, 428.924f, 4.72f, 0}, +{7473.56f, -3093.48f, 429.294f, 5.04f, 0}, +{7478.94f, -3104.29f, 430.638f, 5.23f, 0}, +{7484.46f, -3109.61f, 432.769f, 5.79f, 0}, +{7490.23f, -3111.08f, 434.431f, 0.02f, 0}, +{7496.29f, -3108, 434.783f, 1.15f, 0}, +{7497.46f, -3100.66f, 436.191f, 1.50f, 0}, +{7495.64f, -3093.39f, 438.349f, 2.10f, 0}, +{7492.44f, -3086.01f, 440.267f, 1.38f, 0}, +{7498.26f, -3076.44f, 440.808f, 0.71f, 0}, +{7506.4f, -3067.35f, 443.64f, 0.77f, 0}, +{7518.37f, -3057.42f, 445.584f, 0.74f, 0}, +{7517.51f, -3056.3f, 444.568f, 2.49f, 4500} }; #define ASPECT_RAVEN 22915 -#define ASPECT_RAVEN_SUMMON_X 7472.96 -#define ASPECT_RAVEN_SUMMON_Y -3074.18 -#define ASPECT_RAVEN_SUMMON_Z 427.566 -#define CLINTAR_SPIRIT_SUMMON_X 7459.2275 -#define CLINTAR_SPIRIT_SUMMON_Y -3122.5632 -#define CLINTAR_SPIRIT_SUMMON_Z 438.9842 -#define CLINTAR_SPIRIT_SUMMON_O 0.8594 +#define ASPECT_RAVEN_SUMMON_X 7472.96f +#define ASPECT_RAVEN_SUMMON_Y -3074.18f +#define ASPECT_RAVEN_SUMMON_Z 427.566f +#define CLINTAR_SPIRIT_SUMMON_X 7459.2275f +#define CLINTAR_SPIRIT_SUMMON_Y -3122.5632f +#define CLINTAR_SPIRIT_SUMMON_Z 438.9842f +#define CLINTAR_SPIRIT_SUMMON_O 0.8594f //from -1000292 to -1000287 are signed for 7806. but all this texts ids wrong. #define CLINTAR_SPIRIT_SAY_START -1000286 diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index b7009e339a5..7d615979f9c 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -206,56 +206,56 @@ public: float wp_plain_vision[50][3] = { - {-2226.32, -408.095, -9.36235}, - {-2203.04, -437.212, -5.72498}, - {-2163.91, -457.851, -7.09049}, - {-2123.87, -448.137, -9.29591}, - {-2104.66, -427.166, -6.49513}, - {-2101.48, -422.826, -5.3567}, - {-2097.56, -417.083, -7.16716}, - {-2084.87, -398.626, -9.88973}, - {-2072.71, -382.324, -10.2488}, - {-2054.05, -356.728, -6.22468}, - {-2051.8, -353.645, -5.35791}, - {-2049.08, -349.912, -6.15723}, - {-2030.6, -310.724, -9.59302}, - {-2002.15, -249.308, -10.8124}, - {-1972.85, -195.811, -10.6316}, - {-1940.93, -147.652, -11.7055}, - {-1888.06, -81.943, -11.4404}, - {-1837.05, -34.0109, -12.258}, - {-1796.12, -14.6462, -10.3581}, - {-1732.61, -4.27746, -10.0213}, - {-1688.94, -0.829945, -11.7103}, - {-1681.32, 13.0313, -9.48056}, - {-1677.04, 36.8349, -7.10318}, - {-1675.2, 68.559, -8.95384}, - {-1676.57, 89.023, -9.65104}, - {-1678.16, 110.939, -10.1782}, - {-1677.86, 128.681, -5.73869}, - {-1675.27, 144.324, -3.47916}, - {-1671.7, 163.169, -1.23098}, - {-1666.61, 181.584, 5.26145}, - {-1661.51, 196.154, 8.95252}, - {-1655.47, 210.811, 8.38727}, - {-1647.07, 226.947, 5.27755}, - {-1621.65, 232.91, 2.69579}, - {-1600.23, 237.641, 2.98539}, - {-1576.07, 242.546, 4.66541}, - {-1554.57, 248.494, 6.60377}, - {-1547.53, 259.302, 10.6741}, - {-1541.7, 269.847, 16.4418}, - {-1539.83, 278.989, 21.0597}, - {-1540.16, 290.219, 27.8247}, - {-1538.99, 298.983, 34.0032}, - {-1540.38, 307.337, 41.3557}, - {-1536.61, 314.884, 48.0179}, - {-1532.42, 323.277, 55.6667}, - {-1528.77, 329.774, 61.1525}, - {-1525.65, 333.18, 63.2161}, - {-1517.01, 350.713, 62.4286}, - {-1511.39, 362.537, 62.4539}, - {-1508.68, 366.822, 62.733} + {-2226.32f, -408.095f, -9.36235f}, + {-2203.04f, -437.212f, -5.72498f}, + {-2163.91f, -457.851f, -7.09049f}, + {-2123.87f, -448.137f, -9.29591f}, + {-2104.66f, -427.166f, -6.49513f}, + {-2101.48f, -422.826f, -5.3567f}, + {-2097.56f, -417.083f, -7.16716f}, + {-2084.87f, -398.626f, -9.88973f}, + {-2072.71f, -382.324f, -10.2488f}, + {-2054.05f, -356.728f, -6.22468f}, + {-2051.8f, -353.645f, -5.35791f}, + {-2049.08f, -349.912f, -6.15723f}, + {-2030.6f, -310.724f, -9.59302f}, + {-2002.15f, -249.308f, -10.8124f}, + {-1972.85f, -195.811f, -10.6316f}, + {-1940.93f, -147.652f, -11.7055f}, + {-1888.06f, -81.943f, -11.4404f}, + {-1837.05f, -34.0109f, -12.258f}, + {-1796.12f, -14.6462f, -10.3581f}, + {-1732.61f, -4.27746f, -10.0213f}, + {-1688.94f, -0.829945f, -11.7103f}, + {-1681.32f, 13.0313f, -9.48056f}, + {-1677.04f, 36.8349f, -7.10318f}, + {-1675.2f, 68.559f, -8.95384f}, + {-1676.57f, 89.023f, -9.65104f}, + {-1678.16f, 110.939f, -10.1782f}, + {-1677.86f, 128.681f, -5.73869f}, + {-1675.27f, 144.324f, -3.47916f}, + {-1671.7f, 163.169f, -1.23098f}, + {-1666.61f, 181.584f, 5.26145f}, + {-1661.51f, 196.154f, 8.95252f}, + {-1655.47f, 210.811f, 8.38727f}, + {-1647.07f, 226.947f, 5.27755f}, + {-1621.65f, 232.91f, 2.69579f}, + {-1600.23f, 237.641f, 2.98539f}, + {-1576.07f, 242.546f, 4.66541f}, + {-1554.57f, 248.494f, 6.60377f}, + {-1547.53f, 259.302f, 10.6741f}, + {-1541.7f, 269.847f, 16.4418f}, + {-1539.83f, 278.989f, 21.0597f}, + {-1540.16f, 290.219f, 27.8247f}, + {-1538.99f, 298.983f, 34.0032f}, + {-1540.38f, 307.337f, 41.3557f}, + {-1536.61f, 314.884f, 48.0179f}, + {-1532.42f, 323.277f, 55.6667f}, + {-1528.77f, 329.774f, 61.1525f}, + {-1525.65f, 333.18f, 63.2161f}, + {-1517.01f, 350.713f, 62.4286f}, + {-1511.39f, 362.537f, 62.4539f}, + {-1508.68f, 366.822f, 62.733f} }; class npc_plains_vision : public CreatureScript diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 9b2271cbb93..2200c2056a7 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -380,76 +380,76 @@ struct Location //Cordinates for Spawns static Location SpawnLocation[]= { - {-8085, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1526, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1520, 2.61, 3.141592},//Kaldorei Infantry - - {-8085, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8085, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1516, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8080, 1424, 2.61, 3.141592},//Kaldorei Infantry - {-8085, 1422, 2.61, 3.141592},//Kaldorei Infantry + {-8085, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8085, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8085, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8080, 1424, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085, 1422, 2.61f, 3.141592f},//Kaldorei Infantry // 2 waves of warriors - {-8082, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1525, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1526, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1527, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1523, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1521, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1528, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1519, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1526, 2.61, 3.141592},//Kaldorei Infantry - - {-8082, 1524, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1522, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1520, 2.61, 3.141592},//Kaldorei Infantry - {-8078, 1518, 2.61, 3.141592},//Kaldorei Infantry - {-8082, 1516, 2.61, 3.141592},//Kaldorei Infantry - - {-8088, 1510, 2.61, 0},//Anubisath Conqueror - {-8084, 1520, 2.61, 0},//Anubisath Conqueror - {-8088, 1530, 2.61, 0},//Anubisath Conqueror - - {-8080, 1513, 2.61, 0},//Qiraj Wasp - {-8082, 1523, 2.61, 0},//Qiraj Wasp - {-8085, 1518, 2.61, 0},//Qiraj Wasp - {-8082, 1516, 2.61, 0},//Qiraj Wasp - {-8085, 1520, 2.61, 0},//Qiraj Wasp - {-8080, 1528, 2.61, 0},//Qiraj Wasp - - {-8082, 1513, 2.61, 0},//Qiraj Wasp - {-8079, 1523, 2.61, 0},//Qiraj Wasp - {-8080, 1531, 2.61, 0},//Qiraj Wasp - {-8079, 1516, 2.61, 0},//Qiraj Wasp - {-8082, 1520, 2.61, 0},//Qiraj Wasp - {-8080, 1518, 2.61, 0},//Qiraj Wasp - - {-8081, 1514, 2.61, 0},//Qiraj Tank - {-8081, 1520, 2.61, 0},//Qiraj Tank - {-8081, 1526, 2.61, 0},//Qiraj Tank - {-8081, 1512, 2.61, 0},//Qiraj Tank - {-8082, 1520, 2.61, 0},//Qiraj Tank - {-8081, 1528, 2.61, 0},//Qiraj Tank - - {-8082, 1513, 2.61, 3.141592},//Anubisath Conqueror - {-8082, 1520, 2.61, 3.141592},//Anubisath Conqueror - {-8082, 1527, 2.61, 3.141592},//Anubisath Conqueror + {-8082, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1525, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1527, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1523, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1521, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1528, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1519, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1526, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8082, 1524, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1522, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1520, 2.61f, 3.141592f},//Kaldorei Infantry + {-8078, 1518, 2.61f, 3.141592f},//Kaldorei Infantry + {-8082, 1516, 2.61f, 3.141592f},//Kaldorei Infantry + + {-8088, 1510, 2.61f, 0},//Anubisath Conqueror + {-8084, 1520, 2.61f, 0},//Anubisath Conqueror + {-8088, 1530, 2.61f, 0},//Anubisath Conqueror + + {-8080, 1513, 2.61f, 0},//Qiraj Wasp + {-8082, 1523, 2.61f, 0},//Qiraj Wasp + {-8085, 1518, 2.61f, 0},//Qiraj Wasp + {-8082, 1516, 2.61f, 0},//Qiraj Wasp + {-8085, 1520, 2.61f, 0},//Qiraj Wasp + {-8080, 1528, 2.61f, 0},//Qiraj Wasp + + {-8082, 1513, 2.61f, 0},//Qiraj Wasp + {-8079, 1523, 2.61f, 0},//Qiraj Wasp + {-8080, 1531, 2.61f, 0},//Qiraj Wasp + {-8079, 1516, 2.61f, 0},//Qiraj Wasp + {-8082, 1520, 2.61f, 0},//Qiraj Wasp + {-8080, 1518, 2.61f, 0},//Qiraj Wasp + + {-8081, 1514, 2.61f, 0},//Qiraj Tank + {-8081, 1520, 2.61f, 0},//Qiraj Tank + {-8081, 1526, 2.61f, 0},//Qiraj Tank + {-8081, 1512, 2.61f, 0},//Qiraj Tank + {-8082, 1520, 2.61f, 0},//Qiraj Tank + {-8081, 1528, 2.61f, 0},//Qiraj Tank + + {-8082, 1513, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082, 1520, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082, 1527, 2.61f, 3.141592f},//Anubisath Conqueror }; struct WaveData @@ -570,7 +570,7 @@ public: break; case 7: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, NULL); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); + Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); break; case 8: DoScriptText(MERITHRA_YELL_1,Merithra); @@ -581,7 +581,7 @@ public: case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Merithra->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61,3); + Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,3); break; case 11: Merithra->CastSpell(Merithra,24818,false); @@ -596,8 +596,8 @@ public: Merithra->SetVisibility(VISIBILITY_OFF); break; case 15: - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); - Merithra->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,42); + Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); break; case 16: DoScriptText(ARYGOS_YELL_1, Arygos); @@ -608,7 +608,7 @@ public: case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Arygos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61,42); + Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,42); break; case 19: Arygos->CastSpell(Arygos,50505,false); @@ -622,9 +622,9 @@ public: DoScriptText(CAELESTRASZ_SAY_2,Caelestrasz, Fandral); break; case 23: - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61,10); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); Arygos->SetVisibility(VISIBILITY_OFF); - Arygos->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,10); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10); break; case 24: DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); @@ -635,7 +635,7 @@ public: case 26: Caelestrasz->HandleEmoteCommand(254); Caelestrasz->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61,4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61f,4); break; case 27: Caelestrasz->CastSpell(Caelestrasz,54293,false); @@ -654,9 +654,9 @@ public: break; case 32: Caelestrasz->SetVisibility(VISIBILITY_OFF); - Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535,1535.14,2.61,42); - Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77,8); - me->GetMotionMaster()->MoveCharge(-8113,1525,2.77,8); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); + Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8); + me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8); break;//both run to the gate case 33: DoScriptText(ANACHRONOS_SAY_4, me); @@ -666,17 +666,17 @@ public: DoCast(plr, 23017, true);//Arcane Channeling break; case 35: - me->CastSpell(-8088,1520.43,2.67,25158,true); + me->CastSpell(-8088,1520.43f,2.67f,25158,true); break; case 36: DoCast(plr, 25159, true); break; case 37: - me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); break; case 38: DoCast(plr, 25166, true); - me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); break; case 39: DoScriptText(ANACHRONOS_SAY_5, me, Fandral); @@ -685,7 +685,7 @@ public: Fandral->CastSpell(me, 25167, true); break; case 41: - Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); DoScriptText(FANDRAL_SAY_3, Fandral); break; case 42: @@ -703,7 +703,7 @@ public: break; case 46: DoScriptText(ANACHRONOS_SAY_8, me); - me->GetMotionMaster()->MoveCharge(-8110,1527,2.77,4); + me->GetMotionMaster()->MoveCharge(-8110,1527,2.77f,4); break; case 47: DoScriptText(ANACHRONOS_EMOTE_1, me); @@ -716,7 +716,7 @@ public: break; case 50: DoScriptText(FANDRAL_EMOTE_2,Fandral); - Fandral->CastSpell(-8127,1525,17.5,33806,true); + Fandral->CastSpell(-8127,1525,17.5f,33806,true); break; case 51: { @@ -733,7 +733,7 @@ public: break; } case 52: - Fandral->GetMotionMaster()->MoveCharge(-8028.75, 1538.795, 2.61,4); + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f,4); DoScriptText(ANACHRONOS_SAY_9, me,Fandral); break; case 53: @@ -747,24 +747,24 @@ public: break; case 56: DoScriptText(ANACHRONOS_EMOTE_3, me); - me->GetMotionMaster()->MoveCharge(-8116,1522,3.65,4); + me->GetMotionMaster()->MoveCharge(-8116,1522,3.65f,4); break; case 57: - me->GetMotionMaster()->MoveCharge(-8116.7,1527,3.7,4); + me->GetMotionMaster()->MoveCharge(-8116.7f,1527,3.7f,4); break; case 58: - me->GetMotionMaster()->MoveCharge(-8112.67,1529.9,2.86,4); + me->GetMotionMaster()->MoveCharge(-8112.67f,1529.9f,2.86f,4); break; case 59: - me->GetMotionMaster()->MoveCharge(-8117.99,1532.24,3.94,4); + me->GetMotionMaster()->MoveCharge(-8117.99f,1532.24f,3.94f,4); break; case 60: if (plr) DoScriptText(ANACHRONOS_SAY_10, me,plr); - me->GetMotionMaster()->MoveCharge(-8113.46,1524.16,2.89,4); + me->GetMotionMaster()->MoveCharge(-8113.46f,1524.16f,2.89f,4); break; case 61: - me->GetMotionMaster()->MoveCharge(-8057.1,1470.32,2.61,6); + me->GetMotionMaster()->MoveCharge(-8057.1f,1470.32f,2.61f,6); if (plr->IsInRange(me,0,15)) plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD ,me); break; @@ -1104,11 +1104,11 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535,1535.14,2.61,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767, 1533.148,2.61, 1.5,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52, 1537.843, 2.61, 5.7,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462, 1535.843, 2.61, 3.141592,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75, 1538.795, 2.61, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535f,1535.14f,2.61f,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767f, 1533.148f,2.61f, 1.5f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52f, 1537.843f, 2.61f, 5.7f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462f, 1535.843f, 2.61f, 3.141592f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75f, 1538.795f, 2.61f, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); if (Merithra) { diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 8db4955cd2e..0815d58ac5e 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -125,9 +125,9 @@ public: { case 16: DoScriptText(SAY_AMBUSH, me); - me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53, -503.34, -46.31, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85, -503.77, -45.90, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37, -496.23, -45.71, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53f, -503.34f, -46.31f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 18: me->SetInFront(pPlayer); DoScriptText(SAY_END, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 4b9601580f9..6f017f32493 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -215,7 +215,7 @@ public: { if (who->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE) { - float Radius = 10.0; + float Radius = 10.0f; if (me->IsWithinDistInMap(who, Radius)) { Start(false, false, who->GetGUID()); @@ -439,16 +439,16 @@ public: switch(i) { case 23: - me->SummonCreature(SPAWN_FIRST, -8350.96, -4445.79, 10.10, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, -8355.96, -4447.79, 10.10, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_FIRST, -8353.96, -4442.79, 10.10, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_OOX_AMBUSH, me); break; case 56: - me->SummonCreature(SPAWN_SECOND_1, -7510.07, -4795.50, 9.35, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_SECOND_2, -7515.07, -4797.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - me->SummonCreature(SPAWN_SECOND_2, -7518.07, -4792.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_OOX_AMBUSH, me); if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff); @@ -503,7 +503,7 @@ enum eTooga FACTION_TOOG_ESCORTEE = 113 }; -const float m_afToWaterLoc[] = {-7032.664551, -4906.199219, -1.606446}; +const float m_afToWaterLoc[] = {-7032.664551f, -4906.199219f, -1.606446f}; class npc_tooga : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 2660fb96022..2b7df3202b0 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -333,12 +333,12 @@ enum eTwiggyFlathead float AffrayChallengerLoc[6][4]= { - {-1683, -4326, 2.79, 0}, - {-1682, -4329, 2.79, 0}, - {-1683, -4330, 2.79, 0}, - {-1680, -4334, 2.79, 1.49}, - {-1674, -4326, 2.79, 3.49}, - {-1677, -4334, 2.79, 1.66} + {-1683.0f, -4326.0f, 2.79f, 0.0f}, + {-1682.0f, -4329.0f, 2.79f, 0.0f}, + {-1683.0f, -4330.0f, 2.79f, 0.0f}, + {-1680.0f, -4334.0f, 2.79f, 1.49f}, + {-1674.0f, -4326.0f, 2.79f, 3.49f}, + {-1677.0f, -4334.0f, 2.79f, 1.66f} }; class npc_twiggy_flathead : public CreatureScript @@ -509,12 +509,12 @@ public: } } else if (Wave >= 6 && !EventBigWill) { - if (Creature* pCreature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000)) + if (Creature* pCreature = me->SummonCreature(NPC_BIG_WILL, -1722, -4341, 6.12f, 6.26f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000)) { BigWill = pCreature->GetGUID(); - //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32); - //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78); - pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79); + //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32f); + //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78f); + pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79f); pCreature->HandleEmoteCommand(EMOTE_STATE_READYUNARMED); EventBigWill = true; Wave_Timer = 1000; diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 0c555c0d6e8..35d808d779d 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -47,7 +47,7 @@ enum eKanati NPC_GALAK_ASS = 10720 }; -const float m_afGalakLoc[]= {-4867.387695, -1357.353760, -48.226 }; +const float m_afGalakLoc[]= {-4867.387695f, -1357.353760f, -48.226f }; class npc_kanati : public CreatureScript { @@ -131,12 +131,12 @@ enum eLakota float m_afBanditLoc[6][6]= { - {-4905.479492, -2062.732666, 84.352}, - {-4915.201172, -2073.528320, 84.733}, - {-4878.883301, -1986.947876, 91.966}, - {-4877.503906, -1966.113403, 91.859}, - {-4767.985352, -1873.169189, 90.192}, - {-4788.861328, -1888.007813, 89.888} + {-4905.479492f, -2062.732666f, 84.352f}, + {-4915.201172f, -2073.528320f, 84.733f}, + {-4878.883301f, -1986.947876f, 91.966f}, + {-4877.503906f, -1966.113403f, 91.859f}, + {-4767.985352f, -1873.169189f, 90.192f}, + {-4788.861328f, -1888.007813f, 89.888f} }; class npc_lakota_windsong : public CreatureScript @@ -221,9 +221,9 @@ enum ePacka float m_afWyvernLoc[3][3]= { - {-4990.606, -906.057, -5.343}, - {-4970.241, -927.378, -4.951}, - {-4985.364, -952.528, -5.199} + {-4990.606f, -906.057f, -5.343f}, + {-4970.241f, -927.378f, -4.951f}, + {-4985.364f, -952.528f, -5.199f} }; class npc_paoka_swiftmountain : public CreatureScript diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 46cf08f5b3b..2352b95f387 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -86,18 +86,18 @@ public: { case 19: - me->SummonCreature(ENTRY_STOMPER, -6391.69, -1730.49, -272.83, 4.96, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO1, me, pPlayer); break; case 28: DoScriptText(SAY_SEARCH, me, pPlayer); break; case 38: - me->SummonCreature(ENTRY_TARLORD, -6370.75, -1382.84, -270.51, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO2, me, pPlayer); break; case 49: - me->SummonCreature(ENTRY_TARLORD1, -6324.44, -1181.05, -270.17, 4.34, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); DoScriptText(SAY_AGGRO3, me, pPlayer); break; case 55: |