diff options
Diffstat (limited to 'src')
12 files changed, 88 insertions, 111 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 73d84d4aa2d..fcbcda9f28b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -117,11 +117,11 @@ static Wave Wave6[]= // 27 sec { 10442, 210.8935f, -423.913f, 111.0125f, 5.969026f }, { 10442, 212.2642f, -430.7648f, 110.9807f, 5.934119f } }; -*/ -Position const GythLoc = { 211.762f, -397.5885f, 111.1817f, 4.747295f }; -Position const Teleport1Loc = { 194.2993f, -474.0814f, 121.4505f, -0.01225555f }; -Position const Teleport2Loc = { 216.485f, -434.93f, 110.888f, -0.01225555f }; +static constexpr Position GythLoc = { 211.762f, -397.5885f, 111.1817f, 4.747295f }; +static constexpr Position Teleport1Loc = { 194.2993f, -474.0814f, 121.4505f, 6.27093f }; +static constexpr Position Teleport2Loc = { 216.485f, -434.93f, 110.888f, 6.27093f }; +*/ enum Events { diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 88e22ad94be..9b5ebec95f6 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -33,8 +33,6 @@ enum Spells SPELL_TELEPORT_DARNASSUS = 9268 }; -const Position HomePosition = {-815.817f, -145.299f, -25.870f, 0}; - struct go_blackfathom_altar : public GameObjectAI { go_blackfathom_altar(GameObject* go) : GameObjectAI(go) { } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 438c6e33a53..a112ebdfe90 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -96,8 +96,6 @@ enum Actions ACTION_CHANNEL_WORLD_TREE }; -Position const NordrassilLoc = { 5503.713f, -3523.436f, 1608.781f, 0.0f }; - class npc_ancient_wisp : public CreatureScript { public: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 1ca9817b337..c44c56bb0f1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -609,8 +609,8 @@ enum CrateEvent1Misc CHAIN_JENA_LEAVE = 72 }; -static float const marthaIdleOrientation1 = 3.159046f; -static float const marthaIdleOrientation2 = 4.764749f; +static constexpr float marthaIdleOrientation1 = 3.159046f; +static constexpr float marthaIdleOrientation2 = 4.764749f; struct npc_martha_goslin : public CreatureScript { @@ -978,12 +978,11 @@ enum CrateEvent3Misc }; -static Position const malcolmSpawn = { 1605.2420f, 805.4160f, 122.9956f, 5.284148f }; -static Position const scruffySpawn = { 1601.1030f, 805.3391f, 123.7677f, 5.471561f }; -static float const scruffyFacing2 = 5.734883f; -static float const malcolmFacing3 = 2.303835f; -static Position const scruffyPos3 = { 1629.004f, 810.138f, 120.4927f }; -static float const scruffyFacing4 = 5.445427f; +static constexpr Position malcolmSpawn = { 1605.2420f, 805.4160f, 122.9956f, 5.284148f }; +static constexpr Position scruffySpawn = { 1601.1030f, 805.3391f, 123.7677f, 5.471561f }; +static constexpr float scruffyFacing2 = 5.734883f; +static constexpr float malcolmFacing3 = 2.303835f; +static constexpr float scruffyFacing4 = 5.445427f; struct npc_malcolm_moore : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 97c1f3de988..7c7754595ee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -49,9 +49,9 @@ enum Erozion }; #define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." //not in DB,maybe incorrect? -Position const ThrallRespawnPositionAfterSkarloc(2062.934f, 229.14508f, 64.57113f, 2.338741064071655273); -Position const ThrallRespawnPositionAfterHorseRide(2486.5637f, 624.09796f, 57.95088f, 4.136430263519287109); -Position const ThrallRespawnPositionAfterMeetingTaretha(2660.0847f, 659.54816f, 62.020317f, 5.864306449890136718); +//constexpr Position ThrallRespawnPositionAfterSkarloc(2062.934f, 229.14508f, 64.57113f, 2.338741064071655273); +//constexpr Position ThrallRespawnPositionAfterHorseRide(2486.5637f, 624.09796f, 57.95088f, 4.136430263519287109); +//constexpr Position ThrallRespawnPositionAfterMeetingTaretha(2660.0847f, 659.54816f, 62.020317f, 5.864306449890136718); /*###### ## npc_erozion diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 0f1c5552224..e0716cb4f9f 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -98,12 +98,11 @@ enum MovementPoints POINT_SLABHIDE_LAND, }; -Position const SlabhideIntroPos = { 1292.27f, 1226.16f, 265.573f }; -Position const SlabhideIntroLandPos = { 1292.352f, 1226.478f, 247.6368f, 3.630285f }; +constexpr Position SlabhideIntroPos = { 1292.27f, 1226.16f, 265.573f }; +constexpr Position SlabhideIntroLandPos = { 1292.352f, 1226.478f, 247.6368f, 3.630285f }; -Position const SlabhideMiddlePos = { 1280.73f, 1212.31f, 247.3837f }; -Position const SlabhideInAirPos = { 1280.73f, 1212.31f, 257.3837f }; -Position const SlabhideLandPos = { 1282.7f, 1229.77f, 247.155f, 3.82227f }; +constexpr Position SlabhideMiddlePos = { 1280.73f, 1212.31f, 247.3837f }; +constexpr Position SlabhideInAirPos = { 1280.73f, 1212.31f, 257.3837f }; class boss_slabhide : public CreatureScript { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index a24f4be8d3f..affd9a0ee1a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -147,22 +147,22 @@ enum TocMenuIds MENUID_LK = 10693 }; -Position const BarretSpawnPosition = { 559.1528f, 90.55729f, 395.2734f, 5.078908f }; -Position const WilfredSpawnPosition = { 563.6007f, 208.5278f, 395.2696f, 4.729842f }; -Position const JaraxxusSpawnPosition = { 563.8264f, 140.6563f, 393.9861f, 4.694936f }; -Position const PortalTargetSpawnPosition = { 563.6597f, 139.7569f, 399.2507f, 4.712389f }; -Position const PurpleGroundSpawnPosition = { 563.6858f, 139.4323f, 393.9862f, 4.694936f }; -Position const ArthasPortalSpawnPosition = { 563.6996f, 175.9826f, 394.5042f, 4.694936f }; -Position const LichKingSpawnPosition = { 563.5712f, 174.8351f, 394.4954f, 4.712389f }; -Position const CorpseTeleportPosition = { 631.9390f, 136.5040f, 142.5540f, 0.803332f }; - -Position const NorthrendBeastsSpawnPositions[] = +constexpr Position BarretSpawnPosition = { 559.1528f, 90.55729f, 395.2734f, 5.078908f }; +constexpr Position WilfredSpawnPosition = { 563.6007f, 208.5278f, 395.2696f, 4.729842f }; +constexpr Position JaraxxusSpawnPosition = { 563.8264f, 140.6563f, 393.9861f, 4.694936f }; +constexpr Position PortalTargetSpawnPosition = { 563.6597f, 139.7569f, 399.2507f, 4.712389f }; +constexpr Position PurpleGroundSpawnPosition = { 563.6858f, 139.4323f, 393.9862f, 4.694936f }; +constexpr Position ArthasPortalSpawnPosition = { 563.6996f, 175.9826f, 394.5042f, 4.694936f }; +constexpr Position LichKingSpawnPosition = { 563.5712f, 174.8351f, 394.4954f, 4.712389f }; +constexpr Position CorpseTeleportPosition = { 631.9390f, 136.5040f, 142.5540f, 0.803332f }; + +constexpr Position NorthrendBeastsSpawnPositions[] = { { 563.9358f, 229.8299f, 394.8061f, 4.694936f }, // Gormok \ Icehowl { 564.2802f, 233.1322f, 394.7897f, 1.621917f }, // Dreadscale }; -Position const AnubarakLoc[] = +constexpr Position AnubarakLoc[] = { { 783.9305f, 132.9722f, 142.6711f, 3.141593f }, // 0 - Anub'arak Spawn Location (sniffed) { 695.240051f, 137.834824f, 142.200000f, 0 }, // 1 - Anub'arak move point location @@ -172,15 +172,15 @@ Position const AnubarakLoc[] = { 740.184509f, 193.443390f, 142.117584f, 0 } // 4 - Nerub Spawn }; -Position const EndSpawnLoc[] = -{ - { 648.9167f, 131.0208f, 141.6161f, 0.f }, // 0 - Highlord Tirion Fordring - { 649.1614f, 142.0399f, 141.3057f, 0.f }, // 1 - Argent Mage - { 644.6250f, 149.2743f, 140.6015f, 5.f } // 2 - Portal to Dalaran -}; +//constexpr Position EndSpawnLoc[] = +//{ +// { 648.9167f, 131.0208f, 141.6161f, 0.f }, // 0 - Highlord Tirion Fordring +// { 649.1614f, 142.0399f, 141.3057f, 0.f }, // 1 - Argent Mage +// { 644.6250f, 149.2743f, 140.6015f, 5.f } // 2 - Portal to Dalaran +//}; // ToDo: Remove it in nexts rewrites -Position const ToCCommonLoc[] = +constexpr Position ToCCommonLoc[] = { { 559.257996f, 90.266197f, 395.122986f, 0.0f }, // 0 Barrent { 563.672974f, 139.57100f, 393.837006f, 0.0f }, // 1 Center 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 377fc98af1d..e561eafe44a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -273,7 +273,7 @@ enum HorGossipMenu GOSSIP_MENU_SYLVANAS_FINAL = 10931 }; -Position const NpcJainaOrSylvanasEscapeRoute[] = +constexpr Position NpcJainaOrSylvanasEscapeRoute[] = { { 5601.217285f, 2207.652832f, 731.541931f, 5.223304f }, // leave the throne room { 5607.224375f, 2173.913330f, 731.126038f, 2.608723f }, // adjust route @@ -286,36 +286,36 @@ Position const NpcJainaOrSylvanasEscapeRoute[] = { 5265.53f, 1681.6f, 784.2947f, 4.13643f } // final position (sniffed) }; -Position const LichKingMoveAwayPos = { 5400.069824f, 2102.7131689f, 707.69525f, 0.843803f }; // Lich King walks away -Position const LichKingFirstSummon = { 5600.076172f, 2192.270996f, 731.750488f, 4.330935f }; // Lich King First summons -Position const JainaSylvanasShadowThroneDoor = { 5577.243f, 2235.852f, 733.0128f, 2.209562f }; // Jaina/Sylvanas move to door -Position const LichKingFinalPos = { 5283.742188f, 1706.335693f, 783.293518f, 4.138510f }; // Lich King Final Pos +constexpr Position LichKingMoveAwayPos = { 5400.069824f, 2102.7131689f, 707.69525f, 0.843803f }; // Lich King walks away +constexpr Position LichKingFirstSummon = { 5600.076172f, 2192.270996f, 731.750488f, 4.330935f }; // Lich King First summons +//constexpr Position JainaSylvanasShadowThroneDoor = { 5577.243f, 2235.852f, 733.0128f, 2.209562f }; // Jaina/Sylvanas move to door +constexpr Position LichKingFinalPos = { 5283.742188f, 1706.335693f, 783.293518f, 4.138510f }; // Lich King Final Pos // sniffed -Position const KorelnOrLoralenPos[] = +constexpr Position KorelnOrLoralenPos[] = { { 5253.061f, 1953.616f, 707.6948f, 0.8377581f }, { 5283.226f, 1992.300f, 707.7445f, 0.8377581f }, { 5360.711f, 2064.797f, 707.6948f, 0.0f } }; -Position const SylvanasIntroPosition[] = +constexpr Position SylvanasIntroPosition[] = { { 0.0f, 0.0f, 0.0f, 0.0f }, // 0 - Spawn { 5263.2f, 1950.96f, 707.6948f, 0.8028514f }, // 1 - Move to Door { 5306.82f, 1998.17f, 709.341f, 1.239184f }, // 2 - Move to Frostmourne }; -Position const JainaIntroPosition[] = +constexpr Position JainaIntroPosition[] = { { 0.0f, 0.0f, 0.0f, 0.0f }, // 0 - Spawn { 5265.89f, 1952.98f, 707.6978f, 0.0f }, // 1 - Move to Door { 5306.95f, 1998.49f, 709.3414f, 1.277278f } // 2 - Move to Frostmourne }; -Position const UtherSpawnPos = { 5307.814f, 2003.168f, 709.4244f, 4.537856f }; +constexpr Position UtherSpawnPos = { 5307.814f, 2003.168f, 709.4244f, 4.537856f }; -Position const LichKingIntroPosition[] = +constexpr Position LichKingIntroPosition[] = { { 5362.463f, 2062.693f, 707.7781f, 3.944444f }, // 0 - Spawn { 5332.83f, 2031.24f, 707.6948f, 0.0f }, // 1 - Door @@ -325,21 +325,21 @@ Position const LichKingIntroPosition[] = { 5355.488f, 2055.149f, 707.6907f, 0.0f } // 5 - Move back 3 }; -Position const FalricPosition[] = +constexpr Position FalricPosition[] = { { 5276.583f, 2037.45f, 709.4025f, 5.532694f }, // 0 - Spawn { 5283.95f, 2030.53f, 709.3191f, 0.0f } // 1 - Intro }; -Position const MarwynPosition[] = +constexpr Position MarwynPosition[] = { { 5342.232f, 1975.696f, 709.4025f, 2.391101f }, // 0 - Spawn { 5335.01f, 1982.37f, 709.3191f, 0.0f } // 1 - Intro }; -Position const SylvanasShadowThroneDoorPosition = { 5576.79f, 2235.73f, 733.0029f, 2.687807f }; +constexpr Position SylvanasShadowThroneDoorPosition = { 5576.79f, 2235.73f, 733.0029f, 2.687807f }; -Position const IceWallTargetPosition[] = +constexpr Position IceWallTargetPosition[] = { { 5547.833f, 2083.701f, 731.4332f, 1.029744f }, // 1st Icewall { 5503.213f, 1969.547f, 737.0245f, 1.27409f }, // 2nd Icewall @@ -2415,16 +2415,16 @@ enum QuelDelarMisc SPELL_QUEL_DELAR_WILL = 70698 }; -Position const QuelDelarCenterPos = { 5309.259f, 2006.390f, 718.046f, 0.0f }; -Position const QuelDelarSummonPos = { 5298.473f, 1994.852f, 709.424f, 3.979351f }; -Position const QuelDelarMovement[] = +constexpr Position QuelDelarCenterPos = { 5309.259f, 2006.390f, 718.046f, 0.0f }; +constexpr Position QuelDelarSummonPos = { 5298.473f, 1994.852f, 709.424f, 3.979351f }; +constexpr Position QuelDelarMovement[] = { { 5292.870f, 1998.950f, 718.046f, 0.0f }, { 5295.819f, 1991.912f, 707.707f, 0.0f }, { 5295.301f, 1989.782f, 708.696f, 0.0f } }; -Position const UtherQuelDelarMovement[] = +constexpr Position UtherQuelDelarMovement[] = { { 5336.830f, 1981.700f, 709.319f, 0.0f }, { 5314.350f, 1993.440f, 707.726f, 0.0f } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index a5fe4abab32..572a73b7838 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -47,13 +47,6 @@ enum Spells SPELL_INFECTED_WOUND = 29307 // Used by the zombies on self. }; -Position const PosSummon[3] = -{ - { 3270.132f, -3169.948f, 297.5891f, 5.88176f }, - { 3307.298f, -3183.449f, 297.5891f, 5.742133f }, - { 3255.708f, -3135.677f, 297.5891f, 1.867502f } -}; - enum Events { EVENT_WOUND = 1, diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 5406bb8bb07..1f2ebb020c9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "G3DPosition.hpp" #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" @@ -29,7 +30,6 @@ #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" -#include <G3D/Vector3.h> enum Says { @@ -230,7 +230,7 @@ enum RazorscalePhases PHASE_PERMA_GROUND }; -Position const PosBrokenHarpoon[4] = +constexpr Position PosBrokenHarpoon[4] = { { 571.9465f, -136.0118f, 391.5171f, 2.286379f }, // 1 { 589.9233f, -133.6223f, 391.8968f, 3.298687f }, // 2 @@ -238,7 +238,7 @@ Position const PosBrokenHarpoon[4] = { 606.2297f, -136.7212f, 391.1803f, 5.131269f } // 3 }; -Position const PosHarpoon[4] = +constexpr Position PosHarpoon[4] = { { 571.9012f, -136.5541f, 391.5171f, 4.921829f }, // GO_RAZOR_HARPOON_1 { 589.9233f, -133.6223f, 391.8968f, 4.81711f }, // GO_RAZOR_HARPOON_2 @@ -246,7 +246,7 @@ Position const PosHarpoon[4] = { 606.2297f, -136.7212f, 391.1803f, 4.537859f } // GO_RAZOR_HARPOON_4 }; -Position const DefendersPosition[6] = +constexpr Position DefendersPosition[6] = { { 624.3065f, -154.4163f, 391.6442f }, { 611.6274f, -170.9375f, 391.8087f }, @@ -256,14 +256,14 @@ Position const DefendersPosition[6] = { 549.1727f, -159.1180f, 391.8087f } }; -Position const TrapperPosition[3] = +constexpr Position TrapperPosition[3] = { { 574.9293f, -184.5150f, 391.8921f }, { 539.7838f, -178.5337f, 391.3053f }, { 627.1754f, -177.9638f, 391.5553f } }; -uint32 const SummonMinionsSpells[4] = +constexpr uint32 SummonMinionsSpells[4] = { SPELL_TRIGGER_SUMMON_IRON_DWARVES, SPELL_TRIGGER_SUMMON_IRON_DWARVES_2, @@ -271,8 +271,7 @@ uint32 const SummonMinionsSpells[4] = SPELL_TRIGGER_SUMMON_IRON_VRYKUL }; -uint32 const pathSize = 11; -G3D::Vector3 const RazorscalePath[pathSize] = +constexpr Position RazorscalePath[] = { { 657.0227f, -361.1278f, 519.5406f }, { 698.9319f, -340.9654f, 520.4857f }, @@ -287,11 +286,10 @@ G3D::Vector3 const RazorscalePath[pathSize] = { 611.5800f, -353.1930f, 526.2653f } }; -Position const RazorFlightPosition = { 585.3610f, -173.5592f, 456.8430f, 1.526665f }; -Position const RazorFlightPositionPhase2 = { 619.1450f, -238.0780f, 475.1800f, 1.423917f }; -Position const RazorscaleLand = { 585.4010f, -173.5430f, 408.5080f, 1.570796f }; -Position const RazorscaleGroundPosition = { 585.4010f, -173.5430f, 391.6421f, 1.570796f }; -Position const RazorscaleFirstPoint = { 657.0227f, -361.1278f, 519.5406f }; +constexpr Position RazorFlightPosition = { 585.3610f, -173.5592f, 456.8430f, 1.526665f }; +constexpr Position RazorFlightPositionPhase2 = { 619.1450f, -238.0780f, 475.1800f, 1.423917f }; +constexpr Position RazorscaleLand = { 585.4010f, -173.5430f, 408.5080f, 1.570796f }; +constexpr Position RazorscaleGroundPosition = { 585.4010f, -173.5430f, 391.6421f, 1.570796f }; struct boss_razorscale : public BossAI { @@ -331,7 +329,8 @@ struct boss_razorscale : public BossAI { std::function<void(Movement::MoveSplineInit&)> initializer = [](Movement::MoveSplineInit& init) { - Movement::PointsArray path(RazorscalePath, RazorscalePath + pathSize); + Movement::PointsArray path(std::size(RazorscalePath)); + std::transform(std::begin(RazorscalePath), std::end(RazorscalePath), path.begin(), [](Position pos) { return PositionToVector3(pos); }); init.MovebyPath(path, 0); init.SetCyclic(); init.SetFly(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index eb7c25db955..01ad39ac4e3 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -274,19 +274,19 @@ enum MovementPoints POINT_END_TRANSITION = 6 }; -uint32 const SummonWeaponsSpells[] = +constexpr uint32 SummonWeaponsSpells[] = { SPELL_SUMMON_WEAPONA, SPELL_SUMMON_WEAPONB, SPELL_SUMMON_WEAPONC, SPELL_SUMMON_WEAPOND, SPELL_SUMMON_WEAPONE, SPELL_SUMMON_WEAPONF, SPELL_SUMMON_WEAPONG }; -uint32 const RemoveWeaponsSpells[] = +constexpr uint32 RemoveWeaponsSpells[] = { SPELL_REMOVE_WEAPONA, SPELL_REMOVE_WEAPONB, SPELL_REMOVE_WEAPONC, SPELL_REMOVE_WEAPOND, SPELL_REMOVE_WEAPONE, SPELL_REMOVE_WEAPONF, SPELL_REMOVE_WEAPONG }; -uint32 GravityLapseSpells[] = +constexpr uint32 GravityLapseSpells[] = { SPELL_GRAVITY_LAPSE_TELE_FRONT, SPELL_GRAVITY_LAPSE_TELE_FRONT_RIGHT, @@ -315,12 +315,10 @@ uint32 GravityLapseSpells[] = SPELL_GRAVITY_LAPSE_TELE_CASTER_BACK_RIGHT3 }; -const float CAPERNIAN_DISTANCE = 20.0f; //she casts away from the target -//const float KAEL_VISIBLE_RANGE = 50.0f; +constexpr float CAPERNIAN_DISTANCE = 20.0f; //she casts away from the target +//constexpr float KAEL_VISIBLE_RANGE = 50.0f; -Position const afGravityPos = {795.0f, 0.0f, 70.0f}; - -Position const TransitionPos[6] = +constexpr Position TransitionPos[6] = { // First two values are not static, they seem to differ on each sniff. { 794.0522f, -0.96732f, 48.97848f, 0.0f }, diff --git a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp index 5f959dfa579..62f6ca3f78b 100644 --- a/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp +++ b/src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp @@ -398,39 +398,32 @@ enum AnduinWrynnSpellVisuals SPELL_VISUAL_CHEST_LOOT = 114023, }; -Position const PreIntroductionAssistersPositions[3] = +constexpr Position PreIntroductionAssistersPositions[3] = { { -3826.9548f, -2626.2761f, 78.9296f, 4.644121f }, // Jaina { -3831.6807f, -2626.2761f, 78.9296f, 5.460620f }, // Uther { -3818.7300f, -2626.2800f, 78.9296f, 4.558697f }, // Sylvanas }; -Position const AssistersSpawnPos[3] = -{ - { -3824.65f, -2692.20f, 91.3485f, 4.64412f}, // Jaina - { -3828.03f, -2688.25f, 91.3485f, 5.46062f}, // Uther - { -3819.48f, -2687.19f, 91.3485f, 4.55870f}, // Sylvanas -}; - -Position const FirimOutroductionPos = { -3830.0156f, -2676.7969f, 91.56402f }; -Position const QuartermasterRahmPos = { -3824.9565f, -2673.0190f, 91.44697f, 4.7163963f }; -Position const LeftKnightPosition = { -3815.4097f, -2677.1824f, 91.44697f, 4.742376f }; -Position const RightKnightPosition = { -3834.6807f, -2677.42360f, 91.44697f, 4.6956997f }; +//constexpr Position FirimOutroductionPos = { -3830.0156f, -2676.7969f, 91.56402f }; +constexpr Position QuartermasterRahmPos = { -3824.9565f, -2673.0190f, 91.44697f, 4.7163963f }; +constexpr Position LeftKnightPosition = { -3815.4097f, -2677.1824f, 91.44697f, 4.742376f }; +constexpr Position RightKnightPosition = { -3834.6807f, -2677.42360f, 91.44697f, 4.6956997f }; -Position const DominationGraspCenter = { -3825.0601f, -2715.4600f, 91.3567f, 1.6260f }; +constexpr Position DominationGraspCenter = { -3825.0601f, -2715.4600f, 91.3567f, 1.6260f }; -Position const IntermissionAssistersTeleportPosition[3] = +constexpr Position IntermissionAssistersTeleportPosition[3] = { { -3828.472f, -2688.191f, 91.2652f, 1.9153f }, // Sylvanas { -3819.519f, -2687.170f, 91.2652f, 2.1812f }, // Uther { -3824.960f, -2692.550f, 91.2652f, 1.5733f }, // Jaina }; -Position const AnduinsDespairSpawnPosition = { -3828.355957f, -2704.1875f, 91.350716f, 4.982021f }; +constexpr Position AnduinsDespairSpawnPosition = { -3828.355957f, -2704.1875f, 91.350716f, 4.982021f }; -Position const AnduinsSoulSpawnPosition = { -3825.060059f, -2715.459961f, 91.356697f, 1.626040f }; +constexpr Position AnduinsSoulSpawnPosition = { -3825.060059f, -2715.459961f, 91.356697f, 1.626040f }; -Position const AnduinsDoubtSpawnPositions[4] = +constexpr Position AnduinsDoubtSpawnPositions[4] = { { -3852.638916f, -2687.373291f, 91.348526f, 5.560700f }, // Right of Uther { -3852.845459f, -2742.732666f, 91.348534f, 0.961583f }, // Next Right @@ -438,7 +431,7 @@ Position const AnduinsDoubtSpawnPositions[4] = { -3799.805664f, -2740.925293f, 91.348541f, 2.247305f }, // Next Left }; -Position const AnduinsHopeSpawnPosition[4] = +constexpr Position AnduinsHopeSpawnPosition[4] = { { -3825.149414f, -2711.508789f, 91.354919f, 1.463445f }, // In front of Anduin { -3828.751709f, -2715.171875f, 91.354919f, 3.221487f }, // Left of Anduin @@ -446,9 +439,9 @@ Position const AnduinsHopeSpawnPosition[4] = { -3825.180664f, -2719.208252f, 91.354820f, 4.741285f }, // Behind Anduin }; -Position const RemnantOfAFallenKingSpawnPosition = { -3825.2466f, -2700.0486f, 91.3650f, 1.3762f }; +constexpr Position RemnantOfAFallenKingSpawnPosition = { -3825.2466f, -2700.0486f, 91.3650f, 1.3762f }; -Position const GrimReflectionsSpawnPositions[4] = +constexpr Position GrimReflectionsSpawnPositions[4] = { { -3825.389f, -2739.4202f, 91.431305f, 4.8445f}, // back side of Anduin { -3849.8438f, -2715.0574f, 91.40953f, 2.9961f}, // left side of Anduin @@ -468,9 +461,9 @@ Position const MarchOfTheDamnedSpawnPositions[8] = { -3810.4290f, -2751.0903f, 91.53032f, 1.9584f } // Fourth Left }; -Position const BeaconOfHopeSpawnPosition = { -3825.0417f, -2715.3923f, 91.3568f, 0.0f }; +constexpr Position BeaconOfHopeSpawnPosition = { -3825.0417f, -2715.3923f, 91.3568f, 0.0f }; -Position const ChestLootSpawnPosition = { -3840.9915f, -2741.7847f, 91.26521f, 1.334929f }; +constexpr Position ChestLootSpawnPosition = { -3840.9915f, -2741.7847f, 91.26521f, 1.334929f }; class ActivateGhouls : public BasicEvent { |