API tools faq
paste
Guest User

Untitled

a guest
Nov 24th, 2017
144
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 69.94 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/VC90/90ScriptDev2.vcproj b/VC90/90ScriptDev2.vcproj
  2. index a757ba3..fc9dd63 100644
  3. --- a/VC90/90ScriptDev2.vcproj
  4. +++ b/VC90/90ScriptDev2.vcproj
  5. @@ -571,10 +571,6 @@
  6. Name="blackrock_spire"
  7. >
  8. <File
  9. - RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\blackrock_spire.h"
  10. - >
  11. - </File>
  12. - <File
  13. RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\boss_drakkisath.cpp"
  14. >
  15. </File>
  16. @@ -626,6 +622,10 @@
  17. RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\instance_blackrock_spire.cpp"
  18. >
  19. </File>
  20. + <File
  21. + RelativePath="..\scripts\eastern_kingdoms\blackrock_spire\blackrock_spire.h"
  22. + >
  23. + </File>
  24. </Filter>
  25. <Filter
  26. Name="blackwing_lair"
  27. @@ -1095,15 +1095,15 @@
  28. >
  29. </File>
  30. <File
  31. - RelativePath="..\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp"
  32. + RelativePath="..\scripts\eastern_kingdoms\uldaman\uldaman.cpp"
  33. >
  34. </File>
  35. <File
  36. - RelativePath="..\scripts\eastern_kingdoms\uldaman\uldaman.cpp"
  37. + RelativePath="..\scripts\eastern_kingdoms\uldaman\uldaman.h"
  38. >
  39. </File>
  40. <File
  41. - RelativePath="..\scripts\eastern_kingdoms\uldaman\uldaman.h"
  42. + RelativePath="..\scripts\eastern_kingdoms\uldaman\instance_uldaman.cpp"
  43. >
  44. </File>
  45. </Filter>
  46. @@ -1999,15 +1999,15 @@
  47. Name="ruby_sanctum"
  48. >
  49. <File
  50. - RelativePath="..\scripts\northrend\ruby_sanctum\boss_baltharus.cpp"
  51. + RelativePath="..\scripts\northrend\ruby_sanctum\boss_halion.cpp"
  52. >
  53. </File>
  54. <File
  55. - RelativePath="..\scripts\northrend\ruby_sanctum\boss_halion.cpp"
  56. + RelativePath="..\scripts\northrend\ruby_sanctum\boss_saviana.cpp"
  57. >
  58. </File>
  59. <File
  60. - RelativePath="..\scripts\northrend\ruby_sanctum\boss_saviana.cpp"
  61. + RelativePath="..\scripts\northrend\ruby_sanctum\boss_baltharus.cpp"
  62. >
  63. </File>
  64. <File
  65. @@ -2373,17 +2373,18 @@
  66. >
  67. </File>
  68. <File
  69. - RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.cpp"
  70. + RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\instance_halls_of_reflection.cpp"
  71. >
  72. </File>
  73. <File
  74. - RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.h"
  75. + RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.cpp"
  76. >
  77. </File>
  78. <File
  79. - RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\instance_halls_of_reflection.cpp"
  80. + RelativePath="..\scripts\northrend\icecrown_citadel\frozen_halls\halls_of_reflection\halls_of_reflection.h"
  81. >
  82. </File>
  83. +
  84. </Filter>
  85. <Filter
  86. Name="forge_of_souls"
  87. @@ -3094,19 +3095,19 @@
  88. </FileConfiguration>
  89. </File>
  90. <File
  91. - RelativePath="..\ScriptMgr.cpp"
  92. + RelativePath="..\sd2_revision_nr.h"
  93. >
  94. </File>
  95. <File
  96. - RelativePath="..\ScriptMgr.h"
  97. + RelativePath="..\sd2_revision_sql.h"
  98. >
  99. </File>
  100. <File
  101. - RelativePath="..\sd2_revision_nr.h"
  102. + RelativePath="..\ScriptMgr.cpp"
  103. >
  104. </File>
  105. <File
  106. - RelativePath="..\sd2_revision_sql.h"
  107. + RelativePath="..\ScriptMgr.h"
  108. >
  109. </File>
  110. </Files>
  111. diff --git a/base/escort_ai.cpp b/base/escort_ai.cpp
  112. index a5d51d9..1ecce78 100644
  113. --- a/base/escort_ai.cpp
  114. +++ b/base/escort_ai.cpp
  115. @@ -363,7 +363,11 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
  116. {
  117. debug_log("SD2: EscortAI has returned to original position before combat");
  118.  
  119. - m_creature->SetWalk(!m_bIsRunning);
  120. + if (m_bIsRunning && m_creature->HasSplineFlag(SPLINEFLAG_WALKMODE))
  121. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  122. + else if (!m_bIsRunning && !m_creature->HasSplineFlag(SPLINEFLAG_WALKMODE))
  123. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  124. +
  125. RemoveEscortState(STATE_ESCORT_RETURNING);
  126.  
  127. if (!m_uiWPWaitTimer)
  128. @@ -454,14 +458,14 @@ void npc_escortAI::SetRun(bool bRun)
  129. if (bRun)
  130. {
  131. if (!m_bIsRunning)
  132. - m_creature->SetWalk(false);
  133. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  134. else
  135. debug_log("SD2: EscortAI attempt to set run mode, but is already running.");
  136. }
  137. else
  138. {
  139. if (m_bIsRunning)
  140. - m_creature->SetWalk(true);
  141. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  142. else
  143. debug_log("SD2: EscortAI attempt to set walk mode, but is already walking.");
  144. }
  145. @@ -521,7 +525,8 @@ void npc_escortAI::Start(bool bRun, const Player* pPlayer, const Quest* pQuest,
  146. CurrentWP = WaypointList.begin();
  147.  
  148. //Set initial speed
  149. - m_creature->SetWalk(!m_bIsRunning);
  150. + if (m_bIsRunning)
  151. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  152.  
  153. AddEscortState(STATE_ESCORT_ESCORTING);
  154.  
  155. diff --git a/include/precompiled.h b/include/precompiled.h
  156. index 11b6b31..2f202a3 100644
  157. --- a/include/precompiled.h
  158. +++ b/include/precompiled.h
  159. @@ -11,6 +11,11 @@
  160. #include "sc_grid_searchers.h"
  161. #include "sc_instance.h"
  162.  
  163. +enum backports
  164. +{
  165. + UNIT_VIRTUAL_ITEM_SLOT_ID = UNIT_VIRTUAL_ITEM_SLOT_DISPLAY
  166. +};
  167. +
  168. #ifdef WIN32
  169. # include <windows.h>
  170. BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
  171. diff --git a/include/sc_instance.cpp b/include/sc_instance.cpp
  172. index 9db67e6..35e2d05 100644
  173. --- a/include/sc_instance.cpp
  174. +++ b/include/sc_instance.cpp
  175. @@ -141,29 +141,6 @@ Creature* ScriptedInstance::GetSingleCreatureFromStorage(uint32 uiEntry, bool bS
  176.  
  177. return NULL;
  178. }
  179. -
  180. -/**
  181. - Helper function to start a timed achievement criteria for players in the map
  182. -
  183. - @param criteriaType The Type that is required to complete the criteria, see enum AchievementCriteriaTypes in MaNGOS
  184. - @param uiTimedCriteriaMiscId The ID that identifies how the criteria is started
  185. - */
  186. -void ScriptedInstance::DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId)
  187. -{
  188. - Map::PlayerList const& lPlayers = instance->GetPlayers();
  189. -
  190. - if (!lPlayers.isEmpty())
  191. - {
  192. - for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
  193. - {
  194. - if (Player* pPlayer = itr->getSource())
  195. - pPlayer->StartTimedAchievementCriteria(criteriaType, uiTimedCriteriaMiscId);
  196. - }
  197. - }
  198. - else
  199. - debug_log("SD2: DoStartTimedAchievement attempt start achievements but no players in map.");
  200. -}
  201. -
  202. /**
  203. Constructor for DialogueHelper
  204.  
  205. diff --git a/include/sc_instance.h b/include/sc_instance.h
  206. index 10eb893..e369c39 100644
  207. --- a/include/sc_instance.h
  208. +++ b/include/sc_instance.h
  209. @@ -54,9 +54,6 @@ class MANGOS_DLL_DECL ScriptedInstance : public InstanceData
  210. DoOrSimulateScriptTextForMap(iTextEntry, uiCreatureEntry, instance, GetSingleCreatureFromStorage(uiCreatureEntry, true));
  211. }
  212.  
  213. - // Starts a timed achievement criteria for all players in instance
  214. - void DoStartTimedAchievement(AchievementCriteriaTypes criteriaType, uint32 uiTimedCriteriaMiscId);
  215. -
  216. protected:
  217. // Storage for GO-Guids and NPC-Guids
  218. EntryGuidMap m_mGoEntryGuidStore; ///< Store unique GO-Guids by entry
  219. diff --git a/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
  220. index 798d51f..332b7ac 100644
  221. --- a/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
  222. +++ b/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
  223. @@ -135,10 +135,10 @@ struct MANGOS_DLL_DECL boss_nefarianAI : public ScriptedAI
  224. DoScriptText(SAY_AGGRO, m_creature);
  225.  
  226. // Remove flying in case Nefarian aggroes before his combat point was reached
  227. - if (m_creature->IsLevitating())
  228. + if (m_creature->HasSplineFlag(SPLINEFLAG_FLYING))
  229. {
  230. m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
  231. - m_creature->SetLevitate(false);
  232. + m_creature->RemoveSplineFlag(SPLINEFLAG_FLYING);
  233. }
  234.  
  235. DoCastSpellIfCan(m_creature, SPELL_SHADOWFLAME_INITIAL);
  236. diff --git a/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
  237. index 5f530b7..689889c 100644
  238. --- a/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
  239. +++ b/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
  240. @@ -148,11 +148,11 @@ struct MANGOS_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
  241. {
  242. if (pSummoned->GetEntry() == NPC_NEFARIAN)
  243. {
  244. - pSummoned->SetWalk(false);
  245. + pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  246.  
  247. // see boss_onyxia (also note the removal of this in boss_nefarian)
  248. pSummoned->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_UNK_2);
  249. - pSummoned->SetLevitate(true);
  250. + pSummoned->AddSplineFlag(SPLINEFLAG_FLYING);
  251.  
  252. // Let Nefarian fly towards combat area
  253. pSummoned->GetMotionMaster()->MovePoint(1, aNefarianLocs[4].m_fX, aNefarianLocs[4].m_fY, aNefarianLocs[4].m_fZ);
  254. diff --git a/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
  255. index 0ecd412..283dfcc 100644
  256. --- a/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
  257. +++ b/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
  258. @@ -172,13 +172,13 @@ void instance_deadmines::Update(uint32 uiDiff)
  259. // should be static spawns, fetch the closest ones at the pier
  260. if (Creature* pi1 = GetClosestCreatureWithEntry(pDoor, NPC_PIRATE, 40.0f))
  261. {
  262. - pi1->SetWalk(false);
  263. + pi1->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  264. pi1->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
  265. }
  266.  
  267. if (Creature* pi2 = GetClosestCreatureWithEntry(pDoor, NPC_SQUALLSHAPER, 40.0f))
  268. {
  269. - pi2->SetWalk(false);
  270. + pi2->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  271. pi2->GetMotionMaster()->MovePoint(0, pDoor->GetPositionX(), pDoor->GetPositionY(), pDoor->GetPositionZ());
  272. }
  273. }
  274. diff --git a/scripts/eastern_kingdoms/hinterlands.cpp b/scripts/eastern_kingdoms/hinterlands.cpp
  275. index 39e6fe1..98e7dfc 100644
  276. --- a/scripts/eastern_kingdoms/hinterlands.cpp
  277. +++ b/scripts/eastern_kingdoms/hinterlands.cpp
  278. @@ -232,7 +232,7 @@ struct MANGOS_DLL_DECL npc_rinjiAI : public npc_escortAI
  279.  
  280. void JustSummoned(Creature* pSummoned)
  281. {
  282. - m_creature->SetWalk(false);
  283. + pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  284. pSummoned->GetMotionMaster()->MovePoint(0, m_afAmbushMoveTo[m_iSpawnId].m_fX, m_afAmbushMoveTo[m_iSpawnId].m_fY, m_afAmbushMoveTo[m_iSpawnId].m_fZ);
  285. }
  286.  
  287. diff --git a/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
  288. index d807da3..9e8afff 100644
  289. --- a/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
  290. +++ b/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
  291. @@ -120,7 +120,7 @@ struct MANGOS_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
  292. float x, y, z; // coords that we move to, close to the crystal.
  293. pCrystalChosen->GetClosePoint(x, y, z, m_creature->GetObjectBoundingRadius(), CONTACT_DISTANCE);
  294.  
  295. - m_creature->SetWalk(false);
  296. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  297. m_creature->GetMotionMaster()->MovePoint(1, x, y, z);
  298. m_bDrainingCrystal = true;
  299. }
  300. diff --git a/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
  301. index e39c690..090b8c3 100644
  302. --- a/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
  303. +++ b/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
  304. @@ -89,10 +89,10 @@ struct MANGOS_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI
  305. else
  306. DoScriptText(EMOTE_UNLOCK_DOOR_AD, m_creature);
  307. break;
  308. - case 12:
  309. - if (m_uiNpcEntry != NPC_ASH)
  310. - m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
  311. - break;
  312. +// case 12:
  313. +// if (m_uiNpcEntry != NPC_ASH)
  314. +// m_creature->HandleEmote(EMOTE_ONESHOT_USESTANDING);
  315. +// break;
  316. case 13:
  317. if (m_uiNpcEntry == NPC_ASH)
  318. DoScriptText(SAY_POST_DOOR_AS, m_creature);
  319. @@ -216,7 +216,7 @@ struct MANGOS_DLL_DECL mob_arugal_voidwalkerAI : public ScriptedAI
  320.  
  321. void Reset()
  322. {
  323. - m_creature->SetWalk(true);
  324. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  325. m_uiDarkOffering = urand(4400, 12500);
  326. m_bWPDone = true;
  327.  
  328. diff --git a/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
  329. index 109c6ba..56bbae2 100644
  330. --- a/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
  331. +++ b/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
  332. @@ -331,7 +331,7 @@ void instance_stratholme::SetData(uint32 uiType, uint32 uiData)
  333. if (pBarthilas && pBarthilas->isAlive() && !pBarthilas->isInCombat())
  334. {
  335. DoScriptText(SAY_WARN_BARON, pBarthilas);
  336. - pBarthilas->SetWalk(false);
  337. + pBarthilas->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  338. pBarthilas->GetMotionMaster()->MovePoint(0, aStratholmeLocation[0].m_fX, aStratholmeLocation[0].m_fY, aStratholmeLocation[0].m_fZ);
  339.  
  340. m_uiBarthilasRunTimer = 8000;
  341. diff --git a/scripts/eastern_kingdoms/undercity.cpp b/scripts/eastern_kingdoms/undercity.cpp
  342. index 6ca99d4..2053f89 100644
  343. --- a/scripts/eastern_kingdoms/undercity.cpp
  344. +++ b/scripts/eastern_kingdoms/undercity.cpp
  345. @@ -171,8 +171,9 @@ struct MANGOS_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI
  346. {
  347. if (EventMove_Timer < diff)
  348. {
  349. - m_creature->SetLevitate(true);
  350. - m_creature->MonsterMoveWithSpeed(m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,3.f);
  351. + m_creature->AddSplineFlag(SPLINEFLAG_NO_SPLINE);
  352. + m_creature->SendMonsterMoveWithSpeed(m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,5000);
  353. + m_creature->GetMap()->CreatureRelocation(m_creature,m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,m_creature->GetOrientation());
  354. EventMove = false;
  355. }else EventMove_Timer -= diff;
  356. }
  357. diff --git a/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
  358. index 7a907b7..6c3f002 100644
  359. --- a/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
  360. +++ b/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
  361. @@ -257,7 +257,9 @@ struct MANGOS_DLL_DECL mob_soaring_eagleAI : public ScriptedAI
  362. float fX, fY, fZ;
  363. pAzkil->GetRandomPoint(pAzkil->GetPositionX(), pAzkil->GetPositionY(), pAzkil->GetPositionZ()+15.0f, 30.0f, fX, fY, fZ);
  364.  
  365. - m_creature->SetWalk(false);
  366. + if (m_creature->HasSplineFlag(SPLINEFLAG_WALKMODE))
  367. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  368. +
  369. m_creature->GetMotionMaster()->MovePoint(POINT_ID_RANDOM, fX, fY, fZ);
  370.  
  371. m_bCanMoveToRandom = false;
  372. diff --git a/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
  373. index b265950..e7689bc 100644
  374. --- a/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
  375. +++ b/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
  376. @@ -603,7 +603,9 @@ struct MANGOS_DLL_DECL npc_amanishi_hatcherAI : public ScriptedAI
  377. m_uiHatchlingCount = 1;
  378. m_bCanMoveNext = false;
  379. m_bWaypointEnd = false;
  380. - m_creature->SetWalk(false);
  381. +
  382. + if (m_creature->HasSplineFlag(SPLINEFLAG_WALKMODE))
  383. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  384. }
  385.  
  386. void MoveInLineOfSight(Unit* pWho) {}
  387. diff --git a/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
  388. index f78204e..9526407 100644
  389. --- a/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
  390. +++ b/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
  391. @@ -256,7 +256,7 @@ struct MANGOS_DLL_DECL boss_mandokirAI : public ScriptedAI
  392. if (!m_bMandokirDownstairs && m_pInstance && (m_pInstance->GetData(TYPE_OHGAN) == SPECIAL || m_pInstance->GetData(TYPE_OHGAN) == FAIL))
  393. {
  394. m_bMandokirDownstairs = true;
  395. - m_creature->SetWalk(false);
  396. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  397. m_creature->GetMotionMaster()->MovePoint(POINT_DOWNSTAIRS, aMandokirDownstairsPos.fX, aMandokirDownstairsPos.fY, aMandokirDownstairsPos.fZ);
  398. }
  399.  
  400. diff --git a/scripts/kalimdor/azuremyst_isle.cpp b/scripts/kalimdor/azuremyst_isle.cpp
  401. index f87a61e..79522f6 100644
  402. --- a/scripts/kalimdor/azuremyst_isle.cpp
  403. +++ b/scripts/kalimdor/azuremyst_isle.cpp
  404. @@ -103,7 +103,7 @@ struct MANGOS_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
  405.  
  406. void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
  407. {
  408. - if (pSpell->IsFitToFamilyMask(UI64LIT(0x0000000000000000), 0x080000000))
  409. + if (pSpell->Id == 28880)
  410. {
  411. m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
  412. m_creature->SetStandState(UNIT_STAND_STATE_STAND);
  413. diff --git a/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
  414. index d5bd17e..4acca5d 100644
  415. --- a/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
  416. +++ b/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
  417. @@ -218,7 +218,7 @@ void hyjalAI::JustSummoned(Creature* pSummoned)
  418. float fX, fY, fZ;
  419. pSummoned->GetRandomPoint(pMove->m_fX, pMove->m_fY, pMove->m_fZ, 10.0f, fX, fY, fZ);
  420.  
  421. - pSummoned->SetWalk(false);
  422. + pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  423. pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
  424. }
  425.  
  426. @@ -402,7 +402,7 @@ void hyjalAI::UpdateAI(const uint32 uiDiff)
  427. if (!pTemp->isAlive() || pTemp->getVictim())
  428. continue;
  429.  
  430. - pTemp->SetWalk(false);
  431. + pTemp->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  432. pTemp->GetMotionMaster()->MovePoint(1, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
  433. }
  434. }
  435. diff --git a/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
  436. index 8a3673a..8ece6c5 100644
  437. --- a/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
  438. +++ b/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
  439. @@ -175,7 +175,7 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
  440. void JustReachedHome()
  441. {
  442. // in case evade in phase 2, see comments for hack where phase 2 is set
  443. - m_creature->SetLevitate(false);
  444. + m_creature->RemoveSplineFlag(SPLINEFLAG_FLYING);
  445. m_creature->SetByteFlag(UNIT_FIELD_BYTES_1, 3, 0);
  446.  
  447. if (m_pInstance)
  448. @@ -231,9 +231,17 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
  449. pSpell->Id == SPELL_BREATH_SOUTH_TO_NORTH ||
  450. pSpell->Id == SPELL_BREATH_NORTH_TO_SOUTH)
  451. {
  452. - // This was sent with SendMonsterMove - which resulted in better speed than now
  453. if (m_pPointData = GetMoveData())
  454. - m_creature->GetMotionMaster()->MovePoint(m_pPointData->uiLocId, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ);
  455. + {
  456. + if (!m_pInstance)
  457. + return;
  458. +
  459. + if (Creature* pTrigger = m_pInstance->GetSingleCreatureFromStorage(NPC_ONYXIA_TRIGGER))
  460. + {
  461. + m_creature->GetMap()->CreatureRelocation(m_creature, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ, m_creature->GetAngle(pTrigger));
  462. + m_creature->SendMonsterMove(m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ, SPLINETYPE_FACINGTARGET, m_creature->GetSplineFlags(), 1, NULL, pTrigger->GetObjectGuid().GetRawValue());
  463. + }
  464. + }
  465. }
  466. }
  467.  
  468. @@ -320,8 +328,8 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
  469. DoScriptText(SAY_PHASE_2_TRANS, m_creature);
  470.  
  471. // sort of a hack, it is unclear how this really work but the values appear to be valid
  472. - m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_UNK_2);
  473. - m_creature->SetLevitate(true);
  474. + m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND/* | UNIT_BYTE1_FLAG_UNK_2*/);
  475. + m_creature->AddSplineFlag(SPLINEFLAG_FLYING);
  476.  
  477. if (m_pPointData)
  478. m_creature->GetMotionMaster()->MovePoint(m_pPointData->uiLocId, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ);
  479. @@ -344,7 +352,7 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
  480.  
  481. // undo flying
  482. m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
  483. - m_creature->SetLevitate(false);
  484. + m_creature->RemoveSplineFlag(SPLINEFLAG_FLYING);
  485.  
  486. SetCombatMovement(true);
  487. m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
  488. @@ -446,7 +454,7 @@ struct MANGOS_DLL_DECL boss_onyxiaAI : public ScriptedAI
  489. return;
  490.  
  491. // All and only the Onyxia Deep Breath Spells have these visuals
  492. - if (pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_A || pSpell->SpellVisual[0] == SPELL_VISUAL_BREATH_B)
  493. + if (pSpell->SpellVisual == SPELL_VISUAL_BREATH_A || pSpell->SpellVisual == SPELL_VISUAL_BREATH_B)
  494. m_pInstance->SetData(TYPE_ONYXIA, DATA_PLAYER_TOASTED);
  495. }
  496. };
  497. diff --git a/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp b/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
  498. index cec7e97..f7dde0a 100644
  499. --- a/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
  500. +++ b/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
  501. @@ -62,10 +62,7 @@ void instance_onyxias_lair::SetData(uint32 uiType, uint32 uiData)
  502.  
  503. m_uiEncounter = uiData;
  504. if (uiData == IN_PROGRESS)
  505. - {
  506. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ONYXIA_ID);
  507. m_uiAchievWhelpsCount = 0;
  508. - }
  509. if (uiData == DATA_LIFTOFF)
  510. m_tPhaseTwoStart = time(NULL);
  511.  
  512. diff --git a/scripts/kalimdor/onyxias_lair/onyxias_lair.h b/scripts/kalimdor/onyxias_lair/onyxias_lair.h
  513. index f869ca9..2f493a7 100644
  514. --- a/scripts/kalimdor/onyxias_lair/onyxias_lair.h
  515. +++ b/scripts/kalimdor/onyxias_lair/onyxias_lair.h
  516. @@ -24,8 +24,6 @@ enum
  517. ACHIEV_CRIT_MANY_WHELPS_H = 12568,
  518. ACHIEV_CRIT_NO_BREATH_N = 12566, // Acheivements 4404, 4407
  519. ACHIEV_CRIT_NO_BREATH_H = 12569,
  520. -
  521. - ACHIEV_START_ONYXIA_ID = 6601,
  522. };
  523.  
  524. class MANGOS_DLL_DECL instance_onyxias_lair : public ScriptedInstance
  525. diff --git a/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
  526. index 0865d3a..e9ad59a 100644
  527. --- a/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
  528. +++ b/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
  529. @@ -137,7 +137,8 @@ struct MANGOS_DLL_DECL boss_ouroAI : public ScriptedAI
  530. {
  531. if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0))
  532. {
  533. - m_creature->MonsterMoveWithSpeed(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 28.f);
  534. + m_creature->GetMap()->CreatureRelocation(m_creature, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f);
  535. + m_creature->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPLINETYPE_NORMAL, SPLINEFLAG_WALKMODE, 1);
  536. }
  537.  
  538. m_uiChangeTargetTimer = urand(10000, 20000);
  539. diff --git a/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
  540. index abdbbf6..3e995aa 100644
  541. --- a/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
  542. +++ b/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
  543. @@ -152,7 +152,7 @@ struct MANGOS_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
  544. Reset();
  545.  
  546. // Remove running
  547. - m_creature->SetWalk(true);
  548. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  549. }
  550. else
  551. npc_escortAI::EnterEvadeMode();
  552. @@ -380,7 +380,7 @@ struct MANGOS_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
  553. break;
  554. case 11:
  555. SetEscortPaused(false);
  556. - m_creature->SetLevitate(true);
  557. + m_creature->AddSplineFlag(SPLINEFLAG_FLYING);
  558. SetRun();
  559. // Send them flying somewhere outside of the room
  560. if (Creature* pNaralex = m_pInstance->GetSingleCreatureFromStorage(NPC_NARALEX))
  561. @@ -390,8 +390,8 @@ struct MANGOS_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
  562. pNaralex->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_UNK_2);
  563.  
  564. // Set to flying
  565. - pNaralex->SetLevitate(true);
  566. - pNaralex->SetWalk(false);
  567. + pNaralex->AddSplineFlag(SPLINEFLAG_FLYING);
  568. + pNaralex->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  569.  
  570. // Set following
  571. pNaralex->GetMotionMaster()->MoveFollow(m_creature, 5.0f, 0);
  572. diff --git a/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h b/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
  573. index 114e535..bc6a5fc 100644
  574. --- a/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
  575. +++ b/scripts/northrend/azjol-nerub/ahnkahet/ahnkahet.h
  576. @@ -28,8 +28,6 @@ enum
  577.  
  578. NPC_ELDER_NADOX = 29309,
  579. //NPC_JEDOGA_SHADOWSEEKER = 29310,
  580. -
  581. - ACHIEV_START_VOLAZJ_ID = 20382,
  582. };
  583.  
  584. class MANGOS_DLL_DECL instance_ahnkahet : public ScriptedInstance
  585. diff --git a/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp b/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
  586. index 8036455..a82d755 100644
  587. --- a/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
  588. +++ b/scripts/northrend/azjol-nerub/ahnkahet/instance_ahnkahet.cpp
  589. @@ -101,13 +101,9 @@ void instance_ahnkahet::SetData(uint32 uiType, uint32 uiData)
  590. }
  591. break;
  592. case TYPE_JEDOGA:
  593. - case TYPE_AMANITAR:
  594. - m_auiEncounter[uiType] = uiData;
  595. - break;
  596. case TYPE_VOLAZJ:
  597. + case TYPE_AMANITAR:
  598. m_auiEncounter[uiType] = uiData;
  599. - if (uiData == IN_PROGRESS)
  600. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_VOLAZJ_ID);
  601. break;
  602.  
  603. default:
  604. diff --git a/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h b/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
  605. index 7d75103..b61e85c 100644
  606. --- a/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
  607. +++ b/scripts/northrend/azjol-nerub/azjol-nerub/azjol-nerub.h
  608. @@ -27,8 +27,6 @@ enum
  609. GO_DOOR_ANUBARAK_1 = 192396,
  610. GO_DOOR_ANUBARAK_2 = 192397,
  611. GO_DOOR_ANUBARAK_3 = 192398,
  612. -
  613. - ACHIEV_START_ANUB_ID = 20381,
  614. };
  615.  
  616. static const uint32 aWatchers[] = {NPC_GASHRA, NPC_NARJIL, NPC_SILTHIK};
  617. diff --git a/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp b/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
  618. index 80faf81..9bd8e67 100644
  619. --- a/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
  620. +++ b/scripts/northrend/azjol-nerub/azjol-nerub/instance_azjol-nerub.cpp
  621. @@ -177,8 +177,6 @@ void instance_azjol_nerub::SetData(uint32 uiType, uint32 uiData)
  622. DoUseDoorOrButton(GO_DOOR_ANUBARAK_1);
  623. DoUseDoorOrButton(GO_DOOR_ANUBARAK_2);
  624. DoUseDoorOrButton(GO_DOOR_ANUBARAK_3);
  625. - if (uiData == IN_PROGRESS)
  626. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_ANUB_ID);
  627. break;
  628. }
  629.  
  630. diff --git a/scripts/northrend/borean_tundra.cpp b/scripts/northrend/borean_tundra.cpp
  631. index 8d304d5..2c18ea9 100644
  632. --- a/scripts/northrend/borean_tundra.cpp
  633. +++ b/scripts/northrend/borean_tundra.cpp
  634. @@ -372,7 +372,7 @@ bool EffectDummyCreature_npc_oil_stained_wolf(Unit* pCaster, uint32 uiSpellId, S
  635. if (uiEffIndex == EFFECT_INDEX_0 && pCreatureTarget->getFaction() != FACTION_MONSTER && !pCreatureTarget->HasAura(SPELL_HAS_EATEN))
  636. {
  637. pCreatureTarget->SetFactionTemporary(FACTION_MONSTER);
  638. - pCreatureTarget->SetWalk(false);
  639. + pCreatureTarget->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  640.  
  641. pCreatureTarget->GetMotionMaster()->MoveIdle();
  642.  
  643. diff --git a/scripts/northrend/dragonblight.cpp b/scripts/northrend/dragonblight.cpp
  644. index a69dbc6..0bde6be 100644
  645. --- a/scripts/northrend/dragonblight.cpp
  646. +++ b/scripts/northrend/dragonblight.cpp
  647. @@ -101,7 +101,7 @@ bool GossipSelect_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* pCreature,
  648. if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
  649. {
  650. pPlayer->CLOSE_GOSSIP_MENU();
  651. - pPlayer->SendMovieStart(MOVIE_ID_GATES);
  652. +// pPlayer->SendMovieStart(MOVIE_ID_GATES);
  653. }
  654.  
  655. return true;
  656. diff --git a/scripts/northrend/howling_fjord.cpp b/scripts/northrend/howling_fjord.cpp
  657. index 1ffc6a0..a94cfb0 100644
  658. --- a/scripts/northrend/howling_fjord.cpp
  659. +++ b/scripts/northrend/howling_fjord.cpp
  660. @@ -192,7 +192,7 @@ struct MANGOS_DLL_DECL npc_daegarnAI : public ScriptedAI
  661. {
  662. if (pPlayer->isAlive())
  663. {
  664. - pSummon->SetWalk(false);
  665. + pSummon->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  666. pSummon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]);
  667. return;
  668. }
  669. diff --git a/scripts/northrend/naxxramas/boss_sapphiron.cpp b/scripts/northrend/naxxramas/boss_sapphiron.cpp
  670. index 021d87c..0aecf10 100644
  671. --- a/scripts/northrend/naxxramas/boss_sapphiron.cpp
  672. +++ b/scripts/northrend/naxxramas/boss_sapphiron.cpp
  673. @@ -25,6 +25,7 @@ EndScriptData */
  674. * Bugged spells: 28560 (needs maxTarget = 1, Summon of 16474 implementation, TODO, 30s duration)
  675. * 28526 (needs ScriptEffect to cast 28522 onto random target)
  676. *
  677. + * SetHover hackz must be replaced by proper opcodes 04D3(Liftoff) 04D4(Landing)
  678. * Achievement-criteria check needs implementation
  679. *
  680. * Frost-Breath ability: the dummy spell 30101 is self cast, so it won&#039;t take the needed delay of ~7s until it reaches its target
  681. @@ -115,7 +116,6 @@ struct MANGOS_DLL_DECL boss_sapphironAI : public ScriptedAI
  682. m_uiIceboltCount = 0;
  683.  
  684. SetCombatMovement(true);
  685. - m_creature->SetLevitate(false);
  686. //m_creature->ApplySpellMod(SPELL_FROST_AURA, SPELLMOD_DURATION, -1);
  687. }
  688.  
  689. @@ -154,7 +154,7 @@ struct MANGOS_DLL_DECL boss_sapphironAI : public ScriptedAI
  690. {
  691. DoScriptText(EMOTE_FLY, m_creature);
  692. m_creature->HandleEmote(EMOTE_ONESHOT_LIFTOFF);
  693. - m_creature->SetLevitate(true);
  694. + m_creature->SetHover(true);
  695. m_Phase = PHASE_AIR_BOLTS;
  696.  
  697. m_uiFrostBreathTimer = 5000;
  698. @@ -275,7 +275,7 @@ struct MANGOS_DLL_DECL boss_sapphironAI : public ScriptedAI
  699. // Begin Landing
  700. DoScriptText(EMOTE_GROUND, m_creature);
  701. m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
  702. - m_creature->SetLevitate(false);
  703. + m_creature->SetHover(false);
  704.  
  705. m_Phase = PHASE_LANDING;
  706. m_uiLandTimer = 2000;
  707. diff --git a/scripts/northrend/naxxramas/instance_naxxramas.cpp b/scripts/northrend/naxxramas/instance_naxxramas.cpp
  708. index 9743a74..cdeceee 100644
  709. --- a/scripts/northrend/naxxramas/instance_naxxramas.cpp
  710. +++ b/scripts/northrend/naxxramas/instance_naxxramas.cpp
  711. @@ -235,10 +235,7 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData)
  712. m_auiEncounter[uiType] = uiData;
  713. DoUseDoorOrButton(GO_ARAC_ANUB_DOOR);
  714. if (uiData == DONE)
  715. - {
  716. DoUseDoorOrButton(GO_ARAC_ANUB_GATE);
  717. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAEXXNA_ID);
  718. - }
  719. break;
  720. case TYPE_FAERLINA:
  721. DoUseDoorOrButton(GO_ARAC_FAER_WEB);
  722. @@ -340,8 +337,6 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData)
  723. break;
  724. case TYPE_PATCHWERK:
  725. m_auiEncounter[uiType] = uiData;
  726. - if (uiData == IN_PROGRESS)
  727. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_PATCHWERK_ID);
  728. if (uiData == DONE)
  729. DoUseDoorOrButton(GO_CONS_PATH_EXIT_DOOR);
  730. break;
  731. diff --git a/scripts/northrend/naxxramas/naxxramas.h b/scripts/northrend/naxxramas/naxxramas.h
  732. index c21f817..7f2876a 100644
  733. --- a/scripts/northrend/naxxramas/naxxramas.h
  734. +++ b/scripts/northrend/naxxramas/naxxramas.h
  735. @@ -174,10 +174,6 @@ enum
  736. ACHIEV_CRIT_UNDYING_MAEX = 13238,
  737. ACHIEV_CRIT_UNDYING_LOA = 13239,
  738. ACHIEV_CRIT_UNDYING_THAD = 13240,
  739. -
  740. - // Timed achievement criterias
  741. - ACHIEV_START_PATCHWERK_ID = 10286,
  742. - ACHIEV_START_MAEXXNA_ID = 9891,
  743. };
  744.  
  745. struct GothTrigger
  746. diff --git a/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
  747. index 822eb0d..c87ba58 100644
  748. --- a/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
  749. +++ b/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
  750. @@ -303,7 +303,8 @@ struct MANGOS_DLL_DECL boss_sartharionAI : public ScriptedAI
  751.  
  752. if (pTemp && pTemp->isAlive() && !pTemp->getVictim())
  753. {
  754. - pTemp->SetWalk(false);
  755. + if (pTemp->HasSplineFlag(SPLINEFLAG_WALKMODE))
  756. + pTemp->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  757.  
  758. if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
  759. pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
  760. diff --git a/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
  761. index 6a1ec03..185afe3 100644
  762. --- a/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
  763. +++ b/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
  764. @@ -329,7 +329,9 @@ bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, Spel
  765. if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
  766. pCaster->GetMotionMaster()->MovementExpired();
  767.  
  768. - pCaster->MonsterMoveWithSpeed(fX, fY, fZ, 28.f);
  769. + ((Creature*)pCaster)->GetMap()->CreatureRelocation((Creature*)pCaster, fX, fY, fZ, pCreatureTarget->GetOrientation());
  770. + ((Creature*)pCaster)->SendMonsterMove(fX, fY, fZ, SPLINETYPE_NORMAL, ((Creature*)pCaster)->GetSplineFlags(), 1);
  771. +
  772. pCreatureTarget->CastSpell(pCaster, SPELL_TEMPER_DUMMY, false);
  773.  
  774. //always return true when we are handling this spell and effect
  775. diff --git a/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h b/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
  776. index ba0fe82..60d6895 100644
  777. --- a/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
  778. +++ b/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
  779. @@ -22,9 +22,7 @@ enum
  780. GO_VOLKHAN_DOOR = 191325, //_doors07
  781. GO_IONAR_DOOR = 191326, //_doors05
  782. GO_LOKEN_DOOR = 191324, //_doors02
  783. - GO_LOKEN_THRONE = 192654,
  784. -
  785. - ACHIEV_START_LOKEN_ID = 20384,
  786. + GO_LOKEN_THRONE = 192654
  787. };
  788.  
  789. class MANGOS_DLL_DECL instance_halls_of_lightning : public ScriptedInstance
  790. diff --git a/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
  791. index 989eeb9..5c8269f 100644
  792. --- a/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
  793. +++ b/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
  794. @@ -95,8 +95,6 @@ void instance_halls_of_lightning::SetData(uint32 uiType, uint32 uiData)
  795. m_auiEncounter[uiType] = uiData;
  796. break;
  797. case TYPE_LOKEN:
  798. - if (uiData == IN_PROGRESS)
  799. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_LOKEN_ID);
  800. if (uiData == DONE)
  801. {
  802. DoUseDoorOrButton(GO_LOKEN_DOOR);
  803. diff --git a/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
  804. index 4c0623e..fa23604 100644
  805. --- a/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
  806. +++ b/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
  807. @@ -139,7 +139,7 @@ struct MANGOS_DLL_DECL boss_sjonnirAI : public ScriptedAI
  808. float fX, fY, fZ;
  809. pSummoned->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 10.0f, fX, fY, fZ);
  810.  
  811. - pSummoned->SetWalk(false);
  812. + pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  813. pSummoned->GetMotionMaster()->MovePoint(0, fX, fY, fZ);
  814. }
  815. else if (pSummoned->GetEntry() == NPC_EARTHEN_DWARF)
  816. diff --git a/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
  817. index e9c5af2..14ff4eb 100644
  818. --- a/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
  819. +++ b/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
  820. @@ -42,8 +42,6 @@ enum
  821. FACE_MARNAK = 0,
  822. FACE_ABEDNEUM = 1,
  823. FACE_KADDRAK = 2,
  824. -
  825. - ACHIEV_START_MAIDEN_ID = 20383,
  826. };
  827.  
  828. struct Face
  829. diff --git a/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
  830. index 5e52626..2930f00 100644
  831. --- a/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
  832. +++ b/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
  833. @@ -138,8 +138,6 @@ void instance_halls_of_stone::SetData(uint32 uiType, uint32 uiData)
  834. break;
  835. case TYPE_MAIDEN:
  836. m_auiEncounter[1] = uiData;
  837. - if (uiData == IN_PROGRESS)
  838. - DoStartTimedAchievement(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, ACHIEV_START_MAIDEN_ID);
  839. break;
  840. case TYPE_KRYSTALLUS:
  841. m_auiEncounter[2] = uiData;
  842. diff --git a/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
  843. index 1c54887..4f9b1f6 100644
  844. --- a/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
  845. +++ b/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
  846. @@ -128,7 +128,9 @@ struct MANGOS_DLL_DECL boss_svalaAI : public ScriptedAI
  847.  
  848. void Aggro(Unit* pWho)
  849. {
  850. - m_creature->SetLevitate(false);
  851. + if (m_creature->HasSplineFlag(SPLINEFLAG_FLYING))
  852. + m_creature->RemoveSplineFlag(SPLINEFLAG_FLYING);
  853. +
  854. DoScriptText(SAY_AGGRO, m_creature);
  855. }
  856.  
  857. @@ -182,8 +184,10 @@ struct MANGOS_DLL_DECL boss_svalaAI : public ScriptedAI
  858. float fX, fZ, fY;
  859. m_creature->GetRespawnCoord(fX, fY, fZ);
  860.  
  861. - m_creature->SetLevitate(true);
  862. - m_creature->GetMotionMaster()->MovePoint(0, fX, fY, fZ + 5.0f);
  863. + m_creature->AddSplineFlag(SPLINEFLAG_FLYING);
  864. +
  865. + m_creature->SendMonsterMoveWithSpeed(fX, fY, fZ + 5.0f, m_uiIntroTimer);
  866. + m_creature->GetMap()->CreatureRelocation(m_creature, fX, fY, fZ + 5.0f, m_creature->GetOrientation());
  867. }
  868.  
  869. void UpdateAI(const uint32 uiDiff)
  870. diff --git a/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
  871. index 1aae4d2..862938b 100644
  872. --- a/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
  873. +++ b/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
  874. @@ -107,10 +107,10 @@ struct MANGOS_DLL_DECL mob_stolen_soulAI : public ScriptedAI
  875. DoCastSpellIfCan(m_creature->getVictim(), SPELL_MOONFIRE);
  876. m_uiSpellTimer = 10000;
  877. break;
  878. - case CLASS_DEATH_KNIGHT:
  879. - DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
  880. - m_uiSpellTimer = 10000;
  881. - break;
  882. +// case CLASS_DEATH_KNIGHT:
  883. +// DoCastSpellIfCan(m_creature->getVictim(), SPELL_PLAGUE_STRIKE);
  884. +// m_uiSpellTimer = 10000;
  885. +// break;
  886. }
  887. }
  888. else
  889. diff --git a/scripts/outland/black_temple/boss_illidan.cpp b/scripts/outland/black_temple/boss_illidan.cpp
  890. index 02f8428..e3a34c4 100644
  891. --- a/scripts/outland/black_temple/boss_illidan.cpp
  892. +++ b/scripts/outland/black_temple/boss_illidan.cpp
  893. @@ -354,7 +354,7 @@ struct MANGOS_DLL_DECL demonfireAI : public ScriptedAI
  894. {
  895. m_illidanGuid = m_pInstance->GetGuid(NPC_ILLIDAN_STORMRAGE);
  896.  
  897. - if (!pIllidan->IsLevitating())
  898. + if (!pIllidan->HasSplineFlag(SPLINEFLAG_NO_SPLINE))
  899. m_creature->SetDeathState(JUST_DIED);
  900. }
  901. }
  902. @@ -494,7 +494,7 @@ struct MANGOS_DLL_DECL npc_akama_illidanAI : public ScriptedAI
  903. m_bIsReturningToIllidan = true;
  904. WayPoint = WayPointList.begin();
  905. m_creature->SetSpeedRate(MOVE_RUN, 2.0f);
  906. - m_creature->SetWalk(false);
  907. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  908. m_bIsWalking = true;
  909. }
  910.  
  911. @@ -681,7 +681,7 @@ struct MANGOS_DLL_DECL npc_akama_illidanAI : public ScriptedAI
  912. m_bIsWalking = true;
  913. WayPoint = WayPointList.begin();
  914. std::advance(WayPoint, 9);
  915. - m_creature->SetWalk(false);
  916. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  917. break;
  918. }
  919. }
  920. @@ -773,7 +773,7 @@ struct MANGOS_DLL_DECL npc_akama_illidanAI : public ScriptedAI
  921. }
  922.  
  923. WayPoint = WayPointList.begin();
  924. - m_creature->SetWalk(true);
  925. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  926. m_creature->GetMotionMaster()->MovePoint(WayPoint->id, WayPoint->x, WayPoint->y, WayPoint->z);
  927. m_bIsWalking = true;
  928. break;
  929. @@ -986,7 +986,7 @@ struct MANGOS_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
  930. // Unequip warglaives if needed
  931. SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
  932.  
  933. - m_creature->SetLevitate(false);
  934. + m_creature->RemoveSplineFlag(SPLINEFLAG_NO_SPLINE);
  935.  
  936. m_bIsTalking = false;
  937.  
  938. @@ -1284,7 +1284,7 @@ struct MANGOS_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
  939. m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
  940.  
  941. // We now hover!
  942. - m_creature->SetLevitate(true);
  943. + m_creature->AddSplineFlag(SPLINEFLAG_NO_SPLINE);
  944.  
  945. m_creature->GetMotionMaster()->MovePoint(0, CENTER_X, CENTER_Y, CENTER_Z);
  946. for(uint8 i = 0; i < 2; ++i)
  947. @@ -1753,7 +1753,7 @@ struct MANGOS_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
  948.  
  949. // anndddd touchdown!
  950. m_creature->HandleEmote(EMOTE_ONESHOT_LAND);
  951. - m_creature->SetLevitate(false);
  952. + m_creature->RemoveSplineFlag(SPLINEFLAG_NO_SPLINE);
  953. m_uiPhase = PHASE_NORMAL_2;
  954.  
  955. // We should let the raid fight us =)
  956. diff --git a/scripts/outland/black_temple/boss_shade_of_akama.cpp b/scripts/outland/black_temple/boss_shade_of_akama.cpp
  957. index 818bff8..b566f82 100644
  958. --- a/scripts/outland/black_temple/boss_shade_of_akama.cpp
  959. +++ b/scripts/outland/black_temple/boss_shade_of_akama.cpp
  960. @@ -206,7 +206,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
  961. m_afSpawnLoc[uiRand].m_fX, m_afSpawnLoc[uiRand].m_fY, m_afSpawnLoc[uiRand].m_fZ, m_afSpawnLoc[uiRand].m_fO,
  962. TEMPSUMMON_DEAD_DESPAWN, 0))
  963. {
  964. - pSorcerer->SetWalk(false);
  965. + pSorcerer->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  966. pSorcerer->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
  967. pSorcerer->SetTargetGuid(m_creature->GetObjectGuid());
  968.  
  969. @@ -226,7 +226,7 @@ struct MANGOS_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
  970. m_afSpawnLoc[uiRand].m_fX, m_afSpawnLoc[uiRand].m_fY, m_afSpawnLoc[uiRand].m_fZ, m_afSpawnLoc[uiRand].m_fO,
  971. TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000))
  972. {
  973. - pSpawn->SetWalk(false);
  974. + pSpawn->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  975. pSpawn->GetMotionMaster()->MovePoint(0, LOC_RAND_TO_CENTER_X, LOC_RAND_TO_CENTER_Y, LOC_RAND_TO_CENTER_Z);
  976. }
  977. }
  978. @@ -553,7 +553,7 @@ struct MANGOS_DLL_DECL npc_akamaAI : public ScriptedAI
  979. {
  980. m_bIsShadeDead = true;
  981. m_uiWayPointId = 0;
  982. - m_creature->SetWalk(true);
  983. + m_creature->AddSplineFlag(SPLINEFLAG_WALKMODE);
  984. m_creature->GetMotionMaster()->MovePoint(m_uiWayPointId, m_afAkamaWP[0].m_fX, m_afAkamaWP[0].m_fY, m_afAkamaWP[0].m_fZ);
  985. }
  986. }
  987. diff --git a/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
  988. index c7a76e9..e6028ca 100644
  989. --- a/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
  990. +++ b/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
  991. @@ -191,7 +191,7 @@ void instance_blood_furnace::DoNextBroggokEventPhase()
  992.  
  993. if (Creature* pBroggok = GetSingleCreatureFromStorage(NPC_BROGGOK))
  994. {
  995. - pBroggok->SetWalk(false);
  996. + pBroggok->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  997. pBroggok->GetMotionMaster()->MovePoint(0, dx, dy, pBroggok->GetPositionZ());
  998. }
  999. }
  1000. @@ -212,7 +212,7 @@ void instance_blood_furnace::DoNextBroggokEventPhase()
  1001. pOrc->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
  1002.  
  1003. // Move them out of the cages
  1004. - pOrc->SetWalk(false);
  1005. + pOrc->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  1006. pOrc->GetMotionMaster()->MovePoint(0, pOrc->GetPositionX() + dx, pOrc->GetPositionY() + dy, pOrc->GetPositionZ());
  1007. }
  1008. }
  1009. diff --git a/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp b/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp
  1010. index 4b3c86b..5014a77 100644
  1011. --- a/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp
  1012. +++ b/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_nazan_and_vazruden.cpp
  1013. @@ -120,8 +120,11 @@ struct MANGOS_DLL_DECL boss_vazrudenAI : public ScriptedAI
  1014. {
  1015. if (Creature* pHerald = m_pInstance->GetSingleCreatureFromStorage(NPC_VAZRUDEN_HERALD))
  1016. {
  1017. - pHerald->SetWalk(false);
  1018. + if (pHerald->HasSplineFlag(SPLINEFLAG_WALKMODE))
  1019. + pHerald->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  1020. +
  1021. pHerald->GetMotionMaster()->MovePoint(POINT_ID_COMBAT, afCombatPos[0], afCombatPos[1], afCombatPos[2]);
  1022. +
  1023. DoScriptText(EMOTE_DESCEND, pHerald);
  1024. }
  1025. }
  1026. @@ -201,7 +204,7 @@ struct MANGOS_DLL_DECL boss_vazruden_heraldAI : public ScriptedAI
  1027. // see boss_onyxia
  1028. // sort of a hack, it is unclear how this really work but the values appear to be valid
  1029. m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_UNK_2);
  1030. - m_creature->SetLevitate(true);
  1031. + m_creature->AddSplineFlag(SPLINEFLAG_FLYING);
  1032. }
  1033.  
  1034. void MoveInLineOfSight(Unit* pWho)
  1035. @@ -251,7 +254,7 @@ struct MANGOS_DLL_DECL boss_vazruden_heraldAI : public ScriptedAI
  1036. // Landing
  1037. // undo flying
  1038. m_creature->SetByteValue(UNIT_FIELD_BYTES_1, 3, 0);
  1039. - m_creature->SetLevitate(false);
  1040. + m_creature->RemoveSplineFlag(SPLINEFLAG_FLYING);
  1041.  
  1042. Player* pPlayer = m_creature->GetMap()->GetPlayer(m_lastSeenPlayerGuid);
  1043. if (pPlayer && pPlayer->isAlive())
  1044. diff --git a/scripts/outland/nagrand.cpp b/scripts/outland/nagrand.cpp
  1045. index 17377e2..a567b1c 100644
  1046. --- a/scripts/outland/nagrand.cpp
  1047. +++ b/scripts/outland/nagrand.cpp
  1048. @@ -515,7 +515,7 @@ struct MANGOS_DLL_DECL npc_maghar_captiveAI : public npc_escortAI
  1049. if (pSummoned->IsTotem())
  1050. return;
  1051.  
  1052. - pSummoned->SetWalk(false);
  1053. + pSummoned->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  1054. pSummoned->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ());
  1055. }
  1056.  
  1057. diff --git a/scripts/outland/shadowmoon_valley.cpp b/scripts/outland/shadowmoon_valley.cpp
  1058. index 5a08630..95d350a 100644
  1059. --- a/scripts/outland/shadowmoon_valley.cpp
  1060. +++ b/scripts/outland/shadowmoon_valley.cpp
  1061. @@ -386,7 +386,7 @@ struct MANGOS_DLL_DECL npc_dragonmaw_peonAI : public ScriptedAI
  1062. float fX, fY, fZ;
  1063. pMutton->GetContactPoint(m_creature, fX, fY, fZ, CONTACT_DISTANCE);
  1064.  
  1065. - m_creature->SetWalk(false);
  1066. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  1067. m_creature->GetMotionMaster()->MovePoint(POINT_DEST, fX, fY, fZ);
  1068. }
  1069. }
  1070. diff --git a/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
  1071. index cfe1a17..a9387bd 100644
  1072. --- a/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
  1073. +++ b/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
  1074. @@ -931,7 +931,9 @@ struct MANGOS_DLL_DECL boss_kaelthasAI : public ScriptedAI
  1075. m_creature->StopMoving();
  1076. m_creature->GetMotionMaster()->Clear();
  1077. m_creature->GetMotionMaster()->MoveIdle();
  1078. - m_creature->MonsterMoveWithSpeed(afGravityPos[0], afGravityPos[1], afGravityPos[2], 28.f);
  1079. +
  1080. + m_creature->GetMap()->CreatureRelocation(m_creature, afGravityPos[0], afGravityPos[1], afGravityPos[2], 0.0f);
  1081. + m_creature->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], SPLINETYPE_NORMAL, SPLINEFLAG_NONE, 1);
  1082.  
  1083. // 1) Kael&#039;thas will portal the whole raid right into his body
  1084. std::vector<ObjectGuid> vGuids;
  1085. diff --git a/scripts/world/item_scripts.cpp b/scripts/world/item_scripts.cpp
  1086. index 4474aa7..8a70bbc 100644
  1087. --- a/scripts/world/item_scripts.cpp
  1088. +++ b/scripts/world/item_scripts.cpp
  1089. @@ -47,7 +47,7 @@ bool ItemUse_item_arcane_charges(Player* pPlayer, Item* pItem, const SpellCastTa
  1090. pPlayer->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
  1091.  
  1092. if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
  1093. - Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
  1094. + Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_ERROR);
  1095.  
  1096. return true;
  1097. }
  1098. diff --git a/scripts/world/npcs_special.cpp b/scripts/world/npcs_special.cpp
  1099. index 31a85d3..bfeb13e 100644
  1100. --- a/scripts/world/npcs_special.cpp
  1101. +++ b/scripts/world/npcs_special.cpp
  1102. @@ -583,7 +583,7 @@ struct MANGOS_DLL_DECL npc_injured_patientAI : public ScriptedAI
  1103. case 2: DoScriptText(SAY_DOC3,m_creature); break;
  1104. }
  1105.  
  1106. - m_creature->SetWalk(false);
  1107. + m_creature->RemoveSplineFlag(SPLINEFLAG_WALKMODE);
  1108.  
  1109. uint32 mobId = m_creature->GetEntry();
  1110.  
  1111. diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
  1112. index 454a6d1..1a9aa39 100644
  1113. --- a/sql/scriptdev2_script_full.sql
  1114. +++ b/sql/scriptdev2_script_full.sql
  1115. @@ -3,7 +3,7 @@
  1116. --
  1117.  
  1118. DELETE FROM sd2_db_version;
  1119. -INSERT INTO sd2_db_version (version) VALUES (&#039;ScriptDev2 (for MaNGOS 11720+) &#039;);
  1120. +INSERT INTO sd2_db_version (version) VALUES (&#039;ScriptDev2 (for MaNGOS 11590+) &#039;);
  1121.  
  1122. --
  1123. -- Below contains data for table `script_texts` mainly used in C++ parts.
  1124. diff --git a/sql/updates/r2239_scriptdev2.sql b/sql/updates/r2239_scriptdev2.sql
  1125. deleted file mode 100644
  1126. index e24c053..0000000
  1127. --- a/sql/updates/r2239_scriptdev2.sql
  1128. +++ /dev/null
  1129. @@ -1 +0,0 @@
  1130. -UPDATE sd2_db_version SET version=&#039;ScriptDev2 (for MaNGOS 11720+) &#039;;
  1131. diff --git a/system/ScriptLoader.cpp b/system/ScriptLoader.cpp
  1132. index 0959568..02a269f 100644
  1133. --- a/system/ScriptLoader.cpp
  1134. +++ b/system/ScriptLoader.cpp
  1135. @@ -98,7 +98,22 @@ extern void AddSC_boss_majordomo();
  1136. extern void AddSC_boss_ragnaros();
  1137. extern void AddSC_instance_molten_core();
  1138. extern void AddSC_molten_core();
  1139. -extern void AddSC_ebon_hold(); // scarlet_enclave
  1140. +extern void AddSC_boss_anubrekhan(); // naxxramas
  1141. +extern void AddSC_boss_four_horsemen();
  1142. +extern void AddSC_boss_faerlina();
  1143. +extern void AddSC_boss_gluth();
  1144. +extern void AddSC_boss_gothik();
  1145. +extern void AddSC_boss_grobbulus();
  1146. +extern void AddSC_boss_kelthuzad();
  1147. +extern void AddSC_boss_loatheb();
  1148. +extern void AddSC_boss_maexxna();
  1149. +extern void AddSC_boss_noth();
  1150. +extern void AddSC_boss_heigan();
  1151. +extern void AddSC_boss_patchwerk();
  1152. +extern void AddSC_boss_razuvious();
  1153. +extern void AddSC_boss_sapphiron();
  1154. +extern void AddSC_boss_thaddius();
  1155. +extern void AddSC_instance_naxxramas();
  1156. extern void AddSC_boss_arcanist_doan(); // scarlet_monastery
  1157. extern void AddSC_boss_azshir_the_sleepless();
  1158. extern void AddSC_boss_bloodmage_thalnos();
  1159. @@ -210,8 +225,6 @@ extern void AddSC_boss_epoch_hunter();
  1160. extern void AddSC_boss_lieutenant_drake();
  1161. extern void AddSC_instance_old_hillsbrad();
  1162. extern void AddSC_old_hillsbrad();
  1163. -extern void AddSC_culling_of_stratholme(); // COT, culling_of_stratholme
  1164. -extern void AddSC_instance_culling_of_stratholme();
  1165. extern void AddSC_dire_maul(); // dire_maul
  1166. extern void AddSC_instance_dire_maul();
  1167. extern void AddSC_boss_celebras_the_cursed(); // maraudon
  1168. @@ -269,144 +282,7 @@ extern void AddSC_ungoro_crater();
  1169. extern void AddSC_winterspring();
  1170.  
  1171. // northrend
  1172. -extern void AddSC_boss_jedoga(); // azjol-nerub, ahnkahet
  1173. -extern void AddSC_boss_nadox();
  1174. -extern void AddSC_boss_taldaram();
  1175. -extern void AddSC_boss_volazj();
  1176. -extern void AddSC_instance_ahnkahet();
  1177. -extern void AddSC_boss_anubarak(); // azjol-nerub, azjol-nerub
  1178. -extern void AddSC_boss_hadronox();
  1179. -extern void AddSC_boss_krikthir();
  1180. -extern void AddSC_instance_azjol_nerub();
  1181. -extern void AddSC_trial_of_the_champion(); // CC, trial_of_the_champion
  1182. -extern void AddSC_boss_grand_champions();
  1183. -extern void AddSC_instance_trial_of_the_champion();
  1184. -extern void AddSC_boss_anubarak_trial(); // CC, trial_of_the_crusader
  1185. -extern void AddSC_boss_faction_champions();
  1186. -extern void AddSC_boss_jaraxxus();
  1187. -extern void AddSC_instance_trial_of_the_crusader();
  1188. -extern void AddSC_northrend_beasts();
  1189. -extern void AddSC_trial_of_the_crusader();
  1190. -extern void AddSC_twin_valkyr();
  1191. -extern void AddSC_boss_novos(); // draktharon_keep
  1192. -extern void AddSC_boss_tharonja();
  1193. -extern void AddSC_boss_trollgore();
  1194. -extern void AddSC_instance_draktharon_keep();
  1195. -extern void AddSC_boss_colossus(); // gundrak
  1196. -extern void AddSC_boss_eck();
  1197. -extern void AddSC_boss_galdarah();
  1198. -extern void AddSC_boss_moorabi();
  1199. -extern void AddSC_boss_sladran();
  1200. -extern void AddSC_instance_gundrak();
  1201. -extern void AddSC_boss_bronjahm(); // ICC, forge_of_souls
  1202. -extern void AddSC_boss_devourer_of_souls();
  1203. -extern void AddSC_instance_forge_of_souls();
  1204. -extern void AddSC_boss_falric(); // ICC, halls_of_reflection
  1205. -extern void AddSC_boss_lich_king();
  1206. -extern void AddSC_boss_marwyn();
  1207. -extern void AddSC_halls_of_reflection();
  1208. -extern void AddSC_instance_halls_of_reflection();
  1209. -extern void AddSC_boss_garfrost(); // ICC, pit_of_saron
  1210. -extern void AddSC_boss_krick_and_ick();
  1211. -extern void AddSC_boss_tyrannus();
  1212. -extern void AddSC_instance_pit_of_saron();
  1213. -extern void AddSC_pit_of_saron();
  1214. -extern void AddSC_blood_prince_council(); // ICC, icecrown_citadel
  1215. -extern void AddSC_boss_blood_queen_lanathel();
  1216. -extern void AddSC_boss_deathbringer_saurfang();
  1217. -extern void AddSC_boss_festergut();
  1218. -extern void AddSC_boss_lady_deathwhisper();
  1219. -extern void AddSC_boss_lord_marrowgar();
  1220. -extern void AddSC_boss_professor_putricide();
  1221. -extern void AddSC_boss_rotface();
  1222. -extern void AddSC_boss_sindragosa();
  1223. -extern void AddSC_boss_the_lich_king();
  1224. -extern void AddSC_boss_valithria_dreamwalker();
  1225. -extern void AddSC_gunship_battle();
  1226. -extern void AddSC_instance_icecrown_citadel();
  1227. -extern void AddSC_boss_anubrekhan(); // naxxramas
  1228. -extern void AddSC_boss_four_horsemen();
  1229. -extern void AddSC_boss_faerlina();
  1230. -extern void AddSC_boss_gluth();
  1231. -extern void AddSC_boss_gothik();
  1232. -extern void AddSC_boss_grobbulus();
  1233. -extern void AddSC_boss_kelthuzad();
  1234. -extern void AddSC_boss_loatheb();
  1235. -extern void AddSC_boss_maexxna();
  1236. -extern void AddSC_boss_noth();
  1237. -extern void AddSC_boss_heigan();
  1238. -extern void AddSC_boss_patchwerk();
  1239. -extern void AddSC_boss_razuvious();
  1240. -extern void AddSC_boss_sapphiron();
  1241. -extern void AddSC_boss_thaddius();
  1242. -extern void AddSC_instance_naxxramas();
  1243. -extern void AddSC_boss_malygos(); // nexus, eye_of_eternity
  1244. -extern void AddSC_boss_anomalus(); // nexus, nexus
  1245. -extern void AddSC_boss_keristrasza();
  1246. -extern void AddSC_boss_ormorok();
  1247. -extern void AddSC_boss_telestra();
  1248. -extern void AddSC_instance_nexus();
  1249. -extern void AddSC_boss_sartharion(); // obsidian_sanctum
  1250. -extern void AddSC_instance_obsidian_sanctum();
  1251. -extern void AddSC_boss_baltharus(); // ruby_sanctum
  1252. -extern void AddSC_boss_halion();
  1253. -extern void AddSC_boss_saviana();
  1254. -extern void AddSC_boss_zarithrian();
  1255. -extern void AddSC_instance_ruby_sanctum();
  1256. -extern void AddSC_boss_bjarngrim(); // ulduar, halls_of_lightning
  1257. -extern void AddSC_boss_ionar();
  1258. -extern void AddSC_boss_loken();
  1259. -extern void AddSC_boss_volkhan();
  1260. -extern void AddSC_instance_halls_of_lightning();
  1261. -extern void AddSC_boss_maiden_of_grief(); // ulduar, halls_of_stone
  1262. -extern void AddSC_boss_sjonnir();
  1263. -extern void AddSC_halls_of_stone();
  1264. -extern void AddSC_instance_halls_of_stone();
  1265. -extern void AddSC_boss_assembly_of_iron(); // ulduar, ulduar
  1266. -extern void AddSC_boss_algalon();
  1267. -extern void AddSC_boss_auriaya();
  1268. -extern void AddSC_boss_flame_leviathan();
  1269. -extern void AddSC_boss_freya();
  1270. -extern void AddSC_boss_general_vezax();
  1271. -extern void AddSC_boss_hodir();
  1272. -extern void AddSC_boss_ignis();
  1273. -extern void AddSC_boss_kologarn();
  1274. -extern void AddSC_boss_mimiron();
  1275. -extern void AddSC_boss_razorscale();
  1276. -extern void AddSC_boss_thorim();
  1277. -extern void AddSC_boss_xt_002();
  1278. -extern void AddSC_boss_yogg_saron();
  1279. -extern void AddSC_instance_ulduar();
  1280. -extern void AddSC_ulduar();
  1281. -extern void AddSC_boss_ingvar(); // utgarde_keep, utgarde_keep
  1282. -extern void AddSC_boss_keleseth();
  1283. -extern void AddSC_boss_skarvald_and_dalronn();
  1284. -extern void AddSC_instance_utgarde_keep();
  1285. -extern void AddSC_utgarde_keep();
  1286. -extern void AddSC_boss_gortok(); // utgarde_keep, utgarde_pinnacle
  1287. -extern void AddSC_boss_skadi();
  1288. -extern void AddSC_boss_svala();
  1289. -extern void AddSC_boss_ymiron();
  1290. -extern void AddSC_instance_pinnacle();
  1291. -extern void AddSC_boss_archavon(); // vault_of_archavon
  1292. -extern void AddSC_boss_emalon();
  1293. -extern void AddSC_boss_koralon();
  1294. -extern void AddSC_boss_toravon();
  1295. -extern void AddSC_instance_vault_of_archavon();
  1296. -extern void AddSC_boss_erekem(); // violet_hold
  1297. -extern void AddSC_boss_ichoron();
  1298. -extern void AddSC_instance_violet_hold();
  1299. -extern void AddSC_violet_hold();
  1300. -
  1301. -extern void AddSC_borean_tundra();
  1302. -extern void AddSC_dalaran();
  1303. -extern void AddSC_dragonblight();
  1304. -extern void AddSC_grizzly_hills();
  1305. -extern void AddSC_howling_fjord();
  1306. -extern void AddSC_icecrown();
  1307. -extern void AddSC_sholazar_basin();
  1308. -extern void AddSC_storm_peaks();
  1309. -extern void AddSC_zuldrak();
  1310. +// removed
  1311.  
  1312. // outland
  1313. extern void AddSC_boss_exarch_maladaar(); // auchindoun, auchenai_crypts
  1314. @@ -587,7 +463,22 @@ void AddScripts()
  1315. AddSC_boss_ragnaros();
  1316. AddSC_instance_molten_core();
  1317. AddSC_molten_core();
  1318. - AddSC_ebon_hold(); // scarlet_enclave
  1319. + AddSC_boss_anubrekhan(); // naxxramas
  1320. + AddSC_boss_four_horsemen();
  1321. + AddSC_boss_faerlina();
  1322. + AddSC_boss_gluth();
  1323. + AddSC_boss_gothik();
  1324. + AddSC_boss_grobbulus();
  1325. + AddSC_boss_kelthuzad();
  1326. + AddSC_boss_loatheb();
  1327. + AddSC_boss_maexxna();
  1328. + AddSC_boss_noth();
  1329. + AddSC_boss_heigan();
  1330. + AddSC_boss_patchwerk();
  1331. + AddSC_boss_razuvious();
  1332. + AddSC_boss_sapphiron();
  1333. + AddSC_boss_thaddius();
  1334. + AddSC_instance_naxxramas();
  1335. AddSC_boss_arcanist_doan(); // scarlet_monastery
  1336. AddSC_boss_azshir_the_sleepless();
  1337. AddSC_boss_bloodmage_thalnos();
  1338. @@ -699,8 +590,6 @@ void AddScripts()
  1339. AddSC_boss_lieutenant_drake();
  1340. AddSC_instance_old_hillsbrad();
  1341. AddSC_old_hillsbrad();
  1342. - AddSC_culling_of_stratholme(); // CoT, culling_of_stratholme
  1343. - AddSC_instance_culling_of_stratholme();
  1344. AddSC_dire_maul(); // dire_maul
  1345. AddSC_instance_dire_maul();
  1346. AddSC_boss_celebras_the_cursed(); // maraudon
  1347. @@ -758,144 +647,7 @@ void AddScripts()
  1348. AddSC_winterspring();
  1349.  
  1350. // northrend
  1351. - AddSC_boss_jedoga(); // azjol-nerub, ahnkahet
  1352. - AddSC_boss_nadox();
  1353. - AddSC_boss_taldaram();
  1354. - AddSC_boss_volazj();
  1355. - AddSC_instance_ahnkahet();
  1356. - AddSC_boss_anubarak(); // azjol-nerub, azjol-nerub
  1357. - AddSC_boss_hadronox();
  1358. - AddSC_boss_krikthir();
  1359. - AddSC_instance_azjol_nerub();
  1360. - AddSC_boss_grand_champions(); // CC, trial_of_the_champion
  1361. - AddSC_instance_trial_of_the_champion();
  1362. - AddSC_trial_of_the_champion();
  1363. - AddSC_boss_anubarak_trial(); // CC, trial_of_the_crusader
  1364. - AddSC_boss_faction_champions();
  1365. - AddSC_boss_jaraxxus();
  1366. - AddSC_instance_trial_of_the_crusader();
  1367. - AddSC_northrend_beasts();
  1368. - AddSC_trial_of_the_crusader();
  1369. - AddSC_twin_valkyr();
  1370. - AddSC_boss_novos(); // draktharon_keep
  1371. - AddSC_boss_tharonja();
  1372. - AddSC_boss_trollgore();
  1373. - AddSC_instance_draktharon_keep();
  1374. - AddSC_boss_colossus(); // gundrak
  1375. - AddSC_boss_eck();
  1376. - AddSC_boss_galdarah();
  1377. - AddSC_boss_moorabi();
  1378. - AddSC_boss_sladran();
  1379. - AddSC_instance_gundrak();
  1380. - AddSC_boss_bronjahm(); // ICC, FH, forge_of_souls
  1381. - AddSC_boss_devourer_of_souls();
  1382. - AddSC_instance_forge_of_souls();
  1383. - AddSC_boss_falric(); // ICC, FH, halls_of_reflection
  1384. - AddSC_boss_lich_king();
  1385. - AddSC_boss_marwyn();
  1386. - AddSC_halls_of_reflection();
  1387. - AddSC_instance_halls_of_reflection();
  1388. - AddSC_boss_garfrost(); // ICC, FH, pit_of_saron
  1389. - AddSC_boss_krick_and_ick();
  1390. - AddSC_boss_tyrannus();
  1391. - AddSC_instance_pit_of_saron();
  1392. - AddSC_pit_of_saron();
  1393. - AddSC_blood_prince_council(); // ICC, icecrown_citadel
  1394. - AddSC_boss_blood_queen_lanathel();
  1395. - AddSC_boss_deathbringer_saurfang();
  1396. - AddSC_boss_festergut();
  1397. - AddSC_boss_lady_deathwhisper();
  1398. - AddSC_boss_lord_marrowgar();
  1399. - AddSC_boss_professor_putricide();
  1400. - AddSC_boss_rotface();
  1401. - AddSC_boss_sindragosa();
  1402. - AddSC_boss_the_lich_king();
  1403. - AddSC_boss_valithria_dreamwalker();
  1404. - AddSC_gunship_battle();
  1405. - AddSC_instance_icecrown_citadel();
  1406. - AddSC_boss_anubrekhan(); // naxxramas
  1407. - AddSC_boss_four_horsemen();
  1408. - AddSC_boss_faerlina();
  1409. - AddSC_boss_gluth();
  1410. - AddSC_boss_gothik();
  1411. - AddSC_boss_grobbulus();
  1412. - AddSC_boss_kelthuzad();
  1413. - AddSC_boss_loatheb();
  1414. - AddSC_boss_maexxna();
  1415. - AddSC_boss_noth();
  1416. - AddSC_boss_heigan();
  1417. - AddSC_boss_patchwerk();
  1418. - AddSC_boss_razuvious();
  1419. - AddSC_boss_sapphiron();
  1420. - AddSC_boss_thaddius();
  1421. - AddSC_instance_naxxramas();
  1422. - AddSC_boss_malygos(); // nexus, eye_of_eternity
  1423. - AddSC_boss_anomalus(); // nexus, nexus
  1424. - AddSC_boss_keristrasza();
  1425. - AddSC_boss_ormorok();
  1426. - AddSC_boss_telestra();
  1427. - AddSC_instance_nexus();
  1428. - AddSC_boss_sartharion(); // obsidian_sanctum
  1429. - AddSC_instance_obsidian_sanctum();
  1430. - AddSC_boss_baltharus(); // ruby_sanctum
  1431. - AddSC_boss_halion();
  1432. - AddSC_boss_saviana();
  1433. - AddSC_boss_zarithrian();
  1434. - AddSC_instance_ruby_sanctum();
  1435. - AddSC_boss_bjarngrim(); // ulduar, halls_of_lightning
  1436. - AddSC_boss_ionar();
  1437. - AddSC_boss_loken();
  1438. - AddSC_boss_volkhan();
  1439. - AddSC_instance_halls_of_lightning();
  1440. - AddSC_boss_maiden_of_grief(); // ulduar, halls_of_stone
  1441. - AddSC_boss_sjonnir();
  1442. - AddSC_halls_of_stone();
  1443. - AddSC_instance_halls_of_stone();
  1444. - AddSC_boss_assembly_of_iron(); // ulduar, ulduar
  1445. - AddSC_boss_algalon();
  1446. - AddSC_boss_auriaya();
  1447. - AddSC_boss_flame_leviathan();
  1448. - AddSC_boss_freya();
  1449. - AddSC_boss_general_vezax();
  1450. - AddSC_boss_hodir();
  1451. - AddSC_boss_ignis();
  1452. - AddSC_boss_kologarn();
  1453. - AddSC_boss_mimiron();
  1454. - AddSC_boss_razorscale();
  1455. - AddSC_boss_thorim();
  1456. - AddSC_boss_xt_002();
  1457. - AddSC_boss_yogg_saron();
  1458. - AddSC_instance_ulduar();
  1459. - AddSC_ulduar();
  1460. - AddSC_boss_ingvar(); // UK, utgarde_keep
  1461. - AddSC_boss_keleseth();
  1462. - AddSC_boss_skarvald_and_dalronn();
  1463. - AddSC_instance_utgarde_keep();
  1464. - AddSC_utgarde_keep();
  1465. - AddSC_boss_gortok(); // UK, utgarde_pinnacle
  1466. - AddSC_boss_skadi();
  1467. - AddSC_boss_svala();
  1468. - AddSC_boss_ymiron();
  1469. - AddSC_instance_pinnacle();
  1470. - AddSC_boss_archavon(); // vault_of_archavon
  1471. - AddSC_boss_emalon();
  1472. - AddSC_boss_koralon();
  1473. - AddSC_boss_toravon();
  1474. - AddSC_instance_vault_of_archavon();
  1475. - AddSC_boss_erekem(); // violet_hold
  1476. - AddSC_boss_ichoron();
  1477. - AddSC_instance_violet_hold();
  1478. - AddSC_violet_hold();
  1479. -
  1480. - AddSC_borean_tundra();
  1481. - AddSC_dalaran();
  1482. - AddSC_dragonblight();
  1483. - AddSC_grizzly_hills();
  1484. - AddSC_howling_fjord();
  1485. - AddSC_icecrown();
  1486. - AddSC_sholazar_basin();
  1487. - AddSC_storm_peaks();
  1488. - AddSC_zuldrak();
  1489. + // removed
  1490.  
  1491. // outland
  1492. AddSC_boss_exarch_maladaar(); // auchindoun, auchenai_crypts
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!