diff options
| author | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-22 23:46:40 +0600 |
| commit | 399e35f8f53aeabcda8af513a37bb855340663e5 (patch) | |
| tree | 7beb6bf445bd0fd46e3341039b6d712bb08bbe2e /src/server/scripts/Northrend | |
| parent | d38135d1fd9417f90ee6f9decc37767f95035596 (diff) | |
Core:
* fix "warning C4305: 'initializing' : truncation from 'double' to 'float'" warnings
* fix some other warnings here and there
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/Northrend')
52 files changed, 848 insertions, 822 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index bfc402e5327..2894c62e06c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -76,14 +76,14 @@ enum Phases const Position SpawnPoint[2] = { - { 550.7, 282.8, 224.3 }, - { 551.1, 229.4, 224.3 }, + { 550.7f, 282.8f, 224.3f }, + { 551.1f, 229.4f, 224.3f }, }; const Position SpawnPointGuardian[2] = { - { 550.348633, 316.006805, 234.2947 }, - { 550.188660, 324.264557, 237.7412 }, + { 550.348633f, 316.006805f, 234.2947f }, + { 550.188660f, 324.264557f, 237.7412f }, }; class boss_anub_arak : public CreatureScript @@ -319,7 +319,7 @@ public: if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); } - uiPoundTimer = 16.5*IN_MILLISECONDS; + uiPoundTimer = 16.5f*IN_MILLISECONDS; } else uiPoundTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 0e1b103aa55..48da4cc8e9d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -82,14 +82,14 @@ enum Misc const Position SpawnPoint[] = { - { 566.164, 682.087, 769.079, 2.21657 }, - { 529.042, 706.941, 777.298, 1.0821 }, - { 489.975, 671.239, 772.131, 0.261799 }, - { 488.556, 692.95, 771.764, 4.88692 }, - { 553.34, 640.387, 777.419, 1.20428 }, - { 517.486, 706.398, 777.335, 5.35816 }, - { 504.01, 637.693, 777.479, 0.506145 }, - { 552.625, 706.408, 777.177, 3.4383 } + { 566.164f, 682.087f, 769.079f, 2.21657f }, + { 529.042f, 706.941f, 777.298f, 1.0821f }, + { 489.975f, 671.239f, 772.131f, 0.261799f }, + { 488.556f, 692.95f, 771.764f, 4.88692f }, + { 553.34f, 640.387f, 777.419f, 1.20428f }, + { 517.486f, 706.398f, 777.335f, 5.35816f }, + { 504.01f, 637.693f, 777.479f, 0.506145f }, + { 552.625f, 706.408f, 777.177f, 3.4383f } }; class boss_krik_thir : public CreatureScript diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 12e8791848a..b1614946050 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -44,8 +44,8 @@ enum Misc H_DATA_EMBRACE_DMG = 40000, DATA_SPHERE_DISTANCE = 15 }; -#define DATA_SPHERE_ANGLE_OFFSET 0.7 -#define DATA_GROUND_POSITION_Z 11.4 +#define DATA_SPHERE_ANGLE_OFFSET 0.7f +#define DATA_GROUND_POSITION_Z 11.4f enum Yells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 7113194ea33..879338f50d4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -114,7 +114,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -240,7 +240,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -419,13 +419,13 @@ public: switch(uiWaypoint) { case 0: - me->SetOrientation(5.81); + me->SetOrientation(5.81f); break; case 1: - me->SetOrientation(4.60); + me->SetOrientation(4.60f); break; case 2: - me->SetOrientation(2.79); + me->SetOrientation(2.79f); break; } @@ -441,13 +441,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,712.14,628.42,411.88); + AddWaypoint(0,712.14f,628.42f,411.88f); break; case 1: - AddWaypoint(0,742.44,650.29,411.79); + AddWaypoint(0,742.44f,650.29f,411.79f); break; case 2: - AddWaypoint(0,783.33,615.29,411.84); + AddWaypoint(0,783.33f,615.29f,411.84f); break; } break; @@ -455,13 +455,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,713.12,632.97,411.90); + AddWaypoint(0,713.12f,632.97f,411.90f); break; case 1: - AddWaypoint(0,746.73,650.24,411.56); + AddWaypoint(0,746.73f,650.24f,411.56f); break; case 2: - AddWaypoint(0,781.32,610.54,411.82); + AddWaypoint(0,781.32f,610.54f,411.82f); break; } break; @@ -469,13 +469,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,715.06,637.07,411.91); + AddWaypoint(0,715.06f,637.07f,411.91f); break; case 1: - AddWaypoint(0,750.72,650.20,411.77); + AddWaypoint(0,750.72f,650.20f,411.77f); break; case 2: - AddWaypoint(0,779.77,607.03,411.81); + AddWaypoint(0,779.77f,607.03f,411.81f); break; } break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 9569a68476f..d9b07573065 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -85,9 +85,9 @@ struct Point const Point MovementPoint[] = { - {746.84,623.15,411.41}, - {747.96,620.29,411.09}, - {750.23,618.35,411.09} + {746.84f,623.15f,411.41f}, + {747.96f,620.29f,411.09f}, + {750.23f,618.35f,411.09f} }; void AggroAllPlayers(Creature* pTemp) @@ -178,22 +178,22 @@ public: switch(uiType) { case 1: - AddWaypoint(0,747.36,634.07,411.572); - AddWaypoint(1,780.43,607.15,411.82); - AddWaypoint(2,785.99,599.41,411.92); - AddWaypoint(3,778.44,601.64,411.79); + AddWaypoint(0,747.36f,634.07f,411.572f); + AddWaypoint(1,780.43f,607.15f,411.82f); + AddWaypoint(2,785.99f,599.41f,411.92f); + AddWaypoint(3,778.44f,601.64f,411.79f); uiWaypointPath = 1; break; case 2: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,768.72,581.01,411.92); - AddWaypoint(2,763.55,590.52,411.71); + AddWaypoint(0,747.35f,634.07f,411.57f); + AddWaypoint(1,768.72f,581.01f,411.92f); + AddWaypoint(2,763.55f,590.52f,411.71f); uiWaypointPath = 2; break; case 3: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,784.02,645.33,412.39); - AddWaypoint(2,775.67,641.91,411.91); + AddWaypoint(0,747.35f,634.07f,411.57f); + AddWaypoint(1,784.02f,645.33f,412.39f); + AddWaypoint(2,775.67f,641.91f,411.91f); uiWaypointPath = 3; break; } @@ -362,11 +362,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); EnterEvadeMode(); bHome = true; @@ -496,11 +496,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -642,11 +642,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -789,11 +789,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -937,11 +937,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); + me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); + me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); + me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 7a46c83edd7..9cd5c55af1b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -190,9 +190,9 @@ public: { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } } } @@ -203,7 +203,7 @@ public: { if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) { - pBoss->GetMotionMaster()->MovePoint(0,746.88,618.74,411.06); + pBoss->GetMotionMaster()->MovePoint(0,746.88f,618.74f,411.06f); pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); pBoss->SetReactState(REACT_AGGRESSIVE); } @@ -213,18 +213,18 @@ public: m_auiEncounter[1] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } break; case BOSS_ARGENT_CHALLENGE_P: m_auiEncounter[2] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); } break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 99e0c44ba57..9238efa1539 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -33,13 +33,13 @@ EndContentData */ #define GOSSIP_START_EVENT1 "I'm ready to start challenge." #define GOSSIP_START_EVENT2 "I'm ready for the next challenge." -#define ORIENTATION 4.714 +#define ORIENTATION 4.714f /*###### ## npc_announcer_toc5 ######*/ -const Position SpawnPosition = {746.261,657.401,411.681,4.65}; +const Position SpawnPosition = {746.261f,657.401f,411.681f,4.65f}; class npc_announcer_toc5 : public CreatureScript { @@ -124,7 +124,7 @@ public: NextStep(10000,false,1); break; case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) pInstance->HandleGameObject(pGO->GetGUID(),false); NextStep(10000,false,3); @@ -306,7 +306,7 @@ public: void DoStartArgentChampionEncounter() { - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); if (Creature* pBoss = me->SummonCreature(uiArgentChampion,SpawnPosition)) { @@ -369,7 +369,7 @@ public: if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834,651.915,447.035,0); + me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 87467b261ac..d0fd2d83916 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -109,12 +109,12 @@ enum SummonActions };
const Position SphereSpawn[6] = { - { 786.6439, 108.2498, 155.6701 }, - { 806.8429, 150.5902, 155.6701 }, - { 759.1386, 163.9654, 155.6701 }, - { 744.3701, 119.5211, 155.6701 }, - { 710.0211, 120.8152, 155.6701 }, - { 706.6383, 161.5266, 155.6701 }, + { 786.6439f, 108.2498f, 155.6701f }, + { 806.8429f, 150.5902f, 155.6701f }, + { 759.1386f, 163.9654f, 155.6701f }, + { 744.3701f, 119.5211f, 155.6701f }, + { 710.0211f, 120.8152f, 155.6701f }, + { 706.6383f, 161.5266f, 155.6701f }, };
class boss_anubarak_trial : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 007d0e27304..b3119228d93 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -42,8 +42,11 @@ enum eAIs AI_PET = 3, }; -#define SPELL_ANTI_AOE 68595 -#define SPELL_PVP_TRINKET 65547 +enum eSpells +{ + SPELL_ANTI_AOE = 68595, + SPELL_PVP_TRINKET = 65547, +};
class boss_toc_champion_controller : public CreatureScript { public: @@ -429,15 +432,17 @@ struct boss_faction_championsAI : public ScriptedAI /******************************************************************** HEALERS ********************************************************************/ - -#define SPELL_LIFEBLOOM 66093 -#define SPELL_NOURISH 66066 -#define SPELL_REGROWTH 66067 -#define SPELL_REJUVENATION 66065 -#define SPELL_TRANQUILITY 66086 -#define SPELL_BARKSKIN 65860 //1 min cd -#define SPELL_THORNS 66068 -#define SPELL_NATURE_GRASP 66071 //1 min cd, self buff +enum eDruidSpells +{ + SPELL_LIFEBLOOM = 66093, + SPELL_NOURISH = 66066, + SPELL_REGROWTH = 66067, + SPELL_REJUVENATION = 66065, + SPELL_TRANQUILITY = 66086, + SPELL_BARKSKIN = 65860, //1 min cd + SPELL_THORNS = 66068, + SPELL_NATURE_GRASP = 66071, //1 min cd, self buff +};
class mob_toc_druid : public CreatureScript { public: @@ -520,16 +525,19 @@ public: }; -#define SPELL_HEALING_WAVE 66055 -#define SPELL_RIPTIDE 66053 -#define SPELL_SPIRIT_CLEANSE 66056 //friendly only -#define SPELL_HEROISM 65983 -#define SPELL_BLOODLUST 65980 -#define SPELL_HEX 66054 -#define SPELL_EARTH_SHIELD 66063 -#define SPELL_EARTH_SHOCK 65973 -#define AURA_EXHAUSTION 57723 -#define AURA_SATED 57724 +enum eShamanSpells +{ + SPELL_HEALING_WAVE = 66055, + SPELL_RIPTIDE = 66053, + SPELL_SPIRIT_CLEANSE = 66056, //friendly only + SPELL_HEROISM = 65983, + SPELL_BLOODLUST = 65980, + SPELL_HEX = 66054, + SPELL_EARTH_SHIELD = 66063, + SPELL_EARTH_SHOCK = 65973, + AURA_EXHAUSTION = 57723, + AURA_SATED = 57724, +};
class mob_toc_shaman : public CreatureScript { public: @@ -609,14 +617,17 @@ public: }; -#define SPELL_HAND_OF_FREEDOM 68757 //25 sec cd -#define SPELL_BUBBLE 66010 //5 min cd -#define SPELL_CLEANSE 66116 -#define SPELL_FLASH_OF_LIGHT 66113 -#define SPELL_HOLY_LIGHT 66112 -#define SPELL_HOLY_SHOCK 66114 -#define SPELL_HAND_OF_PROTECTION 66009 -#define SPELL_HAMMER_OF_JUSTICE 66613 +enum ePaladinSpells +{ + SPELL_HAND_OF_FREEDOM = 68757, //25 sec cd + SPELL_BUBBLE = 66010, //5 min cd + SPELL_CLEANSE = 66116, + SPELL_FLASH_OF_LIGHT = 66113, + SPELL_HOLY_LIGHT = 66112, + SPELL_HOLY_SHOCK = 66114, + SPELL_HAND_OF_PROTECTION = 66009, + SPELL_HAMMER_OF_JUSTICE = 66613, +};
class mob_toc_paladin : public CreatureScript { public: @@ -714,13 +725,15 @@ public: }; -#define SPELL_RENEW 66177 -#define SPELL_SHIELD 66099 -#define SPELL_FLASH_HEAL 66104 -#define SPELL_DISPEL 65546 -#define SPELL_PSYCHIC_SCREAM 65543 -#define SPELL_MANA_BURN 66100 -
class mob_toc_priest : public CreatureScript +enum ePriestSpells +{ + SPELL_RENEW = 66177, + SPELL_SHIELD = 66099, + SPELL_FLASH_HEAL = 66104, + SPELL_DISPEL = 65546, + SPELL_PSYCHIC_SCREAM = 65543, + SPELL_MANA_BURN = 66100, +};
class mob_toc_priest : public CreatureScript { public: mob_toc_priest() : CreatureScript("mob_toc_priest") { } @@ -789,15 +802,17 @@ public: /******************************************************************** RANGED ********************************************************************/ - -#define SPELL_SILENCE 65542 -#define SPELL_VAMPIRIC_TOUCH 65490 -#define SPELL_SW_PAIN 65541 -#define SPELL_MIND_FLAY 65488 -#define SPELL_MIND_BLAST 65492 -#define SPELL_HORROR 65545 -#define SPELL_DISPERSION 65544 -#define SPELL_SHADOWFORM 16592 +enum eShadowPriestSpells +{ + SPELL_SILENCE = 65542, + SPELL_VAMPIRIC_TOUCH = 65490, + SPELL_SW_PAIN = 65541, + SPELL_MIND_FLAY = 65488, + SPELL_MIND_BLAST = 65492, + SPELL_HORROR = 65545, + SPELL_DISPERSION = 65544, + SPELL_SHADOWFORM = 16592, +};
class mob_toc_shadow_priest : public CreatureScript { public: @@ -897,17 +912,19 @@ public: }; -#define SPELL_HELLFIRE 65816 -#define SPELL_CORRUPTION 65810 -#define SPELL_CURSE_OF_AGONY 65814 -#define SPELL_CURSE_OF_EXHAUSTION 65815 -#define SPELL_FEAR 65809 //8s -#define SPELL_SEARING_PAIN 65819 -#define SPELL_SHADOW_BOLT 65821 -#define SPELL_UNSTABLE_AFFLICTION 65812 -#define SPELL_SUMMON_FELHUNTER 67514 -#define H_SPELL_UNSTABLE_AFFLICTION 68155 //15s -
class mob_toc_warlock : public CreatureScript +enum eWarlockSpells +{ + SPELL_HELLFIRE = 65816, + SPELL_CORRUPTION = 65810, + SPELL_CURSE_OF_AGONY = 65814, + SPELL_CURSE_OF_EXHAUSTION = 65815, + SPELL_FEAR = 65809, //8s + SPELL_SEARING_PAIN = 65819, + SPELL_SHADOW_BOLT = 65821, + SPELL_UNSTABLE_AFFLICTION = 65812, + SPELL_SUMMON_FELHUNTER = 67514, + H_SPELL_UNSTABLE_AFFLICTION = 68155, //15s +};
class mob_toc_warlock : public CreatureScript { public: mob_toc_warlock() : CreatureScript("mob_toc_warlock") { } @@ -1001,16 +1018,18 @@ public: }; -#define SPELL_ARCANE_BARRAGE 65799 //3s -#define SPELL_ARCANE_BLAST 65791 -#define SPELL_ARCANE_EXPLOSION 65800 -#define SPELL_BLINK 65793 //15s -#define SPELL_COUNTERSPELL 65790 //24s -#define SPELL_FROST_NOVA 65792 //25s -#define SPELL_FROSTBOLT 65807 -#define SPELL_ICE_BLOCK 65802 //5min -#define SPELL_POLYMORPH 65801 //15s -
class mob_toc_mage : public CreatureScript +enum eMageSpells +{ + SPELL_ARCANE_BARRAGE = 65799, //3s + SPELL_ARCANE_BLAST = 65791, + SPELL_ARCANE_EXPLOSION = 65800, + SPELL_BLINK = 65793, //15s + SPELL_COUNTERSPELL = 65790, //24s + SPELL_FROST_NOVA = 65792, //25s + SPELL_FROSTBOLT = 65807, + SPELL_ICE_BLOCK = 65802, //5min + SPELL_POLYMORPH = 65801, //15s +};
class mob_toc_mage : public CreatureScript { public: mob_toc_mage() : CreatureScript("mob_toc_mage") { } @@ -1099,17 +1118,19 @@ public: }; - -#define SPELL_AIMED_SHOT 65883 -#define SPELL_DETERRENCE 65871 //90s -#define SPELL_DISENGAGE 65869 //30s -#define SPELL_EXPLOSIVE_SHOT 65866 -#define SPELL_FROST_TRAP 65880 //30s -#define SPELL_SHOOT 65868 //1.7s -#define SPELL_STEADY_SHOT 65867 //3s -#define SPELL_WING_CLIP 66207 //6s -#define SPELL_WYVERN_STING 65877 //60s -#define SPELL_CALL_PET 67777 +enum eHunterSpells +{ + SPELL_AIMED_SHOT = 65883, + SPELL_DETERRENCE = 65871, //90s + SPELL_DISENGAGE = 65869, //30s + SPELL_EXPLOSIVE_SHOT = 65866, + SPELL_FROST_TRAP = 65880, //30s + SPELL_SHOOT = 65868, //1.7s + SPELL_STEADY_SHOT = 65867, //3s + SPELL_WING_CLIP = 66207, //6s + SPELL_WYVERN_STING = 65877, //60s + SPELL_CALL_PET = 67777, +};
class mob_toc_hunter : public CreatureScript { public: @@ -1214,15 +1235,17 @@ public: }; -#define SPELL_CYCLONE 65859 //6s -#define SPELL_ENTANGLING_ROOTS 65857 //10s -#define SPELL_FAERIE_FIRE 65863 -#define SPELL_FORCE_OF_NATURE 65861 //180s -#define SPELL_INSECT_SWARM 65855 -#define SPELL_MOONFIRE 65856 //5s -#define SPELL_STARFIRE 65854 -#define SPELL_WRATH 65862 -
class mob_toc_boomkin : public CreatureScript +enum eBoomkinSpells +{ + SPELL_CYCLONE = 65859, //6s + SPELL_ENTANGLING_ROOTS = 65857, //10s + SPELL_FAERIE_FIRE = 65863, + SPELL_FORCE_OF_NATURE = 65861, //180s + SPELL_INSECT_SWARM = 65855, + SPELL_MOONFIRE = 65856, //5s + SPELL_STARFIRE = 65854, + SPELL_WRATH = 65862, +};
class mob_toc_boomkin : public CreatureScript { public: mob_toc_boomkin() : CreatureScript("mob_toc_boomkin") { } @@ -1313,17 +1336,18 @@ public: /******************************************************************** MELEE ********************************************************************/ - -#define SPELL_BLADESTORM 65947 -#define SPELL_INTIMIDATING_SHOUT 65930 -#define SPELL_MORTAL_STRIKE 65926 -#define SPELL_CHARGE 68764 -#define SPELL_DISARM 65935 -#define SPELL_OVERPOWER 65924 -#define SPELL_SUNDER_ARMOR 65936 -#define SPELL_SHATTERING_THROW 65940 -#define SPELL_RETALIATION 65932 -
class mob_toc_warrior : public CreatureScript +enum eWarriorSpells +{ + SPELL_BLADESTORM = 65947, + SPELL_INTIMIDATING_SHOUT = 65930, + SPELL_MORTAL_STRIKE = 65926, + SPELL_CHARGE = 68764, + SPELL_DISARM = 65935, + SPELL_OVERPOWER = 65924, + SPELL_SUNDER_ARMOR = 65936, + SPELL_SHATTERING_THROW = 65940, + SPELL_RETALIATION = 65932, +};
class mob_toc_warrior : public CreatureScript { public: mob_toc_warrior() : CreatureScript("mob_toc_warrior") { } @@ -1426,14 +1450,16 @@ public: }; -#define SPELL_CHAINS_OF_ICE 66020 //8sec -#define SPELL_DEATH_COIL 66019 //5sec -#define SPELL_DEATH_GRIP 66017 //35sec -#define SPELL_FROST_STRIKE 66047 //6sec -#define SPELL_ICEBOUND_FORTITUDE 66023 //1min -#define SPELL_ICY_TOUCH 66021 //8sec -#define SPELL_STRANGULATE 66018 //2min -
class mob_toc_dk : public CreatureScript +enum eDeathKnightSpells +{ + SPELL_CHAINS_OF_ICE = 66020, //8sec + SPELL_DEATH_COIL = 66019, //5sec + SPELL_DEATH_GRIP = 66017, //35sec + SPELL_FROST_STRIKE = 66047, //6sec + SPELL_ICEBOUND_FORTITUDE = 66023, //1min + SPELL_ICY_TOUCH = 66021, //8sec + SPELL_STRANGULATE = 66018, //2min +};
class mob_toc_dk : public CreatureScript { public: mob_toc_dk() : CreatureScript("mob_toc_dk") { } @@ -1524,14 +1550,16 @@ public: }; -#define SPELL_FAN_OF_KNIVES 65955 //2sec -#define SPELL_BLIND 65960 //2min -#define SPELL_CLOAK 65961 //90sec -#define SPELL_BLADE_FLURRY 65956 //2min -#define SPELL_SHADOWSTEP 66178 //30sec -#define SPELL_HEMORRHAGE 65954 -#define SPELL_EVISCERATE 65957 -
class mob_toc_rogue : public CreatureScript +enum eRogueSpells +{ + SPELL_FAN_OF_KNIVES = 65955, //2sec + SPELL_BLIND = 65960, //2min + SPELL_CLOAK = 65961, //90sec + SPELL_BLADE_FLURRY = 65956, //2min + SPELL_SHADOWSTEP = 66178, //30sec + SPELL_HEMORRHAGE = 65954, + SPELL_EVISCERATE = 65957, +};
class mob_toc_rogue : public CreatureScript { public: mob_toc_rogue() : CreatureScript("mob_toc_rogue") { } @@ -1623,9 +1651,12 @@ public: }; -#define SPELL_EARTH_SHOCK 65973 -#define SPELL_LAVA_LASH 65974 -#define SPELL_STORMSTRIKE 65970 +enum eEnhShamanSpells +{ + SPELL_EARTH_SHOCK_ENH = 65973, + SPELL_LAVA_LASH = 65974, + SPELL_STORMSTRIKE = 65970, +};
class mob_toc_enh_shaman : public CreatureScript { public: @@ -1716,7 +1747,7 @@ public: if (m_uiEarthShockTimer <= uiDiff) { - DoCastVictim(SPELL_EARTH_SHOCK); + DoCastVictim(SPELL_EARTH_SHOCK_ENH); m_uiEarthShockTimer = urand(5*IN_MILLISECONDS,8*IN_MILLISECONDS); } else m_uiEarthShockTimer -= uiDiff; @@ -1745,15 +1776,18 @@ public: }; -#define SPELL_AVENGING_WRATH 66011 //3min cd -#define SPELL_CRUSADER_STRIKE 66003 //6sec cd -#define SPELL_DIVINE_SHIELD 66010 //5min cd -#define SPELL_DIVINE_STORM 66006 //10sec cd -#define SPELL_HAMMER_OF_JUSTICE 66007 //40sec cd -#define SPELL_HAND_OF_PROTECTION 66009 //5min cd -#define SPELL_JUDGEMENT_OF_COMMAND 66005 //8sec cd -#define SPELL_REPENTANCE 66008 //60sec cd -#define SPELL_SEAL_OF_COMMAND 66004 //no cd +enum eRetroPaladinSpells +{ + SPELL_AVENGING_WRATH = 66011, //3min cd + SPELL_CRUSADER_STRIKE = 66003, //6sec cd + SPELL_DIVINE_SHIELD = 66010, //5min cd + SPELL_DIVINE_STORM = 66006, //10sec cd + SPELL_HAMMER_OF_JUSTICE_RET = 66007, //40sec cd + SPELL_HAND_OF_PROTECTION_RET = 66009, //5min cd + SPELL_JUDGEMENT_OF_COMMAND = 66005, //8sec cd + SPELL_REPENTANCE = 66008, //60sec cd + SPELL_SEAL_OF_COMMAND = 66004, //no cd +};
class mob_toc_retro_paladin : public CreatureScript { public: @@ -1841,8 +1875,11 @@ public: }; -#define SPELL_DEVOUR_MAGIC 67518 -#define SPELL_SPELL_LOCK 67519 +enum eWarlockPetSpells +{ + SPELL_DEVOUR_MAGIC = 67518, + SPELL_SPELL_LOCK = 67519, +}; class mob_toc_pet_warlock : public CreatureScript { @@ -1890,7 +1927,11 @@ public: }; -#define SPELL_CLAW 67793 +enum eHunterPetSpells +{ + SPELL_CLAW = 67793, +}; + class mob_toc_pet_hunter : public CreatureScript { public: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 0419ec380d7..b39e1cca7d7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -295,7 +295,7 @@ public: } if (tributeChest) if (Creature* pTirion = instance->GetCreature(m_uiTirionGUID)) - if (GameObject* pChest = pTirion->SummonGameObject(tributeChest,805.62,134.87,142.16,3.27,0,0,0,0,90000000)) + if (GameObject* pChest = pTirion->SummonGameObject(tributeChest,805.62f,134.87f,142.16f,3.27f,0,0,0,0,90000000)) pChest->SetRespawnTime(pChest->GetRespawnDelay()); break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index 3704331ddb1..9f387d63314 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -76,28 +76,28 @@ static Position JaraxxusLoc[]= static Position FactionChampionLoc[]= { - {514.231,105.569,418.234}, // 0 - Horde Initial Pos 0 - {508.334,115.377,418.234}, // 1 - Horde Initial Pos 1 - {506.454,126.291,418.234}, // 2 - Horde Initial Pos 2 - {506.243,106.596,421.592}, // 3 - Horde Initial Pos 3 - {499.885,117.717,421.557}, // 4 - Horde Initial Pos 4 - - {613.127,100.443,419.74}, // 5 - Ally Initial Pos 0 - {621.126,128.042,418.231}, // 6 - Ally Initial Pos 1 - {618.829,113.606,418.232}, // 7 - Ally Initial Pos 2 - {625.845,112.914,421.575}, // 8 - Ally Initial Pos 3 - {615.566,109.653,418.234}, // 9 - Ally Initial Pos 4 - - {535.469,113.012,394.66}, // 10 - Horde Final Pos 0 - {526.417,137.465,394.749}, // 11 - Horde Final Pos 1 - {528.108,111.057,395.289}, // 12 - Horde Final Pos 2 - {519.92,134.285,395.289}, // 13 - Horde Final Pos 3 - {533.648,119.148,394.646}, // 14 - Horde Final Pos 4 - {531.399,125.63,394.708}, // 15 - Horde Final Pos 5 - {528.958,131.47,394.73}, // 16 - Horde Final Pos 6 - {526.309,116.667,394.833}, // 17 - Horde Final Pos 7 - {524.238,122.411,394.819}, // 18 - Horde Final Pos 8 - {521.901,128.488,394.832}, // 19 - Horde Final Pos 9 + {514.231f,105.569f,418.234f}, // 0 - Horde Initial Pos 0 + {508.334f,115.377f,418.234f}, // 1 - Horde Initial Pos 1 + {506.454f,126.291f,418.234f}, // 2 - Horde Initial Pos 2 + {506.243f,106.596f,421.592f}, // 3 - Horde Initial Pos 3 + {499.885f,117.717f,421.557f}, // 4 - Horde Initial Pos 4 + + {613.127f,100.443f,419.74f}, // 5 - Ally Initial Pos 0 + {621.126f,128.042f,418.231f}, // 6 - Ally Initial Pos 1 + {618.829f,113.606f,418.232f}, // 7 - Ally Initial Pos 2 + {625.845f,112.914f,421.575f}, // 8 - Ally Initial Pos 3 + {615.566f,109.653f,418.234f}, // 9 - Ally Initial Pos 4 + + {535.469f,113.012f,394.66f}, // 10 - Horde Final Pos 0 + {526.417f,137.465f,394.749f}, // 11 - Horde Final Pos 1 + {528.108f,111.057f,395.289f}, // 12 - Horde Final Pos 2 + {519.92f,134.285f,395.289f}, // 13 - Horde Final Pos 3 + {533.648f,119.148f,394.646f}, // 14 - Horde Final Pos 4 + {531.399f,125.63f,394.708f}, // 15 - Horde Final Pos 5 + {528.958f,131.47f,394.73f}, // 16 - Horde Final Pos 6 + {526.309f,116.667f,394.833f}, // 17 - Horde Final Pos 7 + {524.238f,122.411f,394.819f}, // 18 - Horde Final Pos 8 + {521.901f,128.488f,394.832f}, // 19 - Horde Final Pos 9 }; static Position TwinValkyrsLoc[]= diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index c6bca04f95b..3cf22dcb6ef 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -59,9 +59,9 @@ enum Achievements ACHIEV_OH_NOVOS = 2057 }; -static Position AddSpawnPoint = { -379.20, -816.76, 59.70 }; -static Position CrystalHandlerSpawnPoint = { -326.626343, -709.956604, 27.813314 }; -static Position AddDestinyPoint = { -379.314545, -772.577637, 28.58837 }; +static Position AddSpawnPoint = { -379.20f, -816.76f, 59.70f }; +static Position CrystalHandlerSpawnPoint = { -326.626343f, -709.956604f, 27.813314f }; +static Position AddDestinyPoint = { -379.314545f, -772.577637f, 28.58837f }; class boss_novos : public CreatureScript { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 4d003d3c2c4..ade2633d05e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -52,7 +52,7 @@ enum Creatures NPC_DRAKKARI_INVADER_2 = 27709 }; -Position AddSpawnPoint = { -260.493011, -622.968018, 26.605301, 3.036870 }; +Position AddSpawnPoint = { -260.493011f, -622.968018f, 26.605301f, 3.036870f }; class boss_trollgore : public CreatureScript { @@ -82,7 +82,7 @@ public: void Reset() { uiConsumeTimer = 15*IN_MILLISECONDS; - uiAuraCountTimer = 15.5*IN_MILLISECONDS; + uiAuraCountTimer = 15.5f*IN_MILLISECONDS; uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS); uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 11f4a454622..bfc1c600462 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -24,8 +24,6 @@ * - Fix outro npc movement */ -#define PI 3.1415f - enum Yells { SAY_FACE_ANGER_AGGRO = -1632010, @@ -93,30 +91,30 @@ struct Position movePosition; } outroPositions[] = { - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47, 2427.79, 705.935, 0.802851 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59, 2428.34, 705.935, 0.977384 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2429.31, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2421.12, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43, 2426.53, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55, 2418.36, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14, 705.935, 1.0472 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04, 2424.87, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89, 2421.54, 705.935, 0.610865 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57, 2434.62, 705.935, 1.13446 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46, 2417.99, 705.935, 1.06465 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81, 2428.42, 705.935, 0.820305 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61, 2412.66, 705.935, 0.925025 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9, 2410.64, 705.935, 0.872665 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76, 2416.73, 705.935, 0.942478 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23, 2419.14, 705.935, 0.855211 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61, 2416.87, 705.935, 0.907571 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77, 2421.03, 705.935, 0.855211 } }, - - { NPC_KORELN, NPC_LORALEN, { 5602.58, 2435.95, 705.935, 0.959931 } }, - { NPC_ELANDRA, NPC_KALIRA, { 5606.13, 2433.16, 705.935, 0.785398 } }, - { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12, 2436.6, 705.935, 0.890118 } }, - - { 0, 0, { 0, 0, 0, 0 } } + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47f, 2427.79f, 705.935f, 0.802851f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59f, 2428.34f, 705.935f, 0.977384f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2429.31f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81f, 2421.12f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43f, 2426.53f, 705.935f, 0.890118f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55f, 2418.36f, 705.935f, 1.15192f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14f, 705.935f, 1.0472f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04f, 2424.87f, 705.935f, 1.15192f } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89f, 2421.54f, 705.935f, 0.610865f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57f, 2434.62f, 705.935f, 1.13446f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46f, 2417.99f, 705.935f, 1.06465f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81f, 2428.42f, 705.935f, 0.820305f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61f, 2412.66f, 705.935f, 0.925025f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9f, 2410.64f, 705.935f, 0.872665f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76f, 2416.73f, 705.935f, 0.942478f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23f, 2419.14f, 705.935f, 0.855211f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61f, 2416.87f, 705.935f, 0.907571f } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77f, 2421.03f, 705.935f, 0.855211f } }, + + { NPC_KORELN, NPC_LORALEN, { 5602.58f, 2435.95f, 705.935f, 0.959931f } }, + { NPC_ELANDRA, NPC_KALIRA, { 5606.13f, 2433.16f, 705.935f, 0.785398f } }, + { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12f, 2436.6f, 705.935f, 0.890118f } }, + + { 0, 0, { 0.0f, 0.0f, 0.0f, 0.0f } } }; class boss_devourer_of_souls : public CreatureScript @@ -198,7 +196,7 @@ public: void JustDied(Unit* /*killer*/) { - Position spawnPoint = { 5618.139, 2451.873, 705.854 }; + Position spawnPoint = { 5618.139f, 2451.873f, 705.854f }; DoScriptText(RAND(SAY_FACE_SORROW_DEATH,SAY_FACE_DESIRE_DEATH), me); @@ -297,7 +295,7 @@ public: beamAngle = me->GetOrientation(); - beamAngleDiff = PI/30.0f; // PI/2 in 15 sec = PI/30 per tick + beamAngleDiff = M_PI/30.0f; // PI/2 in 15 sec = PI/30 per tick if (RAND(true,false)) beamAngleDiff = -beamAngleDiff; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index f8bea1d81b8..6489f84827f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -137,17 +137,17 @@ enum eEnum static Position HallsofReflectionLocs[]= { - {5283.234863, 1990.946777, 707.695679, 0.929097}, // 2 Loralen Follows - {5408.031250, 2102.918213, 707.695251, 0.792756}, // 9 Sylvanas Follows - {5401.866699, 2110.837402, 707.695251, 0.800610}, // 10 Loralen follows + {5283.234863f, 1990.946777f, 707.695679f, 0.929097f}, // 2 Loralen Follows + {5408.031250f, 2102.918213f, 707.695251f, 0.792756f}, // 9 Sylvanas Follows + {5401.866699f, 2110.837402f, 707.695251f, 0.800610f}, // 10 Loralen follows }; -static Position SpawnPos = {5262.540527, 1949.693726, 707.695007, 0.808736}; // Jaina/Sylvanas Beginning Position -static Position MoveThronePos = {5306.952148, 1998.499023, 709.341431, 1.277278}; // Jaina/Sylvanas walks to throne -static Position UtherSpawnPos = {5308.310059, 2003.857178, 709.341431, 4.650315}; -static Position LichKingSpawnPos = {5362.917480, 2062.307129, 707.695374, 3.945812}; -static Position LichKingMoveThronePos = {5312.080566, 2009.172119, 709.341431, 3.973301}; // Lich King walks to throne -static Position LichKingMoveAwayPos = {5400.069824, 2102.7131689, 707.69525, 0.843803}; // Lich King walks away +static Position SpawnPos = {5262.540527f, 1949.693726f, 707.695007f, 0.808736f}; // Jaina/Sylvanas Beginning Position +static Position MoveThronePos = {5306.952148f, 1998.499023f, 709.341431f, 1.277278f}; // Jaina/Sylvanas walks to throne +static Position UtherSpawnPos = {5308.310059f, 2003.857178f, 709.341431f, 4.650315f}; +static Position LichKingSpawnPos = {5362.917480f, 2062.307129f, 707.695374f, 3.945812f}; +static Position LichKingMoveThronePos = {5312.080566f, 2009.172119f, 709.341431f, 3.973301f}; // Lich King walks to throne +static Position LichKingMoveAwayPos = {5400.069824f, 2102.7131689f, 707.69525f, 0.843803f}; // Lich King walks away class npc_jaina_or_sylvanas_hor : public CreatureScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index b42dcffb399..531129b562a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -44,56 +44,56 @@ enum Events static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = { - {5277.74,2016.88,707.778,5.96903}, - {5295.88,2040.34,707.778,5.07891}, - {5320.37,1980.13,707.778,2.00713}, - {5280.51,1997.84,707.778,0.296706}, - {5302.45,2042.22,707.778,4.90438}, - {5306.57,1977.47,707.778,1.50098}, + {5277.74f,2016.88f,707.778f,5.96903f}, + {5295.88f,2040.34f,707.778f,5.07891f}, + {5320.37f,1980.13f,707.778f,2.00713f}, + {5280.51f,1997.84f,707.778f,0.296706f}, + {5302.45f,2042.22f,707.778f,4.90438f}, + {5306.57f,1977.47f,707.778f,1.50098f}, }; static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = { - {5312.75,2037.12,707.778,4.59022}, - {5309.58,2042.67,707.778,4.69494}, - {5275.08,2008.72,707.778,6.21337}, - {5279.65,2004.66,707.778,0.069813}, - {5275.48,2001.14,707.778,0.174533}, - {5316.7,2041.55,707.778,4.50295}, + {5312.75f,2037.12f,707.778f,4.59022f}, + {5309.58f,2042.67f,707.778f,4.69494f}, + {5275.08f,2008.72f,707.778f,6.21337f}, + {5279.65f,2004.66f,707.778f,0.069813f}, + {5275.48f,2001.14f,707.778f,0.174533f}, + {5316.7f,2041.55f,707.778f,4.50295f}, }; static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = { - {5302.25,1972.41,707.778,1.37881}, - {5311.03,1972.23,707.778,1.64061}, - {5277.36,1993.23,707.778,0.401426}, - {5318.7,2036.11,707.778,4.2237}, - {5335.72,1996.86,707.778,2.74017}, - {5299.43,1979.01,707.778,1.23918}, + {5302.25f,1972.41f,707.778f,1.37881f}, + {5311.03f,1972.23f,707.778f,1.64061f}, + {5277.36f,1993.23f,707.778f,0.401426f}, + {5318.7f,2036.11f,707.778f,4.2237f}, + {5335.72f,1996.86f,707.778f,2.74017f}, + {5299.43f,1979.01f,707.778f,1.23918f}, }; static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = { - {5306.06,2037,707.778,4.81711}, - {5344.15,2007.17,707.778,3.15905}, - {5337.83,2010.06,707.778,3.22886}, - {5343.29,1999.38,707.778,2.9147}, - {5340.84,1992.46,707.778,2.75762}, - {5325.07,1977.6,707.778,2.07694}, - {5336.6,2017.28,707.778,3.47321}, - {5313.82,1978.15,707.778,1.74533}, - {5280.63,2012.16,707.778,6.05629}, - {5322.96,2040.29,707.778,4.34587}, + {5306.06f,2037,707.778f,4.81711f}, + {5344.15f,2007.17f,707.778f,3.15905f}, + {5337.83f,2010.06f,707.778f,3.22886f}, + {5343.29f,1999.38f,707.778f,2.9147f}, + {5340.84f,1992.46f,707.778f,2.75762f}, + {5325.07f,1977.6f,707.778f,2.07694f}, + {5336.6f,2017.28f,707.778f,3.47321f}, + {5313.82f,1978.15f,707.778f,1.74533f}, + {5280.63f,2012.16f,707.778f,6.05629f}, + {5322.96f,2040.29f,707.778f,4.34587f}, }; static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = { - {5343.47,2015.95,707.778,3.49066}, - {5337.86,2003.4,707.778,2.98451}, - {5319.16,1974,707.778,1.91986}, - {5299.25,2036,707.778,5.02655}, - {5295.64,1973.76,707.778,1.18682}, - {5282.9,2019.6,707.778,5.88176}, + {5343.47f,2015.95f,707.778f,3.49066f}, + {5337.86f,2003.4f,707.778f,2.98451f}, + {5319.16f,1974,707.778f,1.91986f}, + {5299.25f,2036,707.778f,5.02655f}, + {5295.64f,1973.76f,707.778f,1.18682f}, + {5282.9f,2019.6f,707.778f,5.88176f}, }; class instance_halls_of_reflection : public InstanceMapScript diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index bfffbf9b5ad..d1b73e364ac 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -338,7 +338,7 @@ public: if (Creature* pIck = GetIck()) { // TODO: tele on Ick then run some distance. - pIck->GetNearPosition(pos, 5.0f, 3.14); + pIck->GetNearPosition(pos, 5.0f, 3.14f); me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f); } me->SetVisibility(VISIBILITY_ON); diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 5cfbf8433f0..8af4ee793da 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -27,7 +27,7 @@ enum Spells SPELL_ECK_SPRING_2 = 55837 //Eck leaps at a distant target. }; -static Position EckSpawnPoint = { 1643.877930, 936.278015, 107.204948, 0.668432 }; +static Position EckSpawnPoint = { 1643.877930f, 936.278015f, 107.204948f, 0.668432f }; class boss_eck : public CreatureScript { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index a40c1704fc8..00b586e6957 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -58,11 +58,11 @@ enum ConstrictorSpells static Position SpawnLoc[]= { - {1783.81, 646.637, 133.948, 3.71755}, - {1775.03, 606.586, 134.165, 1.43117}, - {1717.39, 630.041, 129.282, 5.96903}, - {1765.66, 646.542, 134.02, 5.11381}, - {1716.76, 635.159, 129.282, 0.191986} + {1783.81f, 646.637f, 133.948f, 3.71755f}, + {1775.03f, 606.586f, 134.165f, 1.43117f}, + {1717.39f, 630.041f, 129.282f, 5.96903f}, + {1765.66f, 646.542f, 134.02f, 5.11381f}, + {1716.76f, 635.159f, 129.282f, 0.191986f} }; class boss_slad_ran : public CreatureScript diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index e0fe074339a..047a2eedf57 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -24,7 +24,7 @@ #define MOB_CRYPT_GUARD 16573 -const Position GuardSummonPos = {3333.72, -3476.30, 287.1, 6.2801}; +const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f}; enum Events { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e66c57275c6..3a709787ff9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -37,21 +37,21 @@ enum Events const Position WaypointPositions[12] = { // Thane waypoints - {2542.3, -2984.1, 241.49, 5.362}, - {2547.6, -2999.4, 241.34, 5.049}, - {2542.9, -3015.0, 241.35, 4.654}, + {2542.3f, -2984.1f, 241.49f, 5.362f}, + {2547.6f, -2999.4f, 241.34f, 5.049f}, + {2542.9f, -3015.0f, 241.35f, 4.654f}, // Lady waypoints - {2498.3, -2961.8, 241.28, 3.267}, - {2487.7, -2959.2, 241.28, 2.890}, - {2469.4, -2947.6, 241.28, 2.576}, + {2498.3f, -2961.8f, 241.28f, 3.267f}, + {2487.7f, -2959.2f, 241.28f, 2.890f}, + {2469.4f, -2947.6f, 241.28f, 2.576f}, // Baron waypoints - {2553.8, -2968.4, 241.33, 5.757}, - {2564.3, -2972.5, 241.33, 5.890}, - {2583.9, -2971.67, 241.35, 0.008}, + {2553.8f, -2968.4f, 241.33f, 5.757f}, + {2564.3f, -2972.5f, 241.33f, 5.890f}, + {2583.9f, -2971.67f, 241.35f, 0.008f}, // Sir waypoints - {2534.5, -2921.7, 241.53, 1.363}, - {2523.5, -2902.8, 241.28, 2.095}, - {2517.8, -2896.6, 241.28, 2.315}, + {2534.5f, -2921.7f, 241.53f, 1.363f}, + {2523.5f, -2902.8f, 241.28f, 2.095f}, + {2517.8f, -2896.6f, 241.28f, 2.315f}, }; const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index dfe695301ee..13e0b91dff9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -28,9 +28,9 @@ const Position PosSummon[3] = { - {3267.9, -3172.1, 297.42, 0.94}, - {3253.2, -3132.3, 297.42, 0}, - {3308.3, -3185.8, 297.42, 1.58}, + {3267.9f, -3172.1f, 297.42f, 0.94f}, + {3253.2f, -3132.3f, 297.42f, 0}, + {3308.3f, -3185.8f, 297.42f, 1.58f}, }; enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 66a968cea45..b03701cf637 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -113,26 +113,26 @@ enum Pos const Position PosSummonLive[POS_LIVE] = { - {2669.7, -3428.76, 268.56, 1.6}, - {2692.1, -3428.76, 268.56, 1.6}, - {2714.4, -3428.76, 268.56, 1.6}, - {2669.7, -3431.67, 268.56, 1.6}, - {2692.1, -3431.67, 268.56, 1.6}, - {2714.4, -3431.67, 268.56, 1.6}, + {2669.7f, -3428.76f, 268.56f, 1.6f}, + {2692.1f, -3428.76f, 268.56f, 1.6f}, + {2714.4f, -3428.76f, 268.56f, 1.6f}, + {2669.7f, -3431.67f, 268.56f, 1.6f}, + {2692.1f, -3431.67f, 268.56f, 1.6f}, + {2714.4f, -3431.67f, 268.56f, 1.6f}, }; const Position PosSummonDead[POS_DEAD] = { - {2725.1, -3310.0, 268.85, 3.4}, - {2699.3, -3322.8, 268.60, 3.3}, - {2733.1, -3348.5, 268.84, 3.1}, - {2682.8, -3304.2, 268.85, 3.9}, - {2664.8, -3340.7, 268.23, 3.7}, + {2725.1f, -3310.0f, 268.85f, 3.4f}, + {2699.3f, -3322.8f, 268.60f, 3.3f}, + {2733.1f, -3348.5f, 268.84f, 3.1f}, + {2682.8f, -3304.2f, 268.85f, 3.9f}, + {2664.8f, -3340.7f, 268.23f, 3.7f}, }; -const float PosGroundLiveSide[4] = {2691.2, -3387.0, 267.68, 1.52}; -const float PosGroundDeadSide[4] = {2693.5, -3334.6, 267.68, 4.67}; -const float PosPlatform[4] = {2640.5, -3360.6, 285.26, 0}; +const float PosGroundLiveSide[4] = {2691.2f, -3387.0f, 267.68f, 1.52f}; +const float PosGroundDeadSide[4] = {2693.5f, -3334.6f, 267.68f, 4.67f}; +const float PosPlatform[4] = {2640.5f, -3360.6f, 285.26f, 0.0f}; // Predicate function to check that the r efzr unit is NOT on the same side as the source. struct NotOnSameSide : public std::unary_function<Unit *, bool> { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 600ee4a364f..e4a121aa2ae 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -133,18 +133,18 @@ enum Creatures const Position Pos[12] = { - {3783.272705, -5062.697266, 143.711203, 3.617599}, //LEFT_FAR - {3730.291260, -5027.239258, 143.956909, 4.461900}, //LEFT_MIDDLE - {3757.6, -5172.0, 143.7, 1.97}, //WINDOW_PORTAL05 - {3759.355225, -5174.128418, 143.802383, 2.170104}, //RIGHT_FAR - {3700.724365, -5185.123047, 143.928024, 1.309310}, //RIGHT_MIDDLE - {3700.86, -5181.29, 143.928024, 1.42}, //WINDOW_PORTAL04 - {3754.431396, -5080.727734, 142.036316, 3.736189}, //LEFT_FAR - {3724.396484, -5061.330566, 142.032700, 4.564785}, //LEFT_MIDDLE - {3732.02, -5028.53, 143.92, 4.49}, //WINDOW_PORTAL02 - {3687.571777, -5126.831055, 142.017807, 0.604023}, //RIGHT_FAR - {3707.990733, -5151.450195, 142.032562, 1.376855}, //RIGHT_MIDDLE - {3782.76, -5062.97, 143.79, 3.82}, //WINDOW_PORTAL03 + {3783.272705f, -5062.697266f, 143.711203f, 3.617599f}, //LEFT_FAR + {3730.291260f, -5027.239258f, 143.956909f, 4.461900f}, //LEFT_MIDDLE + {3757.6f, -5172.0f, 143.7f, 1.97f}, //WINDOW_PORTAL05 + {3759.355225f, -5174.128418f, 143.802383f, 2.170104f}, //RIGHT_FAR + {3700.724365f, -5185.123047f, 143.928024f, 1.309310f}, //RIGHT_MIDDLE + {3700.86f, -5181.29f, 143.928024f, 1.42f}, //WINDOW_PORTAL04 + {3754.431396f, -5080.727734f, 142.036316f, 3.736189f}, //LEFT_FAR + {3724.396484f, -5061.330566f, 142.032700f, 4.564785f}, //LEFT_MIDDLE + {3732.02f, -5028.53f, 143.92f, 4.49f}, //WINDOW_PORTAL02 + {3687.571777f, -5126.831055f, 142.017807f, 0.604023f}, //RIGHT_FAR + {3707.990733f, -5151.450195f, 142.032562f, 1.376855f}, //RIGHT_MIDDLE + {3782.76f, -5062.97f, 143.79f, 3.82f}, //WINDOW_PORTAL03 }; //creatures in corners @@ -152,95 +152,95 @@ const Position Pos[12] = #define MAX_ABOMINATIONS 21 const Position PosAbominations[MAX_ABOMINATIONS] = { - {3755.52, -5155.22, 143.480, 2.0}, - {3744.35, -5164.03, 143.590, 2.00}, - {3749.28, -5159.04, 143.190, 2.0}, - {3774.47, -5076.28, 143.528, 2.15912}, - {3765.94, -5074.15, 143.186, 3.77233}, - {3763.15, -5063.36, 143.694, 3.77233}, - {3737.81, -5045.69, 143.709, 4.9033}, - {3728.13, -5045.01, 143.355, 1.45069}, - {3721.56, -5048.35, 143.542, 1.45069}, - {3689.55, -5049.66, 143.637, 5.2104}, - {3681.71, -5053.03, 143.242, 2.47957}, - {3677.64, -5061.44, 143.358, 2.47957}, - {3654.2, -5090.87, 143.469, 1.0313}, - {3650.39, -5097.45, 143.496, 2.5047}, - {3658.7, -5103.59, 143.607, 3.3278}, - {3659.02, -5133.97, 143.624, 3.84538}, - {3666.33, -5139.34, 143.183, 3.84538}, - {3669.74, -5149.63, 143.678, 0.528643}, - {3695.53, -5169.53, 143.671, 2.11908}, - {3701.98, -5166.51, 143.395, 1.24257}, - {3709.62, -5169.15, 143.576, 5.97695}, + {3755.52f, -5155.22f, 143.480f, 2.0f}, + {3744.35f, -5164.03f, 143.590f, 2.00f}, + {3749.28f, -5159.04f, 143.190f, 2.0f}, + {3774.47f, -5076.28f, 143.528f, 2.15912f}, + {3765.94f, -5074.15f, 143.186f, 3.77233f}, + {3763.15f, -5063.36f, 143.694f, 3.77233f}, + {3737.81f, -5045.69f, 143.709f, 4.9033f}, + {3728.13f, -5045.01f, 143.355f, 1.45069f}, + {3721.56f, -5048.35f, 143.542f, 1.45069f}, + {3689.55f, -5049.66f, 143.637f, 5.2104f}, + {3681.71f, -5053.03f, 143.242f, 2.47957f}, + {3677.64f, -5061.44f, 143.358f, 2.47957f}, + {3654.2f, -5090.87f, 143.469f, 1.0313f}, + {3650.39f, -5097.45f, 143.496f, 2.5047f}, + {3658.7f, -5103.59f, 143.607f, 3.3278f}, + {3659.02f, -5133.97f, 143.624f, 3.84538f}, + {3666.33f, -5139.34f, 143.183f, 3.84538f}, + {3669.74f, -5149.63f, 143.678f, 0.528643f}, + {3695.53f, -5169.53f, 143.671f, 2.11908f}, + {3701.98f, -5166.51f, 143.395f, 1.24257f}, + {3709.62f, -5169.15f, 143.576f, 5.97695f}, }; //Soldiers of the Frozen Wastes #define MAX_WASTES 49 const Position PosWastes[MAX_WASTES] = { - {3754.41, -5147.24, 143.204, 2.0}, - {3754.68, -5156.17, 143.418, 2.0}, - {3757.91, -5160.12, 143.503, 2.0}, - {3752.67, -5164.6, 143.395, 2.0}, - {3745.42, -5164.47, 143.565, 2.74587}, - {3741.2, -5155.92, 143.17, 5.29134}, - {3746.57, -5148.82, 143.176, 5.07772}, - {3778.14, -5070.1, 143.568, 3.16208}, - {3775.09, -5078.97, 143.65, 2.81022}, - {3773.54, -5083.47, 143.758, 3.21549}, - {3765, -5078.29, 143.176, 4.36688}, - {3766.94, -5072.63, 143.184, 5.27951}, - {3762.68, -5064.94, 143.635, 3.95297}, - {3769.9, -5059.94, 143.74, 3.36549}, - {3736.33, -5042.18, 143.643, 5.9471}, - {3727.51, -5040.58, 143.502, 0.871859}, - {3719.89, -5049.64, 143.58, 4.75172}, - {3720.69, -5044.43, 143.662, 1.87245}, - {3725.69, -5048.99, 143.363, 2.48271}, - {3732.33, -5054.01, 143.44, 3.59405}, - {3738.09, -5051.06, 143.718, 4.70931}, - {3682.76, -5063.5, 143.175, 0.636238}, - {3686.7, -5060.58, 143.18, 0.636238}, - {3682.45, -5057.21, 143.184, 5.61252}, - {3677.57, -5053.34, 143.369, 1.52531}, - {3677.3, -5062.26, 143.369, 2.73482}, - {3691.21, -5053.02, 143.421, 5.93218}, - {3685.22, -5053.34, 143.314, 4.70303}, - {3652.11, -5088.47, 143.555, 0.793317}, - {3648.23, -5093.21, 143.311, 1.18837}, - {3648.14, -5100.11, 143.632, 2.12221}, - {3653.88, -5099.7, 143.558, 3.04348}, - {3661.23, -5100.33, 143.42, 4.08335}, - {3663.49, -5092.77, 143.346, 4.47134}, - {3661.85, -5087.99, 143.571, 1.0148}, - {3664.56, -5149.01, 143.532, 0.0762528}, - {3665.01, -5142.04, 143.201, 1.72009}, - {3671.15, -5142.92, 143.174, 4.81535}, - {3670.18, -5134.38, 143.177, 5.37534}, - {3664.33, -5131.69, 143.262, 5.39576}, - {3658.21, -5133.63, 143.662, 1.3863}, - {3659.7, -5144.49, 143.363, 2.32328}, - {3705.71, -5179.63, 143.746, 1.06743}, - {3696.77, -5177.45, 143.759, 5.36748}, - {3700.97, -5173.13, 143.52, 3.26575}, - {3708.53, -5172.19, 143.573, 3.26575}, - {3712.49, -5167.62, 143.657, 5.63295}, - {3704.89, -5161.84, 143.239, 5.63295}, - {3695.66, -5164.63, 143.674, 1.54416}, + {3754.41f, -5147.24f, 143.204f, 2.0f}, + {3754.68f, -5156.17f, 143.418f, 2.0f}, + {3757.91f, -5160.12f, 143.503f, 2.0f}, + {3752.67f, -5164.6f, 143.395f, 2.0f}, + {3745.42f, -5164.47f, 143.565f, 2.74587f}, + {3741.2f, -5155.92f, 143.17f, 5.29134f}, + {3746.57f, -5148.82f, 143.176f, 5.07772f}, + {3778.14f, -5070.1f, 143.568f, 3.16208f}, + {3775.09f, -5078.97f, 143.65f, 2.81022f}, + {3773.54f, -5083.47f, 143.758f, 3.21549f}, + {3765, -5078.29f, 143.176f, 4.36688f}, + {3766.94f, -5072.63f, 143.184f, 5.27951f}, + {3762.68f, -5064.94f, 143.635f, 3.95297f}, + {3769.9f, -5059.94f, 143.74f, 3.36549f}, + {3736.33f, -5042.18f, 143.643f, 5.9471f}, + {3727.51f, -5040.58f, 143.502f, 0.871859f}, + {3719.89f, -5049.64f, 143.58f, 4.75172f}, + {3720.69f, -5044.43f, 143.662f, 1.87245f}, + {3725.69f, -5048.99f, 143.363f, 2.48271f}, + {3732.33f, -5054.01f, 143.44f, 3.59405f}, + {3738.09f, -5051.06f, 143.718f, 4.70931f}, + {3682.76f, -5063.5f, 143.175f, 0.636238f}, + {3686.7f, -5060.58f, 143.18f, 0.636238f}, + {3682.45f, -5057.21f, 143.184f, 5.61252f}, + {3677.57f, -5053.34f, 143.369f, 1.52531f}, + {3677.3f, -5062.26f, 143.369f, 2.73482f}, + {3691.21f, -5053.02f, 143.421f, 5.93218f}, + {3685.22f, -5053.34f, 143.314f, 4.70303f}, + {3652.11f, -5088.47f, 143.555f, 0.793317f}, + {3648.23f, -5093.21f, 143.311f, 1.18837f}, + {3648.14f, -5100.11f, 143.632f, 2.12221f}, + {3653.88f, -5099.7f, 143.558f, 3.04348f}, + {3661.23f, -5100.33f, 143.42f, 4.08335f}, + {3663.49f, -5092.77f, 143.346f, 4.47134f}, + {3661.85f, -5087.99f, 143.571f, 1.0148f}, + {3664.56f, -5149.01f, 143.532f, 0.0762528f}, + {3665.01f, -5142.04f, 143.201f, 1.72009f}, + {3671.15f, -5142.92f, 143.174f, 4.81535f}, + {3670.18f, -5134.38f, 143.177f, 5.37534f}, + {3664.33f, -5131.69f, 143.262f, 5.39576f}, + {3658.21f, -5133.63f, 143.662f, 1.3863f}, + {3659.7f, -5144.49f, 143.363f, 2.32328f}, + {3705.71f, -5179.63f, 143.746f, 1.06743f}, + {3696.77f, -5177.45f, 143.759f, 5.36748f}, + {3700.97f, -5173.13f, 143.52f, 3.26575f}, + {3708.53f, -5172.19f, 143.573f, 3.26575f}, + {3712.49f, -5167.62f, 143.657f, 5.63295f}, + {3704.89f, -5161.84f, 143.239f, 5.63295f}, + {3695.66f, -5164.63f, 143.674f, 1.54416f}, }; //Soul Weavers #define MAX_WEAVERS 7 const Position PosWeavers[MAX_WEAVERS] = { - {3752.45, -5168.35, 143.562, 1.6094}, - {3772.2, -5070.04, 143.329, 1.93686}, - {3732.28, -5032.88, 143.771, 3.08355}, - {3689.05, -5055.7, 143.172, 6.09554}, - {3649.45, -5093.17, 143.299, 2.51805}, - {3659.7, -5144.49, 143.363, 4.08806}, - {3704.71, -5175.96, 143.597, 3.36549}, + {3752.45f, -5168.35f, 143.562f, 1.6094f}, + {3772.2f, -5070.04f, 143.329f, 1.93686f}, + {3732.28f, -5032.88f, 143.771f, 3.08355f}, + {3689.05f, -5055.7f, 143.172f, 6.09554f}, + {3649.45f, -5093.17f, 143.299f, 2.51805f}, + {3659.7f, -5144.49f, 143.363f, 4.08806f}, + {3704.71f, -5175.96f, 143.597f, 3.36549f}, }; // predicate function to select not charmed target diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 225bd0b7931..79c48387022 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -40,9 +40,9 @@ enum Creatures #define MAX_POS_WRAP 3 const Position PosWrap[MAX_POS_WRAP] = { - {3546.796, -3869.082, 296.450, 0.0}, - {3531.271, -3847.424, 299.450, 0.0}, - {3497.067, -3843.384, 302.384, 0.0}, + {3546.796f, -3869.082f, 296.450f, 0.0f}, + {3531.271f, -3847.424f, 299.450f, 0.0f}, + {3497.067f, -3843.384f, 302.384f, 0.0f}, }; enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 96f777e0579..135473a2ea4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -35,20 +35,20 @@ #define MOB_GUARDIAN 16981 // Teleport position of Noth on his balcony -#define TELE_X 2631.370 -#define TELE_Y -3529.680 -#define TELE_Z 274.040 -#define TELE_O 6.277 +#define TELE_X 2631.370f +#define TELE_Y -3529.680f +#define TELE_Z 274.040f +#define TELE_O 6.277f #define MAX_SUMMON_POS 5 const float SummonPos[MAX_SUMMON_POS][4] = { - {2728.12, -3544.43, 261.91, 6.04}, - {2729.05, -3544.47, 261.91, 5.58}, - {2728.24, -3465.08, 264.20, 3.56}, - {2704.11, -3456.81, 265.53, 4.51}, - {2663.56, -3464.43, 262.66, 5.20}, + {2728.12f, -3544.43f, 261.91f, 6.04f}, + {2729.05f, -3544.47f, 261.91f, 5.58f}, + {2728.24f, -3465.08f, 264.20f, 3.56f}, + {2704.11f, -3456.81f, 265.53f, 4.51f}, + {2663.56f, -3464.43f, 262.66f, 5.20f}, }; enum Events diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index e9234c3e25d..eb0aea45b79 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -51,12 +51,12 @@ enum Achievs const Position RiftLocation[6] = { - {652.64, -273.70, -8.75}, - {634.45, -265.94, -8.44}, - {620.73, -281.17, -9.02}, - {626.10, -304.67, -9.44}, - {639.87, -314.11, -9.49}, - {651.72, -297.44, -9.37} + {652.64f, -273.70f, -8.75f}, + {634.45f, -265.94f, -8.44f}, + {620.73f, -281.17f, -9.02f}, + {626.10f, -304.67f, -9.44f}, + {639.87f, -314.11f, -9.49f}, + {651.72f, -297.44f, -9.37f} }; class boss_anomalus : public CreatureScript diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 436242e2a39..1265b755bef 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -53,7 +53,7 @@ enum Achievements ACHIEV_TIMER = 5*IN_MILLISECONDS }; -const Position CenterOfRoom = {504.80, 89.07, -16.12, 6.27}; +const Position CenterOfRoom = {504.80f, 89.07f, -16.12f, 6.27f}; class boss_magus_telestra : public CreatureScript { @@ -293,7 +293,7 @@ public: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { DoCast(pTarget, SPELL_ICE_NOVA, false); - uiCooldown = 1.5*IN_MILLISECONDS; + uiCooldown = 1.5f*IN_MILLISECONDS; } uiIceNovaTimer = 15*IN_MILLISECONDS; } else uiIceNovaTimer -= diff; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 0fbfb243581..d85c70c4fe8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -164,10 +164,10 @@ public: if (!pWho) return; - if (me->GetPositionZ() > 518.63) + if (me->GetPositionZ() > 518.63f) DoStartNoMovement(pWho); - if (me->GetPositionZ() < 518.63) + if (me->GetPositionZ() < 518.63f) { if (me->Attack(pWho, true)) { @@ -330,15 +330,15 @@ public: switch(pSpell->Id) { case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66,1042.53,527.32,0.077); + me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02,1170.85,527.321,3.66); + me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31,1080.377,508.361,4.25); + me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f); LeaveCombat(); break; case SPELL_TELEPORT: diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index 9ebecddfbb9..97e936ab4eb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -152,66 +152,66 @@ struct Locations //each dragons special points. First where fly to before connect to connon, second where land point is. Waypoint m_aTene[]= { - {3212.854, 575.597, 109.856}, //init - {3246.425, 565.367, 61.249} //end + {3212.854f, 575.597f, 109.856f}, //init + {3246.425f, 565.367f, 61.249f} //end }; Waypoint m_aShad[]= { - {3293.238, 472.223, 106.968}, - {3271.669, 526.907, 61.931} + {3293.238f, 472.223f, 106.968f}, + {3271.669f, 526.907f, 61.931f} }; Waypoint m_aVesp[]= { - {3193.310, 472.861, 102.697}, - {3227.268, 533.238, 59.995} + {3193.310f, 472.861f, 102.697f}, + {3227.268f, 533.238f, 59.995f} }; #define MAX_WAYPOINT 6 //points around raid "isle", counter clockwise. should probably be adjusted to be more alike Waypoint m_aDragonCommon[MAX_WAYPOINT]= { - {3214.012, 468.932, 98.652}, - {3244.950, 468.427, 98.652}, - {3283.520, 496.869, 98.652}, - {3287.316, 555.875, 98.652}, - {3250.479, 585.827, 98.652}, - {3209.969, 566.523, 98.652} + {3214.012f, 468.932f, 98.652f}, + {3244.950f, 468.427f, 98.652f}, + {3283.520f, 496.869f, 98.652f}, + {3287.316f, 555.875f, 98.652f}, + {3250.479f, 585.827f, 98.652f}, + {3209.969f, 566.523f, 98.652f} }; -static Location FlameRight1Spawn = { 3200.00, 573.211, 57.1551 }; -static Location FlameRight1Direction = { 3289.28, 573.211, 57.1551 }; -static Location FlameRight2Spawn = { 3200.00, 532.211, 57.1551 }; -static Location FlameRight2Direction = { 3289.28, 532.211, 57.1551 }; -static Location FlameRight3Spawn = { 3200.00, 491.211, 57.1551 }; -static Location FlameRight3Direction = { 3289.28, 491.211, 57.1551 }; -static Location FlameLeft1Spawn = { 3289.28, 511.711, 57.1551 }; -static Location FlameLeft1Direction = { 3200.00, 511.711, 57.1551 }; -static Location FlameLeft2Spawn = { 3289.28, 552.711, 57.1551 }; -static Location FlameLeft2Direction = { 3200.00, 552.711, 57.1551 }; - -static Location AcolyteofShadron = { 3363.92, 534.703, 97.2683 }; -static Location AcolyteofShadron2 = { 3246.57, 551.263, 58.6164 }; -static Location AcolyteofVesperon = { 3145.68, 520.71, 89.7 }; -static Location AcolyteofVesperon2 = { 3246.57, 551.263, 58.6164 }; +static Location FlameRight1Spawn = { 3200.00f, 573.211f, 57.1551f }; +static Location FlameRight1Direction = { 3289.28f, 573.211f, 57.1551f }; +static Location FlameRight2Spawn = { 3200.00f, 532.211f, 57.1551f }; +static Location FlameRight2Direction = { 3289.28f, 532.211f, 57.1551f }; +static Location FlameRight3Spawn = { 3200.00f, 491.211f, 57.1551f }; +static Location FlameRight3Direction = { 3289.28f, 491.211f, 57.1551f }; +static Location FlameLeft1Spawn = { 3289.28f, 511.711f, 57.1551f }; +static Location FlameLeft1Direction = { 3200.00f, 511.711f, 57.1551f }; +static Location FlameLeft2Spawn = { 3289.28f, 552.711f, 57.1551f }; +static Location FlameLeft2Direction = { 3200.00f, 552.711f, 57.1551f }; + +static Location AcolyteofShadron = { 3363.92f, 534.703f, 97.2683f }; +static Location AcolyteofShadron2 = { 3246.57f, 551.263f, 58.6164f }; +static Location AcolyteofVesperon = { 3145.68f, 520.71f, 89.7f }; +static Location AcolyteofVesperon2 = { 3246.57f, 551.263f, 58.6164f }; Locations TwilightEggs[] = { - {3219.28, 669.121 , 88.5549}, - {3221.55, 682.852 , 90.5361}, - {3239.77, 685.94 , 90.3168}, - {3250.33, 669.749 , 88.7637}, - {3246.6, 642.365 , 84.8752}, - {3233.68, 653.117 , 85.7051} + {3219.28f, 669.121f , 88.5549f}, + {3221.55f, 682.852f , 90.5361f}, + {3239.77f, 685.94f , 90.3168f}, + {3250.33f, 669.749f , 88.7637f}, + {3246.6f, 642.365f , 84.8752f}, + {3233.68f, 653.117f , 85.7051f} }; Locations TwilightEggsSarth[] = { - {3252.73, 515.762 , 58.5501}, - {3256.56, 521.119 , 58.6061}, - {3255.63, 527.513 , 58.7568}, - {3264.90, 525.865 , 58.6436}, - {3264.26, 516.364 , 58.8011}, - {3257.54, 502.285 , 58.2077} + {3252.73f, 515.762f , 58.5501f}, + {3256.56f, 521.119f , 58.6061f}, + {3255.63f, 527.513f , 58.7568f}, + {3264.90f, 525.865f , 58.6436f}, + {3264.26f, 516.364f , 58.8011f}, + {3257.54f, 502.285f , 58.2077f} }; /*###### @@ -285,7 +285,7 @@ public: me->RemoveAurasDueToSpell(SPELL_TWILIGHT_REVENGE); me->ResetLootMode(); - me->SetHomePosition(3246.57, 551.263, 58.6164, 4.66003); + me->SetHomePosition(3246.57f, 551.263f, 58.6164f, 4.66003f); achievProgress = 0; @@ -297,7 +297,7 @@ public: Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON)); if (pTenebron) { - pTenebron->SetHomePosition(3239.07, 657.235, 86.8775, 4.74729); + pTenebron->SetHomePosition(3239.07f, 657.235f, 86.8775f, 4.74729f); if(pTenebron->isAlive()) { if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -315,7 +315,7 @@ public: } if (pShadron) { - pShadron->SetHomePosition(3363.06, 525.28, 98.362, 4.76475); + pShadron->SetHomePosition(3363.06f, 525.28f, 98.362f, 4.76475f); if(pShadron->isAlive()) { if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) @@ -333,7 +333,7 @@ public: } if (pVesperon) { - pVesperon->SetHomePosition(3145.68, 520.71, 89.7, 4.64258); + pVesperon->SetHomePosition(3145.68f, 520.71f, 89.7f, 4.64258f); if(pVesperon->isAlive()) { if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index a79b28323f2..1d9a009c4ab 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -76,11 +76,11 @@ struct Locations static Locations PipeLocations[] = { - {1295.44, 734.07, 200.3}, //left - {1297.7, 595.6, 199.9} //right + {1295.44f, 734.07f, 200.3f}, //left + {1297.7f, 595.6f, 199.9f} //right }; -static Locations CenterPoint = {1295.21, 667.157, 189.691}; +static Locations CenterPoint = {1295.21f, 667.157f, 189.691f}; class boss_sjonnir : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 72e81faeb2a..5956c21e131 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -128,8 +128,8 @@ enum Achievements static Position SpawnLocations[]= { - {946.992, 397.016, 208.374}, - {960.748, 382.944, 208.374}, + {946.992f, 397.016f, 208.374f}, + {960.748f, 382.944f, 208.374f}, }; class mob_tribuna_controller : public CreatureScript @@ -195,13 +195,13 @@ public: { if (uiPositionCounter == 0) { - (*itr)->GetMap()->CreatureRelocation((*itr), 927.265, 333.200, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(927.265, 333.200, 218.780, 0, (*itr)->GetMovementFlags(), 1); + (*itr)->GetMap()->CreatureRelocation((*itr), 927.265f, 333.200f, 218.780f, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(927.265f, 333.200f, 218.780f, 0, (*itr)->GetMovementFlags(), 1); } else { - (*itr)->GetMap()->CreatureRelocation((*itr), 921.745, 328.076, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(921.745, 328.076, 218.780, 0, (*itr)->GetMovementFlags(), 1); + (*itr)->GetMap()->CreatureRelocation((*itr), 921.745f, 328.076f, 218.780f, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(921.745f, 328.076f, 218.780f, 0, (*itr)->GetMovementFlags(), 1); } } ++uiPositionCounter; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index c367fe85923..3b196abb212 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -44,19 +44,6 @@ enum Creatures CREATURE_DARK_MATTER = 33089 }; -#define NORDRASSIL_X 1614.288574 -#define NORDRASSIL_Y -320.713287 -#define NORDRASSIL_Z 417.321167 -#define NORDRASSIL_X 1614.276245 -#define NORDRASSIL_Y -287.016632 -#define NORDRASSIL_Z 417.321106 -#define NORDRASSIL_X 1650.428467 -#define NORDRASSIL_Y -292.331390 -#define NORDRASSIL_Z 417.321167 -#define NORDRASSIL_X 1649.501831 -#define NORDRASSIL_Y -324.609222 -#define NORDRASSIL_Z 417.322174 - enum Yells { SAY_AGGRO = -1603000, @@ -200,8 +187,8 @@ public: void SummonCollapsingStar(Unit* target) { DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0,target->GetPositionY()+15.0,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0,target->GetPositionY()+15.0,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); + me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); + me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); } void UpdateAI(const uint32 diff) @@ -218,7 +205,7 @@ public: if (HealthBelowPct(2)) { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667, -295.101166,417.321381,0,0,0,0,0,0); + me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f,417.321381f,0,0,0,0,0,0); // All of them. or random? DoScriptText(SAY_DEATH_1, me); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 0dcaf2d5e62..9c98646e604 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -167,34 +167,34 @@ enum eAchievementData static Position Center[]= { - {354.8771, -12.90240, 409.803650}, + {354.8771f, -12.90240f, 409.803650f}, }; const Position PosSiege[5] = { - {-814.59,-64.54,429.92,5.969}, - {-784.37,-33.31,429.92,5.096}, - {-808.99,-52.10,429.92,5.668}, - {-798.59,-44.00,429.92,5.663}, - {-812.83,-77.71,429.92,0.046}, + {-814.59f,-64.54f,429.92f,5.969f}, + {-784.37f,-33.31f,429.92f,5.096f}, + {-808.99f,-52.10f,429.92f,5.668f}, + {-798.59f,-44.00f,429.92f,5.663f}, + {-812.83f,-77.71f,429.92f,0.046f}, }; const Position PosChopper[5] = { - {-717.83,-106.56,430.02,0.122}, - {-717.83,-114.23,430.44,0.122}, - {-717.83,-109.70,430.22,0.122}, - {-718.45,-118.24,430.26,0.052}, - {-718.45,-123.58,430.41,0.085}, + {-717.83f,-106.56f,430.02f,0.122f}, + {-717.83f,-114.23f,430.44f,0.122f}, + {-717.83f,-109.70f,430.22f,0.122f}, + {-718.45f,-118.24f,430.26f,0.052f}, + {-718.45f,-123.58f,430.41f,0.085f}, }; const Position PosDemolisher[5] = { - {-724.12,-176.64,430.03,2.543}, - {-766.70,-225.03,430.50,1.710}, - {-729.54,-186.26,430.12,1.902}, - {-756.01,-219.23,430.50,2.369}, - {-798.01,-227.24,429.84,1.446}, + {-724.12f,-176.64f,430.03f,2.543f}, + {-766.70f,-225.03f,430.50f,1.710f}, + {-729.54f,-186.26f,430.12f,1.902f}, + {-756.01f,-219.23f,430.50f,2.369f}, + {-798.01f,-227.24f,429.84f,1.446f}, }; class boss_flame_leviathan : public CreatureScript @@ -421,7 +421,7 @@ public: events.CancelEvent(EVENT_THORIM_S_HAMMER); return; case EVENT_MIMIRON_S_INFERNO: // Tower of Flames - me->SummonCreature(MOB_MIMIRON_BEACON, 390.93, -13.91, 409.81); + me->SummonCreature(MOB_MIMIRON_BEACON, 390.93f, -13.91f, 409.81f); DoScriptText(SAY_TOWER_FLAME, me); events.CancelEvent(EVENT_MIMIRON_S_INFERNO); return; @@ -451,10 +451,10 @@ public: void StartFreyaEvent()//summon these 4 on each corner wich wil spawn additional hostile mobs { - me->SummonCreature(MOB_FREYA_BEACON, 377.02, -119.10, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 377.02, 54.78, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 185.62, 54.78, 409.81); - me->SummonCreature(MOB_FREYA_BEACON, 185.62, -119.10, 409.81); + me->SummonCreature(MOB_FREYA_BEACON, 377.02f, -119.10f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 377.02f, 54.78f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 185.62f, 54.78f, 409.81f); + me->SummonCreature(MOB_FREYA_BEACON, 185.62f, -119.10f, 409.81f); } void DoAction(const int32 uiAction) @@ -462,8 +462,8 @@ public: // Start encounter if (uiAction == 10) { - me->SetHomePosition(354.8771, -12.90240, 409.803, 0); - me->GetMotionMaster()->MoveCharge(354.8771, -12.90240, 409.803); //position center + me->SetHomePosition(354.8771f, -12.90240f, 409.803f, 0); + me->GetMotionMaster()->MoveCharge(354.8771f, -12.90240f, 409.803f); //position center me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED); DoZoneInCombat(); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 8cbb746b0f1..424a80e6c48 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -272,8 +272,8 @@ public: void FlyPhase(uint8 Phase, const uint32 /*diff*/) { - const float x = 587.54; - const float y = -174.92; + const float x = 587.54f; + const float y = -174.92f; const float GroundLevel = me->GetBaseMap()->GetHeight(x, y, MAX_HEIGHT); const float FlightHeight = GroundLevel + 4.0f; // TODO: Fly out of range of attacks (442 is sufficient height for this), minus ~(10*number of harpoon gun chains attached to Razorscale) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 69b25956213..7cb8dba721f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -646,9 +646,9 @@ public: } InstanceScript* m_pInstance; - int32 uiArcingSmashTimer; - int32 uiTrampleTimer; - int32 uiUppercutTimer; + uint32 uiArcingSmashTimer; + uint32 uiTrampleTimer; + uint32 uiUppercutTimer; void Reset() { diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp index 8d76879a78e..7508230eb32 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp @@ -52,25 +52,25 @@ public: switch(action) { case BASE_CAMP: - pPlayer->TeleportTo(603, -706.122, -92.6024, 429.876, 0); + pPlayer->TeleportTo(603, -706.122f, -92.6024f, 429.876f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case GROUNDS: - pPlayer->TeleportTo(603, 131.248, -35.3802, 409.804, 0); + pPlayer->TeleportTo(603, 131.248f, -35.3802f, 409.804f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case FORGE: - pPlayer->TeleportTo(603, 553.233, -12.3247, 409.679, 0); + pPlayer->TeleportTo(603, 553.233f, -12.3247f, 409.679f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case SCRAPYARD: - pPlayer->TeleportTo(603, 926.292, -11.4635, 418.595, 0); + pPlayer->TeleportTo(603, 926.292f, -11.4635f, 418.595f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case ANTECHAMBER: - pPlayer->TeleportTo(603, 1498.09, -24.246, 420.967, 0); + pPlayer->TeleportTo(603, 1498.09f, -24.246f, 420.967f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case WALKWAY: - pPlayer->TeleportTo(603, 1859.45, -24.1, 448.9, 0); + pPlayer->TeleportTo(603, 1859.45f, -24.1f, 448.9f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; case CONSERVATORY: - pPlayer->TeleportTo(603, 2086.27, -24.3134, 421.239, 0); + pPlayer->TeleportTo(603, 2086.27f, -24.3134f, 421.239f, 0.0f); pPlayer->CLOSE_GOSSIP_MENU(); break; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 071c3583de6..a06ca389d34 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -45,18 +45,18 @@ enum eEnums SAY_DEATH = -1574004 }; -#define SKELETONSPAWN_Z 42.8668 +#define SKELETONSPAWN_Z 42.8668f float SkeletonSpawnPoint[5][5]= { - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, + {156.2559f, 259.2093f}, }; -float AttackLoc[3]={197.636, 194.046, 40.8164}; +float AttackLoc[3]={197.636f, 194.046f, 40.8164f}; bool ShatterFrostTomb; // needed for achievement: On The Rocks(1919) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index f23ab4b9d47..3dfb7206e0a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -67,12 +67,12 @@ struct Locations struct Locations moveLocs[]= { - {261.6,-449.3,109.5}, - {263.3,-454.0,109.5}, - {291.5,-450.4,109.5}, - {291.5,-454.0,109.5}, - {310.0,-453.4,109.5}, - {238.6,-460.7,109.5} + {261.6f,-449.3f,109.5f}, + {263.3f,-454.0f,109.5f}, + {291.5f,-450.4f,109.5f}, + {291.5f,-454.0f,109.5f}, + {310.0f,-453.4f,109.5f}, + {238.6f,-460.7f,109.5f} }; enum Phase diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 2192c6442ed..6c5c7dd53d6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -43,85 +43,85 @@ enum eYells SAY_DRAKE_BREATH_3 = -1575013, }; -static Position SpawnLoc = {468.931, -513.555, 104.723}; +static Position SpawnLoc = {468.931f, -513.555f, 104.723f}; static Position Location[]= { // Boss - {341.740997, -516.955017, 104.66900}, // 0 - {293.299, -505.95, 142.03}, // 1 - {301.664, -535.164, 146.097}, // 2 - {521.031006, -544.667847, 128.80064}, // 3 - {477.311981, -509.296814, 104.72308}, // 4 - {341.740997, -516.955017, 104.66900}, // 5 - {341.740997, -516.955017, 104.66900}, // 6 - {341.740997, -516.955017, 104.66900}, // 7 + {341.740997f, -516.955017f, 104.66900f}, // 0 + {293.299f, -505.95f, 142.03f}, // 1 + {301.664f, -535.164f, 146.097f}, // 2 + {521.031006f, -544.667847f, 128.80064f}, // 3 + {477.311981f, -509.296814f, 104.72308f}, // 4 + {341.740997f, -516.955017f, 104.66900f}, // 5 + {341.740997f, -516.955017f, 104.66900f}, // 6 + {341.740997f, -516.955017f, 104.66900f}, // 7 // Triggers Left - {469.661, -484.546, 104.712}, // 8 - {483.315, -485.028, 104.718}, // 9 - {476.87, -487.994, 104.735}, //10 - {477.512, -497.772, 104.728}, //11 - {486.287, -500.759, 104.722}, //12 - {480.1, -503.895, 104.722}, //13 - {472.391, -505.103, 104.723}, //14 - {478.885, -510.803, 104.723}, //15 - {489.529, -508.615, 104.723}, //16 - {484.272, -508.589, 104.723}, //17 - {465.328, -506.495, 104.427}, //18 - {456.885, -508.104, 104.447}, //19 - {450.177, -507.989, 105.247}, //20 - {442.273, -508.029, 104.813}, //21 - {434.225, -508.19, 104.787}, //22 - {423.902, -508.525, 104.274}, //23 - {414.551, -508.645, 105.136}, //24 - {405.787, -508.755, 104.988}, //25 - {398.812, -507.224, 104.82}, //26 - {389.702, -506.846, 104.729}, //27 - {381.856, -506.76, 104.756}, //28 - {372.881, -507.254, 104.779}, //29 - {364.978, -508.182, 104.673}, //30 - {357.633, -508.075, 104.647}, //31 - {350.008, -506.826, 104.588}, //32 - {341.69, -506.77, 104.499}, //33 - {335.31, -505.745, 105.18}, //34 - {471.178, -510.74, 104.723}, //35 - {461.759, -510.365, 104.199}, //36 - {424.07287, -510.082916, 104.711082}, //37 + {469.661f, -484.546f, 104.712f}, // 8 + {483.315f, -485.028f, 104.718f}, // 9 + {476.87f, -487.994f, 104.735f}, //10 + {477.512f, -497.772f, 104.728f}, //11 + {486.287f, -500.759f, 104.722f}, //12 + {480.1f, -503.895f, 104.722f}, //13 + {472.391f, -505.103f, 104.723f}, //14 + {478.885f, -510.803f, 104.723f}, //15 + {489.529f, -508.615f, 104.723f}, //16 + {484.272f, -508.589f, 104.723f}, //17 + {465.328f, -506.495f, 104.427f}, //18 + {456.885f, -508.104f, 104.447f}, //19 + {450.177f, -507.989f, 105.247f}, //20 + {442.273f, -508.029f, 104.813f}, //21 + {434.225f, -508.19f, 104.787f}, //22 + {423.902f, -508.525f, 104.274f}, //23 + {414.551f, -508.645f, 105.136f}, //24 + {405.787f, -508.755f, 104.988f}, //25 + {398.812f, -507.224f, 104.82f}, //26 + {389.702f, -506.846f, 104.729f}, //27 + {381.856f, -506.76f, 104.756f}, //28 + {372.881f, -507.254f, 104.779f}, //29 + {364.978f, -508.182f, 104.673f}, //30 + {357.633f, -508.075f, 104.647f}, //31 + {350.008f, -506.826f, 104.588f}, //32 + {341.69f, -506.77f, 104.499f}, //33 + {335.31f, -505.745f, 105.18f}, //34 + {471.178f, -510.74f, 104.723f}, //35 + {461.759f, -510.365f, 104.199f}, //36 + {424.07287f, -510.082916f, 104.711082f}, //37 // Triggers Right - {489.46, -513.297, 105.413}, //38 - {485.706, -517.175, 104.724}, //39 - {480.98, -519.313, 104.724}, //40 - {475.05, -520.52, 104.724}, //41 - {482.97, -512.099, 104.724}, //42 - {477.082, -514.172, 104.724}, //43 - {468.991, -516.691, 104.724}, //44 - {461.722, -517.063, 104.627}, //45 - {455.88, -517.681, 104.707}, //46 - {450.499, -519.099, 104.701}, //47 - {444.889, -518.963, 104.82}, //48 - {440.181, -518.893, 104.861}, //49 - {434.393, -518.758, 104.891}, //50 - {429.328, -518.583, 104.904}, //51 - {423.844, -518.394, 105.004}, //52 - {418.707, -518.266, 105.135}, //53 - {413.377, -518.085, 105.153}, //54 - {407.277, -517.844, 104.893}, //55 - {401.082, -517.443, 104.723}, //56 - {394.933, -514.64, 104.724}, //57 - {388.917, -514.688, 104.734}, //58 - {383.814, -515.834, 104.73}, //59 - {377.887, -518.653, 104.777}, //60 - {371.376, -518.289, 104.781}, //61 - {365.669, -517.822, 104.758}, //62 - {359.572, -517.314, 104.706}, //63 - {353.632, -517.146, 104.647}, //64 - {347.998, -517.038, 104.538}, //65 - {341.803, -516.98, 104.584}, //66 - {335.879, -516.674, 104.628}, //67 - {329.871, -515.92, 104.711}, //68 + {489.46f, -513.297f, 105.413f}, //38 + {485.706f, -517.175f, 104.724f}, //39 + {480.98f, -519.313f, 104.724f}, //40 + {475.05f, -520.52f, 104.724f}, //41 + {482.97f, -512.099f, 104.724f}, //42 + {477.082f, -514.172f, 104.724f}, //43 + {468.991f, -516.691f, 104.724f}, //44 + {461.722f, -517.063f, 104.627f}, //45 + {455.88f, -517.681f, 104.707f}, //46 + {450.499f, -519.099f, 104.701f}, //47 + {444.889f, -518.963f, 104.82f}, //48 + {440.181f, -518.893f, 104.861f}, //49 + {434.393f, -518.758f, 104.891f}, //50 + {429.328f, -518.583f, 104.904f}, //51 + {423.844f, -518.394f, 105.004f}, //52 + {418.707f, -518.266f, 105.135f}, //53 + {413.377f, -518.085f, 105.153f}, //54 + {407.277f, -517.844f, 104.893f}, //55 + {401.082f, -517.443f, 104.723f}, //56 + {394.933f, -514.64f, 104.724f}, //57 + {388.917f, -514.688f, 104.734f}, //58 + {383.814f, -515.834f, 104.73f}, //59 + {377.887f, -518.653f, 104.777f}, //60 + {371.376f, -518.289f, 104.781f}, //61 + {365.669f, -517.822f, 104.758f}, //62 + {359.572f, -517.314f, 104.706f}, //63 + {353.632f, -517.146f, 104.647f}, //64 + {347.998f, -517.038f, 104.538f}, //65 + {341.803f, -516.98f, 104.584f}, //66 + {335.879f, -516.674f, 104.628f}, //67 + {329.871f, -515.92f, 104.711f}, //68 // Breach Zone - {485.4577, -511.2515, 115.3011}, //69 - {435.1892, -514.5232, 118.6719}, //70 - {413.9327, -540.9407, 138.2614}, //71 + {485.4577f, -511.2515f, 115.3011f}, //69 + {435.1892f, -514.5232f, 118.6719f}, //70 + {413.9327f, -540.9407f, 138.2614f}, //71 }; enum eCombatPhase diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 2624c5acb7a..1db99f14f2e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -77,12 +77,12 @@ enum CombatPhase static Position RitualChannelerPos[]= { - {296.42, -355.01, 90.94}, - {302.36, -352.01, 90.54}, - {291.39, -350.89, 90.54} + {296.42f, -355.01f, 90.94f}, + {302.36f, -352.01f, 90.54f}, + {291.39f, -350.89f, 90.54f} }; -static Position ArthasPos = { 295.81, -366.16, 92.57, 1.58 }; -static Position SvalaPos = { 296.632, -346.075, 90.6307, 1.58 }; +static Position ArthasPos = { 295.81f, -366.16f, 92.57f, 1.58f }; +static Position SvalaPos = { 296.632f, -346.075f, 90.6307f, 1.58f }; class boss_svala : public CreatureScript { @@ -160,28 +160,28 @@ public: case 0: DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 1: DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 2: DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 3: DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas); ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILLISECONDS; + uiIntroTimer = 3.5f*IN_MILLISECONDS; break; case 4: DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me); DoCast(me, SPELL_SVALA_TRANSFORMING1); ++uiIntroPhase; - uiIntroTimer = 2.8*IN_MILLISECONDS; + uiIntroTimer = 2.8f*IN_MILLISECONDS; break; case 5: DoCast(me, SPELL_SVALA_TRANSFORMING2); @@ -287,7 +287,7 @@ public: Phase = NORMAL; - DoTeleportTo(296.632, -346.075, 90.6307); + DoTeleportTo(296.632f, -346.075f, 90.6307f); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); summons.DespawnAll(); @@ -348,9 +348,9 @@ public: DoScriptText(RAND(SAY_SACRIFICE_PLAYER_1,SAY_SACRIFICE_PLAYER_2,SAY_SACRIFICE_PLAYER_3,SAY_SACRIFICE_PLAYER_4,SAY_SACRIFICE_PLAYER_5),me); DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD); //Spell doesn't teleport - DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6); + DoTeleportPlayer(pSacrificeTarget, 296.632f, -346.075f, 90.63f, 4.6f); me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY); - DoTeleportTo(296.632, -346.075, 120.85); + DoTeleportTo(296.632f, -346.075f, 120.85f); Phase = SACRIFICING; if (pInstance) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 78743164a60..6c17e0c764b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -91,10 +91,10 @@ struct ActiveBoatStruct static ActiveBoatStruct ActiveBot[4] = { - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379, -335.335, 104.756, 413.594, -335.408, 107.995, 3.157}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813, -335.069, 104.756, 369.994, -334.771, 107.995, 6.232}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546, -314.362, 104.756, 370.841, -314.426, 107.995, 6.232}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310, -314.761, 104.756, 413.992, -314.703, 107.995, 3.157} + {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, + {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, + {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, + {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} }; class boss_ymiron : public CreatureScript @@ -271,7 +271,7 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { pTemp->SetSpeed(MOVE_RUN, 0.4f); pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 664a377b20c..5052457c5e3 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -48,10 +48,10 @@ struct Position TempestMinions[MAX_TEMPEST_MINIONS] = { - {-203.980103, -281.287720, 91.650223, 1.598807}, - {-233.489410, -281.139282, 91.652412, 1.598807}, - {-233.267578, -297.104645, 91.681915, 1.598807}, - {-203.842529, -297.097015, 91.745163, 1.598807} + {-203.980103f, -281.287720f, 91.650223f, 1.598807f}, + {-233.489410f, -281.139282f, 91.652412f, 1.598807f}, + {-233.267578f, -297.104645f, 91.681915f, 1.598807f}, + {-203.842529f, -297.097015f, 91.745163f, 1.598807f} }; /*###### diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 1700fb6ec32..3ffafc93f15 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -33,7 +33,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_frozen_orb' WHERE `entry`='3845 // Spells Frost Warder #define SPELL_FROST_BLAST RAID_MODE(72123,72124) // don't know cd... using 20 secs. -#define SPELL_FROZEN_MALLET 72122 +#define SPELL_FROZEN_MALLET_2 72122 // Spell Frozen Orb #define SPELL_FROZEN_ORB_DMG 72081 // priodic dmg aura @@ -166,7 +166,7 @@ public: { DoZoneInCombat(); - DoCast(me, SPELL_FROZEN_MALLET); + DoCast(me, SPELL_FROZEN_MALLET_2); events.ScheduleEvent(EVENT_FROST_BLAST, 5000); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 341e671ca57..0425fc24712 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -64,11 +64,11 @@ enum Actions #define MAX_SPAWN_LOC 5 static Position SpawnLoc[MAX_SPAWN_LOC]= { - {1840.64, 795.407, 44.079, 1.676}, - {1886.24, 757.733, 47.750, 5.201}, - {1877.91, 845.915, 43.417, 3.560}, - {1918.97, 850.645, 47.225, 4.136}, - {1935.50, 796.224, 52.492, 4.224}, + {1840.64f, 795.407f, 44.079f, 1.676f}, + {1886.24f, 757.733f, 47.750f, 5.201f}, + {1877.91f, 845.915f, 43.417f, 3.560f}, + {1918.97f, 850.645f, 47.225f, 4.136f}, + {1935.50f, 796.224f, 52.492f, 4.224f}, }; class boss_ichoron : public CreatureScript @@ -162,7 +162,7 @@ public: switch(param) { case ACTION_WATER_ELEMENT_HIT: - me->SetHealth(me->GetHealth() + me->GetMaxHealth() * 0.01); + me->SetHealth(me->GetHealth() + me->GetMaxHealth() * 0.01f); if (bIsExploded) DoExplodeCompleted(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 01eee6c6963..65625c48bc6 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -67,26 +67,26 @@ enum Events const Position PortalLocation[] = { - {1877.51, 850.104, 44.6599, 4.7822 }, // WP 1 - {1918.37, 853.437, 47.1624, 4.12294}, // WP 2 - {1936.07, 803.198, 53.3749, 3.12414}, // WP 3 - {1927.61, 758.436, 51.4533, 2.20891}, // WP 4 - {1890.64, 753.471, 48.7224, 1.71042}, // WP 5 - {1908.31, 809.657, 38.7037, 3.08701} // WP 6 + {1877.51f, 850.104f, 44.6599f, 4.7822f }, // WP 1 + {1918.37f, 853.437f, 47.1624f, 4.12294f}, // WP 2 + {1936.07f, 803.198f, 53.3749f, 3.12414f}, // WP 3 + {1927.61f, 758.436f, 51.4533f, 2.20891f}, // WP 4 + {1890.64f, 753.471f, 48.7224f, 1.71042f}, // WP 5 + {1908.31f, 809.657f, 38.7037f, 3.08701f} // WP 6 }; -const Position BossStartMove1 = {1894.684448, 739.390503, 47.668003}; -const Position BossStartMove2 = {1875.173950, 860.832703, 43.333565}; -const Position BossStartMove21 = {1858.854614, 855.071411, 43.333565}; -const Position BossStartMove22 = {1891.926636, 863.388977, 43.333565}; -const Position BossStartMove3 = {1916.138062, 778.152222, 35.772308}; -const Position BossStartMove4 = {1853.618286, 758.557617, 38.657505}; -const Position BossStartMove5 = {1906.683960, 842.348022, 38.637459}; -const Position BossStartMove6 = {1928.207031, 852.864441, 47.200813}; - -const Position CyanigosasSpawnLocation = {1930.281250, 804.407715, 52.410946, 3.139621}; -const Position MiddleRoomLocation = {1892.291260, 805.696838, 38.438862, 3.139621}; -const Position MiddleRoomPortalSaboLocation = {1896.622925, 804.854126, 38.504772, 3.139621}; +const Position BossStartMove1 = {1894.684448f, 739.390503f, 47.668003f}; +const Position BossStartMove2 = {1875.173950f, 860.832703f, 43.333565f}; +const Position BossStartMove21 = {1858.854614f, 855.071411f, 43.333565f}; +const Position BossStartMove22 = {1891.926636f, 863.388977f, 43.333565f}; +const Position BossStartMove3 = {1916.138062f, 778.152222f, 35.772308f}; +const Position BossStartMove4 = {1853.618286f, 758.557617f, 38.657505f}; +const Position BossStartMove5 = {1906.683960f, 842.348022f, 38.637459f}; +const Position BossStartMove6 = {1928.207031f, 852.864441f, 47.200813f}; + +const Position CyanigosasSpawnLocation = {1930.281250f, 804.407715f, 52.410946f, 3.139621f}; +const Position MiddleRoomLocation = {1892.291260f, 805.696838f, 38.438862f, 3.139621f}; +const Position MiddleRoomPortalSaboLocation = {1896.622925f, 804.854126f, 38.504772f, 3.139621f}; //Cyanigosa's prefight event data enum Yells diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index a228bef2d09..aacee53a801 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -127,126 +127,126 @@ enum eSinclari float FirstPortalWPs [6][3] = { - {1877.670288, 842.280273, 43.333591}, - {1877.338867, 834.615356, 38.762287}, - {1872.161011, 823.854309, 38.645401}, - {1864.860474, 815.787170, 38.784843}, - {1858.953735, 810.048950, 44.008759}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1877.670288f, 842.280273f, 43.333591f}, + {1877.338867f, 834.615356f, 38.762287f}, + {1872.161011f, 823.854309f, 38.645401f}, + {1864.860474f, 815.787170f, 38.784843f}, + {1858.953735f, 810.048950f, 44.008759f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float SecondPortalFirstWPs [9][3] = { - {1902.561401, 853.334656, 47.106117}, - {1895.486084, 855.376404, 44.334591}, - {1882.805176, 854.993286, 43.333591}, - {1877.670288, 842.280273, 43.333591}, - {1877.338867, 834.615356, 38.762287}, - {1872.161011, 823.854309, 38.645401}, - {1864.860474, 815.787170, 38.784843}, - {1858.953735, 810.048950, 44.008759}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1902.561401f, 853.334656f, 47.106117f}, + {1895.486084f, 855.376404f, 44.334591f}, + {1882.805176f, 854.993286f, 43.333591f}, + {1877.670288f, 842.280273f, 43.333591f}, + {1877.338867f, 834.615356f, 38.762287f}, + {1872.161011f, 823.854309f, 38.645401f}, + {1864.860474f, 815.787170f, 38.784843f}, + {1858.953735f, 810.048950f, 44.008759f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float SecondPortalSecondWPs [8][3] = { - {1929.392212, 837.614990, 47.136166}, - {1928.290649, 824.750427, 45.474411}, - {1915.544922, 826.919373, 38.642811}, - {1900.933960, 818.855652, 38.801647}, - {1886.810547, 813.536621, 38.490490}, - {1869.079712, 808.701538, 38.689003}, - {1860.843384, 806.645020, 44.008789}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1929.392212f, 837.614990f, 47.136166f}, + {1928.290649f, 824.750427f, 45.474411f}, + {1915.544922f, 826.919373f, 38.642811f}, + {1900.933960f, 818.855652f, 38.801647f}, + {1886.810547f, 813.536621f, 38.490490f}, + {1869.079712f, 808.701538f, 38.689003f}, + {1860.843384f, 806.645020f, 44.008789f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float ThirdPortalWPs [8][3] = { - {1934.049438, 815.778503, 52.408699}, - {1928.290649, 824.750427, 45.474411}, - {1915.544922, 826.919373, 38.642811}, - {1900.933960, 818.855652, 38.801647}, - {1886.810547, 813.536621, 38.490490}, - {1869.079712, 808.701538, 38.689003}, - {1860.843384, 806.645020, 44.008789}, - {1843.707153, 805.807739, 44.135197} - //{1825.736084, 807.305847, 44.363785} + {1934.049438f, 815.778503f, 52.408699f}, + {1928.290649f, 824.750427f, 45.474411f}, + {1915.544922f, 826.919373f, 38.642811f}, + {1900.933960f, 818.855652f, 38.801647f}, + {1886.810547f, 813.536621f, 38.490490f}, + {1869.079712f, 808.701538f, 38.689003f}, + {1860.843384f, 806.645020f, 44.008789f}, + {1843.707153f, 805.807739f, 44.135197f} + //{1825.736084f, 807.305847f, 44.363785f} }; float FourthPortalWPs [9][3] = { - {1921.658447, 761.657043, 50.866741}, - {1910.559814, 755.780457, 47.701447}, - {1896.664673, 752.920898, 47.667004}, - {1887.398804, 763.633240, 47.666851}, - {1879.020386, 775.396973, 38.705990}, - {1872.439087, 782.568604, 38.808292}, - {1863.573364, 791.173584, 38.743660}, - {1857.811890, 796.765564, 43.950329}, - {1845.577759, 800.681152, 44.104248} - //{1827.100342, 801.605957, 44.363358} + {1921.658447f, 761.657043f, 50.866741f}, + {1910.559814f, 755.780457f, 47.701447f}, + {1896.664673f, 752.920898f, 47.667004f}, + {1887.398804f, 763.633240f, 47.666851f}, + {1879.020386f, 775.396973f, 38.705990f}, + {1872.439087f, 782.568604f, 38.808292f}, + {1863.573364f, 791.173584f, 38.743660f}, + {1857.811890f, 796.765564f, 43.950329f}, + {1845.577759f, 800.681152f, 44.104248f} + //{1827.100342f, 801.605957f, 44.363358f} }; float FifthPortalWPs [6][3] = { - {1887.398804, 763.633240, 47.666851}, - {1879.020386, 775.396973, 38.705990}, - {1872.439087, 782.568604, 38.808292}, - {1863.573364, 791.173584, 38.743660}, - {1857.811890, 796.765564, 43.950329}, - {1845.577759, 800.681152, 44.104248} - //{1827.100342, 801.605957, 44.363358} + {1887.398804f, 763.633240f, 47.666851f}, + {1879.020386f, 775.396973f, 38.705990f}, + {1872.439087f, 782.568604f, 38.808292f}, + {1863.573364f, 791.173584f, 38.743660f}, + {1857.811890f, 796.765564f, 43.950329f}, + {1845.577759f, 800.681152f, 44.104248f} + //{1827.100342f, 801.605957f, 44.363358f} }; float SixthPoralWPs [4][3] = { - {1888.861084, 805.074768, 38.375790}, - {1869.793823, 804.135804, 38.647018}, - {1861.541504, 804.149780, 43.968292}, - {1843.567017, 804.288208, 44.139091} - //{1826.889648, 803.929993, 44.363239} + {1888.861084f, 805.074768f, 38.375790f}, + {1869.793823f, 804.135804f, 38.647018f}, + {1861.541504f, 804.149780f, 43.968292f}, + {1843.567017f, 804.288208f, 44.139091f} + //{1826.889648f, 803.929993f, 44.363239f} }; const float SaboteurFinalPos1[3][3] = { - {1892.502319, 777.410767, 38.630402}, - {1891.165161, 762.969421, 47.666920}, - {1893.168091, 740.919189, 47.666920} + {1892.502319f, 777.410767f, 38.630402f}, + {1891.165161f, 762.969421f, 47.666920f}, + {1893.168091f, 740.919189f, 47.666920f} }; const float SaboteurFinalPos2[3][3] = { - {1882.242676, 834.818726, 38.646786}, - {1879.220825, 842.224854, 43.333641}, - {1873.842896, 863.892456, 43.333641} + {1882.242676f, 834.818726f, 38.646786f}, + {1879.220825f, 842.224854f, 43.333641f}, + {1873.842896f, 863.892456f, 43.333641f} }; const float SaboteurFinalPos3[2][3] = { - {1904.298340, 792.400391, 38.646782}, - {1935.716919, 758.437073, 30.627895} + {1904.298340f, 792.400391f, 38.646782f}, + {1935.716919f, 758.437073f, 30.627895f} }; const float SaboteurFinalPos4[3] = { - 1855.006104, 760.641724, 38.655266 + 1855.006104f, 760.641724f, 38.655266f }; const float SaboteurFinalPos5[3] = { - 1906.667358, 841.705566, 38.637894 + 1906.667358f, 841.705566f, 38.637894f }; const float SaboteurFinalPos6[5][3] = { - {1911.437012, 821.289246, 38.684128}, - {1920.734009, 822.978027, 41.525414}, - {1928.262939, 830.836609, 44.668266}, - {1929.338989, 837.593933, 47.137596}, - {1931.063354, 848.468445, 47.190434} + {1911.437012f, 821.289246f, 38.684128f}, + {1920.734009f, 822.978027f, 41.525414f}, + {1928.262939f, 830.836609f, 44.668266f}, + {1929.338989f, 837.593933f, 47.137596f}, + {1931.063354f, 848.468445f, 47.190434f} }; -const Position MovePosition = {1806.955566, 803.851807, 44.363323}; -const Position playerTeleportPosition = {1830.531006, 803.939758, 44.340508, 6.281611}; -const Position sinclariOutsidePosition = {1817.315674, 804.060608, 44.363998}; +const Position MovePosition = {1806.955566f, 803.851807f, 44.363323f}; +const Position playerTeleportPosition = {1830.531006f, 803.939758f, 44.340508f, 6.281611f}; +const Position sinclariOutsidePosition = {1817.315674f, 804.060608f, 44.363998f}; class npc_sinclari_vh : public CreatureScript { @@ -492,30 +492,30 @@ public: case 1: for(int i=0;i<3;i++) AddWaypoint(i,SaboteurFinalPos1[i][0],SaboteurFinalPos1[i][1],SaboteurFinalPos1[i][2],0); - me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346); + me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346f); break; case 2: for(int i=0;i<3;i++) AddWaypoint(i,SaboteurFinalPos2[i][0],SaboteurFinalPos2[i][1],SaboteurFinalPos2[i][2],0); - me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674); + me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674f); break; case 3: for(int i=0;i<2;i++) AddWaypoint(i,SaboteurFinalPos3[i][0],SaboteurFinalPos3[i][1],SaboteurFinalPos3[i][2],0); - me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638); + me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638f); break; case 4: AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0); - me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108); + me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108f); break; case 5: AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0); - me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841); + me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841f); break; case 6: for(int i=0;i<5;i++) AddWaypoint(i,SaboteurFinalPos6[i][0],SaboteurFinalPos6[i][1],SaboteurFinalPos6[i][2],0); - me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031); + me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031f); break; } @@ -734,7 +734,7 @@ struct violet_hold_trashAI : public npc_escortAI case 0: for(int i=0;i<6;i++) AddWaypoint(i,FirstPortalWPs[i][0]+irand(-1,1),FirstPortalWPs[i][1]+irand(-1,1),FirstPortalWPs[i][2]+irand(-1,1),0); - me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439); + me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439f); break; case 1: secondPortalRouteID = urand(0,1); @@ -743,34 +743,34 @@ struct violet_hold_trashAI : public npc_escortAI case 0: for(int i=0;i<9;i++) AddWaypoint(i,SecondPortalFirstWPs[i][0]+irand(-1,1),SecondPortalFirstWPs[i][1]+irand(-1,1),SecondPortalFirstWPs[i][2],0); - me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439); + me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439f); break; case 1: for(int i=0;i<8;i++) AddWaypoint(i,SecondPortalSecondWPs[i][0]+irand(-1,1),SecondPortalSecondWPs[i][1]+irand(-1,1),SecondPortalSecondWPs[i][2],0); - me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439); + me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439f); break; } break; case 2: for(int i=0;i<8;i++) AddWaypoint(i,ThirdPortalWPs[i][0]+irand(-1,1),ThirdPortalWPs[i][1]+irand(-1,1),ThirdPortalWPs[i][2],0); - me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439); + me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439f); break; case 3: for(int i=0;i<9;i++) AddWaypoint(i,FourthPortalWPs[i][0]+irand(-1,1),FourthPortalWPs[i][1]+irand(-1,1),FourthPortalWPs[i][2],0); - me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439); + me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439f); break; case 4: for(int i=0;i<6;i++) AddWaypoint(i,FifthPortalWPs[i][0]+irand(-1,1),FifthPortalWPs[i][1]+irand(-1,1),FifthPortalWPs[i][2],0); - me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439); + me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439f); break; case 5: for(int i=0;i<4;i++) AddWaypoint(i,SixthPoralWPs[i][0]+irand(-1,1),SixthPoralWPs[i][1]+irand(-1,1),SixthPoralWPs[i][2],0); - me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439); + me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439f); break; } SetDespawnAtEnd(false); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 23776bac728..c98daec247e 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1022,19 +1022,19 @@ public: { case 3: SetEscortPaused(true); - if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313, 3518.689, 473.324, 1.562, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) + if (Creature *pArthas = me->SummonCreature(NPC_IMAGE_LICH_KING, 3730.313f, 3518.689f, 473.324f, 1.562f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArthas = pArthas->GetGUID(); pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pArthas->SetReactState(REACT_PASSIVE); pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756,3564.841309,477.433014); + pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f,3564.841309f,477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23, 3614.936, 473.321, 4.462012, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977,3568.882080,477.433014); + pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f,3568.882080f,477.433014f); } me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -1112,19 +1112,19 @@ public: break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100, 3615.655029, 473.321533, 4.447805, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiArlos = pArlos->GetGUID(); pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArlos->GetMotionMaster()->MovePoint(0, 3735.570068, 3572.419922, 477.441010); + pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541, 3614.959717, 473.323486, 4.524959, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pLeryssa->SetReactState(REACT_PASSIVE); pLeryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971, 3571.439941, 477.441010); + pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971f, 3571.439941f, 477.441010f); } uiPhaseTimer = 2000; uiPhase = 0; @@ -1443,7 +1443,7 @@ public: pLeryssa->RemoveAura(SPELL_STUN); pLeryssa->clearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502, 3564.201660, 477.441437); + pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 4cc68b4585c..4b6db59974e 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -255,7 +255,7 @@ public: if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallard::npc_inquisitor_hallardAI, pCreature->AI())) { pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true); - pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); + pCreature->GetMotionMaster()->MovePoint(0, 3801.543f, -679.350f, 213.75f); } } return true; diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 8be061fc188..8e0a6f2c16d 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -184,7 +184,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451,952.472,547.554,0.38); + pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451f,952.472f,547.554f,0.38f); } return true; } @@ -211,7 +211,7 @@ public: { npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) { - pCreature->GetMotionMaster()->MovePoint(0,8599.258,963.951,547.553); + pCreature->GetMotionMaster()->MovePoint(0,8599.258f,963.951f,547.553f); pCreature->setFaction(35); //wrong faction in db? } diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index a77063669cc..e4c4d9d2459 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -363,8 +363,8 @@ public: break; case 1: DoScriptText(SAY_WP_3, me); - me->CastSpell(5918.33, 5372.91, -98.770, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->CastSpell(5918.33f, 5372.91f, -98.770f, SPELL_EXPLODE_CRYSTAL, true); + me->SummonGameObject(184743, 5918.33f, 5372.91f, -98.770f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 2: @@ -374,8 +374,8 @@ public: DoScriptText(SAY_WP_5, me); break; case 8: - me->CastSpell(5887.37, 5379.39, -91.289, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->CastSpell(5887.37f, 5379.39f, -91.289f, SPELL_EXPLODE_CRYSTAL, true); + me->SummonGameObject(184743, 5887.37f, 5379.39f, -91.289f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case 9: @@ -432,7 +432,7 @@ public: { if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, pCreature->AI())) { - pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4, 0.4); + pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4f, 0.4f); pCreature->setFaction(113); pEscortAI->Start(false, false, pPlayer->GetGUID()); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 9af209179a0..c6df2334e33 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -292,29 +292,29 @@ static BossAndAdd Boss[]= const Position SpawnPosition[] = { - {5754.692, -2939.46, 286.276123, 5.156380}, // stinkbeard || orinoko || korrak - {5762.054199, -2954.385010, 273.826955, 5.108289}, //yggdras - {5776.855, -2989.77979, 272.96814, 5.194} // elementals + {5754.692f, -2939.46f, 286.276123f, 5.156380f}, // stinkbeard || orinoko || korrak + {5762.054199f, -2954.385010f, 273.826955f, 5.108289f}, //yggdras + {5776.855f, -2989.77979f, 272.96814f, 5.194f} // elementals }; const Position AddSpawnPosition[] = { - {5722.487, -3010.75, 312.751648, 0.478}, // caster location - {5724.983, -2969.89551, 286.359619, 0.478}, - {5733.76025, -3000.34644, 286.359619, 0.478}, - {5739.8125, -2981.524, 290.7671, 0.478}, // caster location - {5742.101, -2950.75586, 286.2643, 5.21}, - {5743.305, -3011.29736, 290.7671, 0.478}, // caster location - {5744.417, -3025.528, 286.35965, 0.478}, - {5763.189, -3029.67529, 290.7671, 0.478}, - {5769.401, -2935.121, 286.335754, 5.21}, - {5793.061, -2934.593, 286.359619, 3.53}, - {5797.32129, -2955.26855, 290.7671, 3.53}, // caster location - {5813.94531, -2956.74683, 286.359619, 3.53}, - {5816.85547, -2974.476, 290.7671, 3.53}, // caster location - {5820.30859, -3002.83716, 290.7671, 3.53}, // caster location - {5828.50244, -2981.737, 286.359619, 3.53}, - {5828.899, -2960.15479, 312.751648, 3.53}, // caster location + {5722.487f, -3010.75f, 312.751648f, 0.478f}, // caster location + {5724.983f, -2969.89551f, 286.359619f, 0.478f}, + {5733.76025f, -3000.34644f, 286.359619f, 0.478f}, + {5739.8125f, -2981.524f, 290.7671f, 0.478f}, // caster location + {5742.101f, -2950.75586f, 286.2643f, 5.21f}, + {5743.305f, -3011.29736f, 290.7671f, 0.478f}, // caster location + {5744.417f, -3025.528f, 286.35965f, 0.478f}, + {5763.189f, -3029.67529f, 290.7671f, 0.478f}, + {5769.401f, -2935.121f, 286.335754f, 5.21f}, + {5793.061f, -2934.593f, 286.359619f, 3.53f}, + {5797.32129f, -2955.26855f, 290.7671f, 3.53f}, // caster location + {5813.94531f, -2956.74683f, 286.359619f, 3.53f}, + {5816.85547f, -2974.476f, 290.7671f, 3.53f}, // caster location + {5820.30859f, -3002.83716f, 290.7671f, 3.53f}, // caster location + {5828.50244f, -2981.737f, 286.359619f, 3.53f}, + {5828.899f, -2960.15479f, 312.751648f, 3.53f}, // caster location }; class npc_gurgthock : public CreatureScript @@ -425,7 +425,7 @@ public: break; case 2: if (Creature* pSummon = Unit::GetCreature(*me, SummonGUID)) - pSummon->GetMotionMaster()->MoveJump(5776.319824, -2981.005371, 273.100037, 10.0f, 20.0f); + pSummon->GetMotionMaster()->MoveJump(5776.319824f, -2981.005371f, 273.100037f, 10.0f, 20.0f); uiPhase = 0; SummonGUID = 0; break; @@ -824,14 +824,14 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276) + if (me->getVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); @@ -947,14 +947,14 @@ public: if (Unit* victim = me->getVictim()) { - if (victim->GetPositionZ() >= 286.276) + if (victim->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); @@ -1092,14 +1092,14 @@ public: if (!UpdateVictim()) return; - if (me->getVictim()->GetPositionZ() >= 286.276) + if (me->getVictim()->GetPositionZ() >= 286.276f) { std::list<HostileReference *> t_list = me->getThreatManager().getThreatList(); for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit* pUnit = Unit::GetUnit(*me, (*itr)->getUnitGuid())) { - if (pUnit->GetPositionZ() <= 286.276) + if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); me->AddThreat(pUnit,5.0f); |