diff options
Diffstat (limited to 'src/server/scripts')
18 files changed, 55 insertions, 55 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp index 877d4dc23b7..26da4e9054d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -30,7 +30,7 @@ enum Spells enum Paths { - GIZRUL_PATH = 402450 + GIZRUL_PATH = 3219600 }; enum Events diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 1de8cfcd416..ad3f9a32ddc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -36,7 +36,7 @@ enum Misc { NEFARIUS_PATH_2 = 1379671, NEFARIUS_PATH_3 = 1379672, - GYTH_PATH_1 = 1379681, + GYTH_PATH_1 = 11037448, }; enum Events 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 e2cb6e5d13f..905140b967e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -60,11 +60,11 @@ enum Adds enum Misc { - NEFARIUS_PATH_1 = 1379670, - NEFARIUS_PATH_2 = 1379671, - NEFARIUS_PATH_3 = 1379672, - REND_PATH_1 = 1379680, - REND_PATH_2 = 1379681, + NEFARIUS_PATH_1 = 11037360, + NEFARIUS_PATH_2 = 11037368, + NEFARIUS_PATH_3 = 11037376, + REND_PATH_1 = 11037440, + REND_PATH_2 = 11037448, }; /* diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index ae0b6585974..310ae35e096 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -86,8 +86,8 @@ enum Gossip enum Paths { - NEFARIUS_PATH_2 = 1379671, - NEFARIUS_PATH_3 = 1379672 + NEFARIUS_PATH_2 = 11037368, + NEFARIUS_PATH_3 = 11037376 }; enum GameObjects diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 63041a51618..cd6e23cb328 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -93,7 +93,7 @@ enum MTInstanceText enum MTMovementData { - PATH_KALECGOS_FLIGHT = 248440 + PATH_KALECGOS_FLIGHT = 1987520 }; template <class AI, class T> diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index d60ed5a3f51..11cc168d497 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -261,7 +261,7 @@ struct npc_koltira_deathweaver : public ScriptedAI me->SetWalk(false); me->SetImmuneToNPC(false); DoCastSelf(SPELL_HERO_AGGRO); - me->GetMotionMaster()->MovePath(NPC_KOLTIRA, false); + me->GetMotionMaster()->MovePath(NPC_KOLTIRA << 3, false); break; case EVENT_CHECK_PLAYER: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index e62cdf8d8c0..c102f54afad 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -64,7 +64,7 @@ enum Misc { WEAPON_KIRTONOS_STAFF = 11365, POINT_KIRTONOS_LAND = 13, - KIRTONOS_PATH = 105061 + KIRTONOS_PATH = 840488 }; Position const PosMove[2] = diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index 6a2766ce427..19650e7f58a 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -25,11 +25,11 @@ enum COG_Paths { - STORMWIND_PATH = 80500, - GOLDSHIRE_PATH = 80501, - WOODS_PATH = 80502, - HOUSE_PATH = 80503, - LISA_PATH = 80700 + STORMWIND_PATH = 644000, + GOLDSHIRE_PATH = 644008, + WOODS_PATH = 644016, + HOUSE_PATH = 644024, + LISA_PATH = 645600 }; enum COG_Waypoints diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index ac982ea88b5..0c52922b0a1 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -27,8 +27,8 @@ enum Partygoer_Pather EVENT_REMOVE_EQUIPMENT_PATHER, EVENT_STOP_DANCING_PATHER, - PATH_FIRST_PATH = 594440, - PATH_LAST_PATH = 594444, + PATH_FIRST_PATH = 4755520, + PATH_LAST_PATH = 4755552, }; struct npc_partygoer_pather : public ScriptedAI diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index a82cf68206c..d941582dd5b 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -60,12 +60,12 @@ enum HordeHauler TALK_ON_SEPULCHER = 2, TALK_ON_FORSAKEN_FRONT = 3, - PATH_FROM_NORTH_TO_SOUTH = 447310, - PATH_TROOPER_1 = 447320, - PATH_TROOPER_2 = 447321, - PATH_TROOPER_3 = 447322, - PATH_TROOPER_4 = 447323, - PATH_TROOPER_5 = 447324, + PATH_FROM_NORTH_TO_SOUTH = 3578480, + PATH_TROOPER_1 = 3578560, + PATH_TROOPER_2 = 3578568, + PATH_TROOPER_3 = 3578576, + PATH_TROOPER_4 = 3578584, + PATH_TROOPER_5 = 3578592, WAYPOINT_ON_FORSAKEN_HIGH = 11, WAYPOINT_ON_SEPULCHER = 35, @@ -340,8 +340,8 @@ enum QuestTheWarchiefCometh TALK_CROMUSH_COMETH_0 = 0, TALK_CROMUSH_COMETH_1 = 1, - PATH_CROMUSH = 446402, - PATH_GARROSH = 446290, + PATH_CROMUSH = 3571216, + PATH_GARROSH = 3570320, POINT_AGATHA_PRE_RISE = 1, POINT_AGATHA_RISE = 2, @@ -1417,9 +1417,9 @@ enum ForsakenBat TALK_BAT_ARRIVED_TO_ISLE = 0, TALK_BAT_GOING_HOME = 1, - PATH_BAT_TO_LAKE = 448210, - PATH_BAT_AROUND_LAKE = 448211, - PATH_BAT_TO_HOME = 448212, + PATH_BAT_TO_LAKE = 3585680, + PATH_BAT_AROUND_LAKE = 3585688, + PATH_BAT_TO_HOME = 3585696, WAYPOINT_LAST_POINT_TO_LAKE = 8, WAYPOINT_LAST_POINT_AROUND_LAKE = 32, @@ -1660,8 +1660,8 @@ enum DeathstalkerRaneYorick TALK_YORICK_EXSANGUINATE_SUMMON = 0, TALK_YORICK_EXSANGUINATE_HIDE = 1, - PATH_YORICK_UP = 448820, - PATH_YORICK_HIDE = 448821, + PATH_YORICK_UP = 3590560, + PATH_YORICK_HIDE = 3590568, WAYPOINT_CLOSE_TO_ARMOIRE = 15, WAYPOINT_HIDDEN_NEXT_TO_ARMOIRE = 2 @@ -1909,12 +1909,12 @@ enum WaitingToExsanguinate TALK_BLOODFANG_EXSANGUINATE_9 = 9, TALK_BLOODFANG_EXSANGUINATE_10 = 10, - PATH_CROWLEY_ENTER = 448830, - PATH_BLOODFANG_ENTER = 448840, - PATH_BLOODFANG_NEAR_YORICK = 448841, - PATH_BLOODFANG_WITH_YORICK = 448842, - PATH_BLOODFANG_EXIT = 448843, - PATH_CROWLEY_EXIT = 448831 + PATH_CROWLEY_ENTER = 3590640, + PATH_BLOODFANG_ENTER = 3590720, + PATH_BLOODFANG_NEAR_YORICK = 3590728, + PATH_BLOODFANG_WITH_YORICK = 3590736, + PATH_BLOODFANG_EXIT = 3590744, + PATH_CROWLEY_EXIT = 3590648 }; // 44893 - Armoire @@ -4140,7 +4140,7 @@ enum AgathaFenrisIsle TALK_AGATHA_POST_EVENT1 = 3, TALK_AGATHA_POST_EVENT2 = 4, - PATH_AGATHA_TO_FORSAKEN = 449510, + PATH_AGATHA_TO_FORSAKEN = 3596080, WAYPOINT_SPEED_UP = 14, WAYPOINT_ARRIVED_TO_FORSAKEN = 19, diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 8dac870d76e..44ca79c2765 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -57,7 +57,7 @@ enum Belnistrasz EVENT_FIREBALL = 5, EVENT_FROST_NOVA = 6, - PATH_ESCORT = 871710, + PATH_ESCORT = 6973680, POINT_REACH_IDOL = 17, QUEST_EXTINGUISHING_THE_IDOL = 3525, diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 0e6f2f9e4d6..7700bcfe5a0 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -29,7 +29,7 @@ enum Misc NPC_GAHZRILLA = 7273, // Paths - PATH_ADDS = 81553 + PATH_ADDS = 652424 }; int const pyramidSpawnTotal = 54; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 9977d0bd8f1..93a846c2ca2 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -342,7 +342,7 @@ struct npc_crystal_channel_target : public ScriptedAI } if (summon) - summon->GetMotionMaster()->MovePath(summon->GetEntry() * 100, false); + summon->GetMotionMaster()->MovePath((summon->GetEntry() * 100) << 3, false); if (_spell == SPELL_SUMMON_CRYSTAL_HANDLER) Reset(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 745d7500236..4337e0c2a89 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -379,7 +379,7 @@ struct npc_highlord_tirion_fordring_lh : public ScriptedAI case EVENT_MURADIN_RUN: case EVENT_SAURFANG_RUN: if (Creature* factionNPC = ObjectAccessor::GetCreature(*me, _factionNPC)) - factionNPC->GetMotionMaster()->MovePath(factionNPC->GetSpawnId() * 10, false); + factionNPC->GetMotionMaster()->MovePath((factionNPC->GetSpawnId() * 10) << 3, false); me->setActive(false); _damnedKills = 3; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 623fe1c1a77..fdf9757ec09 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -175,7 +175,7 @@ enum EnslavedProtoDrake TYPE_PROTODRAKE_AT = 28, DATA_PROTODRAKE_MOVE = 6, - PATH_PROTODRAKE = 125946, + PATH_PROTODRAKE = 1007568, EVENT_REND = 1, EVENT_FLAME_BREATH = 2, diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index fbd9942c095..9317838dfe8 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -769,11 +769,11 @@ enum Thassarian SAY_LERYSSA_3 = 2, SAY_LERYSSA_4 = 3, - PATH_THASSARIAN = 1013030, - PATH_ARTHAS = 1013031, - PATH_TALBOT = 1013032, - PATH_ARLOS = 1013033, - PATH_LERYSSA = 1013034 + PATH_THASSARIAN = 8104240, + PATH_ARTHAS = 8104248, + PATH_TALBOT = 8104256, + PATH_ARLOS = 8104264, + PATH_LERYSSA = 8104272 }; struct npc_thassarian : public ScriptedAI diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 654e2e687f2..4932c018b97 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -152,7 +152,7 @@ struct npc_freed_protodrake : public VehicleAI if (Unit* passenger = vehicle->GetPassenger(0)) { Talk(TEXT_EMOTE, passenger); - me->GetMotionMaster()->MovePath(NPC_DRAKE, false); + me->GetMotionMaster()->MovePath(NPC_DRAKE << 3, false); } } else @@ -430,7 +430,7 @@ private: enum WildWyrm { - PATH_WILD_WYRM = 30275 * 10, + PATH_WILD_WYRM = (30275 * 10) << 3, // Phase 1 SPELL_PLAYER_MOUNT_WYRM = 56672, @@ -725,8 +725,8 @@ enum JokkumScriptcast { NPC_KINGJOKKUM = 30331, NPC_THORIM = 30390, - PATH_JOKKUM = 2072200, - PATH_JOKKUM_END = 2072201, + PATH_JOKKUM = 16577600, + PATH_JOKKUM_END = 16577608, SAY_HOLD_ON = 0, SAY_JOKKUM_1 = 1, SAY_JOKKUM_2 = 2, diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index fa3126893e3..71f1f89ae3e 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -367,14 +367,14 @@ public: stormforgedMonitor->SetWalk(false); /// The npc would search an alternative way to get to the last waypoint without this unit state. stormforgedMonitor->AddUnitState(UNIT_STATE_IGNORE_PATHFINDING); - stormforgedMonitor->GetMotionMaster()->MovePath(NPC_STORMFORGED_MONITOR * 100, false); + stormforgedMonitor->GetMotionMaster()->MovePath((NPC_STORMFORGED_MONITOR * 100) << 3, false); } stormforgedEradictor = player->SummonCreature(NPC_STORMFORGED_ERADICTOR, stormforgedEradictorPosition, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1min); if (stormforgedEradictor) { stormforgedEradictorGUID = stormforgedEradictor->GetGUID(); - stormforgedEradictor->GetMotionMaster()->MovePath(NPC_STORMFORGED_ERADICTOR * 100, false); + stormforgedEradictor->GetMotionMaster()->MovePath((NPC_STORMFORGED_ERADICTOR * 100) << 3, false); } return true; |
