1. diff --git a/sql/updates/2018_01_16_00_world.sql b/sql/updates/2018_01_16_00_world.sql
  2. new file mode 100644
  3. index 00000000..34b274f1
  4. --- /dev/null
  5. +++ b/sql/updates/2018_01_16_00_world.sql
  6. @@ -0,0 +1,2 @@
  7. +-- add scripts Orb Naxxramas
  8. +UPDATE `gameobject_template` SET `data10` = 0, `ScriptName` = 'go_naxx_orb' WHERE `entry` = 202278;
  9. \ No newline at end of file
  10. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
  11. index cd43f59c..f1c4f512 100644
  12. --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
  13. +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
  14. @@ -62,9 +62,9 @@ public:
  15. return new boss_anubrekhanAI (pCreature);
  16. }
  18. - struct boss_anubrekhanAI : public ScriptedAI
  19. + struct boss_anubrekhanAI : public BossAI
  20. {
  21. - boss_anubrekhanAI(Creature *c) : ScriptedAI(c), summons(me)
  22. + boss_anubrekhanAI(Creature *c) : BossAI(c, BOSS_ANUB), summons(me)
  23. {
  24. pInstance = c->GetInstanceScript();
  25. sayGreet = false;
  26. @@ -84,15 +84,15 @@ public:
  27. }
  28. }
  30. - void Reset()
  31. + void Reset()
  32. {
  33. + BossAI::Reset();
  34. events.Reset();
  35. summons.DespawnAll();
  36. SummonCryptGuards();
  38. if (pInstance)
  39. {
  40. - pInstance->SetData(EVENT_ANUB, NOT_STARTED);
  41. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_ANUB_GATE)))
  42. go->SetGoState(GO_STATE_ACTIVE);
  43. }
  44. @@ -120,13 +120,13 @@ public:
  46. void SummonedCreatureDespawn(Creature* cr) { summons.Despawn(cr); }
  48. - void JustDied(Unit* Killer)
  49. + void JustDied(Unit* killer)
  50. {
  51. + BossAI::JustDied(killer);
  52. summons.DespawnAll();
  53. if (pInstance)
  54. {
  55. pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
  56. - pInstance->SetData(EVENT_ANUB, DONE);
  57. }
  58. }
  60. @@ -147,11 +147,11 @@ public:
  62. void EnterCombat(Unit *who)
  63. {
  64. + BossAI::EnterCombat(who);
  65. me->CallForHelp(30.0f); // catch helpers
  66. Talk(SAY_AGGRO);
  67. if (pInstance)
  68. {
  69. - pInstance->SetData(EVENT_ANUB, IN_PROGRESS);
  70. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_ANUB_GATE)))
  71. go->SetGoState(GO_STATE_READY);
  72. }
  73. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
  74. index fcb1de43..08979b91 100644
  75. --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
  76. +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
  77. @@ -66,9 +66,9 @@ public:
  78. return new boss_faerlinaAI (pCreature);
  79. }
  81. - struct boss_faerlinaAI : public ScriptedAI
  82. + struct boss_faerlinaAI : public BossAI
  83. {
  84. - boss_faerlinaAI(Creature *c) : ScriptedAI(c), summons(me)
  85. + boss_faerlinaAI(Creature *c) : BossAI(c, BOSS_FAERLINA), summons(me)
  86. {
  87. pInstance = me->GetInstanceScript();
  88. sayGreet = false;
  89. @@ -98,24 +98,21 @@ public:
  91. void Reset()
  92. {
  93. + BossAI::Reset();
  94. events.Reset();
  95. summons.DespawnAll();
  96. SummonHelpers();
  97. - if (pInstance)
  98. - pInstance->SetData(EVENT_FAERLINA, NOT_STARTED);
  99. }
  101. void EnterCombat(Unit *who)
  102. {
  103. + BossAI::EnterCombat(who);
  104. me->SetInCombatWithZone();
  105. Talk(SAY_AGGRO);
  106. events.ScheduleEvent(EVENT_SPELL_POISON_BOLT, urand(12000,15000));
  107. events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, urand(6000,18000));
  108. events.ScheduleEvent(EVENT_SPELL_FRENZY, urand(60000,80000), 1);
  109. events.SetPhase(1);
  110. -
  111. - if (pInstance)
  112. - pInstance->SetData(EVENT_FAERLINA, IN_PROGRESS);
  113. }
  115. void MoveInLineOfSight(Unit *who)
  116. @@ -141,11 +138,10 @@ public:
  117. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  118. }
  120. - void JustDied(Unit* Killer)
  121. + void JustDied(Unit* killer)
  122. {
  123. + BossAI::JustDied(killer);
  124. Talk(SAY_DEATH);
  125. - if (pInstance)
  126. - pInstance->SetData(EVENT_FAERLINA, DONE);
  127. }
  129. void UpdateAI(uint32 diff)
  130. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
  131. index 0163c70b..46b37663 100644
  132. --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
  133. +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
  134. @@ -134,9 +134,9 @@ public:
  135. return new boss_four_horsemenAI (pCreature);
  136. }
  138. - struct boss_four_horsemenAI : public ScriptedAI
  139. + struct boss_four_horsemenAI : public BossAI
  140. {
  141. - boss_four_horsemenAI(Creature *c) : ScriptedAI(c)
  142. + boss_four_horsemenAI(Creature *c) : BossAI(c, BOSS_HORSEMAN)
  143. {
  144. pInstance = me->GetInstanceScript();
  145. switch (me->GetEntry())
  146. @@ -187,15 +187,13 @@ public:
  148. void Reset()
  149. {
  150. + BossAI::Reset();
  151. me->SetPosition(me->GetHomePosition());
  152. movementPhase = MOVE_PHASE_NONE;
  153. currentWaypoint = 0;
  154. me->SetReactState(REACT_AGGRESSIVE);
  155. events.Reset();
  157. - if (pInstance)
  158. - pInstance->SetData(EVENT_HORSEMAN, NOT_STARTED);
  159. -
  160. // Schedule Events
  161. events.RescheduleEvent(EVENT_SPELL_MARK_CAST, 24000);
  162. events.RescheduleEvent(EVENT_BERSERK, 100*15000);
  163. @@ -263,23 +261,23 @@ public:
  165. void JustDied(Unit* killer)
  166. {
  167. + BossAI::JustDied(killer);
  168. if (pInstance)
  169. {
  170. - pInstance->SetData(EVENT_HORSEMAN, DONE);
  171. - if (pInstance->GetData(EVENT_HORSEMAN) == DONE)
  172. + if (pInstance->GetBossState(BOSS_HORSEMAN) == DONE)
  173. + {
  174. if (!me->GetMap()->GetPlayers().isEmpty())
  175. if (Player* player = me->GetMap()->GetPlayers().getFirst()->GetSource())
  176. player->SummonGameObject(RAID_MODE(GO_HORSEMEN_CHEST_10, GO_HORSEMEN_CHEST_25), 2514.8f, -2944.9f, 245.55f, 5.51f, 0, 0, 0, 0, 0);
  177. - }
  178. + }
  179. + }
  181. Talk(SAY_DEATH);
  182. }
  184. void EnterCombat(Unit *who)
  185. {
  186. - if (pInstance)
  187. - pInstance->SetData(EVENT_HORSEMAN, IN_PROGRESS);
  188. -
  189. + BossAI::EnterCombat(who);
  190. if (movementPhase == MOVE_PHASE_NONE)
  191. {
  192. Talk(SAY_AGGRO);
  193. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
  194. index bf4bb563..82b93616 100644
  195. --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
  196. +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
  197. @@ -74,9 +74,9 @@ public:
  198. return new boss_gluthAI (pCreature);
  199. }
  201. - struct boss_gluthAI : public ScriptedAI
  202. + struct boss_gluthAI : public BossAI
  203. {
  204. - boss_gluthAI(Creature *c) : ScriptedAI(c), summons(me)
  205. + boss_gluthAI(Creature *c) : BossAI(c, BOSS_GLUTH), summons(me)
  206. {
  207. pInstance = me->GetInstanceScript();
  208. }
  209. @@ -88,14 +88,12 @@ public:
  211. void Reset()
  212. {
  213. + BossAI::Reset();
  214. me->ApplySpellImmune(29306, IMMUNITY_ID, 29306, true);
  215. events.Reset();
  216. summons.DespawnAll();
  217. gazeTarget = 0;
  218. me->SetReactState(REACT_AGGRESSIVE);
  219. -
  220. - if (pInstance)
  221. - pInstance->SetData(EVENT_GLUTH, NOT_STARTED);
  222. }
  224. void MoveInLineOfSight(Unit *who)
  225. @@ -111,6 +109,7 @@ public:
  227. void EnterCombat(Unit *who)
  228. {
  229. + BossAI::EnterCombat(who);
  230. me->SetInCombatWithZone();
  231. events.ScheduleEvent(EVENT_SPELL_MORTAL_WOUND, 10000);
  232. events.ScheduleEvent(EVENT_SPELL_ENRAGE, 30000);
  233. @@ -118,9 +117,6 @@ public:
  234. events.ScheduleEvent(EVENT_SPELL_BERSERK, 8*60000);
  235. events.ScheduleEvent(EVENT_SUMMON_ZOMBIE, 10000);
  236. events.ScheduleEvent(EVENT_CAN_EAT_ZOMBIE, 1000);
  237. -
  238. - if (pInstance)
  239. - pInstance->SetData(EVENT_GLUTH, IN_PROGRESS);
  240. }
  242. void JustSummoned(Creature *summon)
  243. @@ -142,11 +138,10 @@ public:
  244. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  245. }
  247. - void JustDied(Unit*)
  248. + void JustDied(Unit* killer)
  249. {
  250. + BossAI::JustDied(killer);
  251. summons.DespawnAll();
  252. - if (pInstance)
  253. - pInstance->SetData(EVENT_GLUTH, DONE);
  254. }
  256. bool SelectPlayerInRoom()
  257. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
  258. index 7d291cce..07c2d443 100644
  259. --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
  260. +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
  261. @@ -148,9 +148,9 @@ public:
  262. return new boss_gothikAI (pCreature);
  263. }
  265. - struct boss_gothikAI : public ScriptedAI
  266. + struct boss_gothikAI : public BossAI
  267. {
  268. - boss_gothikAI(Creature *c) : ScriptedAI(c), summons(me)
  269. + boss_gothikAI(Creature *c) : BossAI(c, BOSS_GOTHIK), summons(me)
  270. {
  271. pInstance = me->GetInstanceScript();
  272. }
  273. @@ -175,6 +175,7 @@ public:
  275. void Reset()
  276. {
  277. + BossAI::Reset();
  278. events.Reset();
  279. summons.DespawnAll();
  280. me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_DISABLE_MOVE);
  281. @@ -185,7 +186,6 @@ public:
  283. if (pInstance)
  284. {
  285. - pInstance->SetData(EVENT_GOTHIK, NOT_STARTED);
  286. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_ENTER_GATE)))
  287. go->SetGoState(GO_STATE_ACTIVE);
  288. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_INNER_GATE)))
  289. @@ -197,6 +197,7 @@ public:
  291. void EnterCombat(Unit *who)
  292. {
  293. + BossAI::EnterCombat(who);
  294. me->SetInCombatWithZone();
  295. Talk(SAY_SPEECH);
  296. me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
  297. @@ -207,7 +208,6 @@ public:
  299. if (pInstance)
  300. {
  301. - pInstance->SetData(EVENT_GOTHIK, IN_PROGRESS);
  302. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_ENTER_GATE)))
  303. go->SetGoState(GO_STATE_READY);
  304. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_INNER_GATE)))
  305. @@ -238,14 +238,14 @@ public:
  306. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  307. }
  309. - void JustDied(Unit* Killer)
  310. + void JustDied(Unit* killer)
  311. {
  312. + BossAI::JustDied(killer);
  313. Talk(SAY_DEATH);
  314. summons.DespawnAll();
  316. if (pInstance)
  317. {
  318. - pInstance->SetData(EVENT_GOTHIK, DONE);
  319. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_ENTER_GATE)))
  320. go->SetGoState(GO_STATE_ACTIVE);
  321. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_GOTHIK_INNER_GATE)))
  322. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
  323. index ab7e5a8b..f3f37273 100644
  324. --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
  325. +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
  326. @@ -58,9 +58,9 @@ public:
  327. return new boss_grobbulusAI (pCreature);
  328. }
  330. - struct boss_grobbulusAI : public ScriptedAI
  331. + struct boss_grobbulusAI : public BossAI
  332. {
  333. - boss_grobbulusAI(Creature *c) : ScriptedAI(c), summons(me)
  334. + boss_grobbulusAI(Creature *c) : BossAI(c, BOSS_GROBBULUS), summons(me)
  335. {
  336. pInstance = me->GetInstanceScript();
  337. }
  338. @@ -72,24 +72,20 @@ public:
  340. void Reset()
  341. {
  342. + BossAI::Reset();
  343. events.Reset();
  344. summons.DespawnAll();
  345. dropSludgeTimer = 0;
  346. -
  347. - if (pInstance)
  348. - pInstance->SetData(EVENT_GROBBULUS, NOT_STARTED);
  349. }
  351. void EnterCombat(Unit *who)
  352. {
  353. + BossAI::EnterCombat(who);
  354. me->SetInCombatWithZone();
  355. events.ScheduleEvent(EVENT_SPELL_POISON_CLOUD, 15000);
  356. events.ScheduleEvent(EVENT_SPELL_MUTATING_INJECTION, 20000);
  357. events.ScheduleEvent(EVENT_SPELL_SLIME_SPRAY, 10000);
  358. events.ScheduleEvent(EVENT_SPELL_BERSERK, RAID_MODE(12*MINUTE*IN_MILLISECONDS, 9*MINUTE*IN_MILLISECONDS));
  359. -
  360. - if (pInstance)
  361. - pInstance->SetData(EVENT_GROBBULUS, IN_PROGRESS);
  362. }
  364. void SpellHitTarget(Unit *target, const SpellInfo* spellInfo)
  365. @@ -108,11 +104,10 @@ public:
  367. void SummonedCreatureDespawn(Creature* summon){ summons.Despawn(summon); }
  369. - void JustDied(Unit*)
  370. + void JustDied(Unit* killer)
  371. {
  372. + BossAI::JustDied(killer);
  373. summons.DespawnAll();
  374. - if (pInstance)
  375. - pInstance->SetData(EVENT_GROBBULUS, DONE);
  376. }
  378. void KilledUnit(Unit* who)
  379. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
  380. index 6f63e69f..6b6a87b1 100644
  381. --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
  382. +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
  383. @@ -61,9 +61,9 @@ public:
  384. return new boss_heiganAI (pCreature);
  385. }
  387. - struct boss_heiganAI : public ScriptedAI
  388. + struct boss_heiganAI : public BossAI
  389. {
  390. - boss_heiganAI(Creature *c) : ScriptedAI(c)
  391. + boss_heiganAI(Creature *c) : BossAI(c, BOSS_HEIGAN)
  392. {
  393. pInstance = me->GetInstanceScript();
  394. }
  395. @@ -76,6 +76,7 @@ public:
  397. void Reset()
  398. {
  399. + BossAI::Reset();
  400. events.Reset();
  401. currentPhase = 0;
  402. currentSection = 3;
  403. @@ -83,7 +84,6 @@ public:
  405. if (pInstance)
  406. {
  407. - pInstance->SetData(EVENT_HEIGAN, NOT_STARTED);
  408. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_HEIGAN_ENTER_GATE)))
  409. go->SetGoState(GO_STATE_ACTIVE);
  410. }
  411. @@ -101,20 +101,19 @@ public:
  412. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  413. }
  415. - void JustDied(Unit* Killer)
  416. + void JustDied(Unit* killer)
  417. {
  418. + BossAI::JustDied(killer);
  419. Talk(SAY_DEATH);
  420. - if (pInstance)
  421. - pInstance->SetData(EVENT_HEIGAN, DONE);
  422. }
  424. void EnterCombat(Unit *who)
  425. {
  426. + BossAI::EnterCombat(who);
  427. me->SetInCombatWithZone();
  428. Talk(SAY_AGGRO);
  429. if (pInstance)
  430. {
  431. - pInstance->SetData(EVENT_HEIGAN, IN_PROGRESS);
  432. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_HEIGAN_ENTER_GATE)))
  433. go->SetGoState(GO_STATE_READY);
  434. }
  435. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
  436. index ff8d3a9c..9fd55a47 100644
  437. --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
  438. +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
  439. @@ -128,9 +128,9 @@ public:
  440. return new boss_kelthuzadAI (pCreature);
  441. }
  443. - struct boss_kelthuzadAI : public ScriptedAI
  444. + struct boss_kelthuzadAI : public BossAI
  445. {
  446. - boss_kelthuzadAI(Creature* c) : ScriptedAI(c), summons(me)
  447. + boss_kelthuzadAI(Creature* c) : BossAI(c, BOSS_KELTHUZAD), summons(me)
  448. {
  449. pInstance = me->GetInstanceScript();
  450. }
  451. @@ -175,6 +175,7 @@ public:
  453. void Reset()
  454. {
  455. + BossAI::Reset();
  456. events.Reset();
  457. summons.DespawnAll();
  458. me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE);
  459. @@ -182,7 +183,6 @@ public:
  461. if (pInstance)
  462. {
  463. - pInstance->SetData(EVENT_KELTHUZAD, NOT_STARTED);
  464. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_FLOOR)))
  465. {
  466. go->SetPhaseMask(1, true);
  467. @@ -211,12 +211,11 @@ public:
  468. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  469. }
  471. - void JustDied(Unit* Killer)
  472. + void JustDied(Unit* killer)
  473. {
  474. + BossAI::JustDied(killer);
  475. summons.DespawnAll();
  476. Talk(SAY_DEATH);
  477. - if (pInstance)
  478. - pInstance->SetData(EVENT_KELTHUZAD, DONE);
  479. }
  481. void MoveInLineOfSight(Unit* who)
  482. @@ -227,6 +226,7 @@ public:
  484. void EnterCombat(Unit* who)
  485. {
  486. + BossAI::EnterCombat(who);
  487. Talk(SAY_SUMMON_MINIONS);
  488. me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
  489. me->RemoveAllAttackers();
  490. @@ -242,7 +242,6 @@ public:
  491. events.ScheduleEvent(EVENT_START_SECOND_PHASE, 228000);
  492. if (pInstance)
  493. {
  494. - pInstance->SetData(EVENT_KELTHUZAD, IN_PROGRESS);
  495. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_FLOOR)))
  496. {
  497. events.ScheduleEvent(EVENT_FLOOR_CHANGE, 15000);
  498. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
  499. index 67643566..b743df94 100644
  500. --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
  501. +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
  502. @@ -56,9 +56,9 @@ public:
  503. return new boss_loathebAI (pCreature);
  504. }
  506. - struct boss_loathebAI : public ScriptedAI
  507. + struct boss_loathebAI : public BossAI
  508. {
  509. - boss_loathebAI(Creature *c) : ScriptedAI(c)
  510. + boss_loathebAI(Creature *c) : BossAI(c, BOSS_LOATHEB)
  511. {
  512. pInstance = me->GetInstanceScript();
  513. }
  514. @@ -68,10 +68,10 @@ public:
  516. void Reset()
  517. {
  518. + BossAI::Reset();
  519. events.Reset();
  520. if (pInstance)
  521. {
  522. - pInstance->SetData(EVENT_LOATHEB, NOT_STARTED);
  523. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_LOATHEB_GATE)))
  524. go->SetGoState(GO_STATE_ACTIVE);
  525. }
  526. @@ -93,9 +93,9 @@ public:
  528. void EnterCombat(Unit *who)
  529. {
  530. + BossAI::EnterCombat(who);
  531. if (pInstance)
  532. {
  533. - pInstance->SetData(EVENT_LOATHEB, IN_PROGRESS);
  534. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_LOATHEB_GATE)))
  535. go->SetGoState(GO_STATE_READY);
  536. }
  537. @@ -107,12 +107,6 @@ public:
  538. events.ScheduleEvent(EVENT_SPELL_BERSERK, 720000);
  539. }
  541. - void JustDied(Unit* Killer)
  542. - {
  543. - if (pInstance)
  544. - pInstance->SetData(EVENT_LOATHEB, DONE);
  545. - }
  546. -
  547. void UpdateAI(uint32 diff)
  548. {
  549. if (!UpdateVictim())
  550. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
  551. index 0415ecb4..e8bd7fda 100644
  552. --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
  553. +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
  554. @@ -74,9 +74,9 @@ public:
  555. return new boss_maexxnaAI (pCreature);
  556. }
  558. - struct boss_maexxnaAI : public ScriptedAI
  559. + struct boss_maexxnaAI : public BossAI
  560. {
  561. - boss_maexxnaAI(Creature *c) : ScriptedAI(c), summons(me)
  562. + boss_maexxnaAI(Creature *c) : BossAI(c, BOSS_MAEXXNA), summons(me)
  563. {
  564. pInstance = me->GetInstanceScript();
  565. }
  566. @@ -98,13 +98,13 @@ public:
  568. void Reset()
  569. {
  570. + BossAI::Reset();
  571. events.Reset();
  572. summons.DespawnAll();
  574. if (pInstance)
  575. {
  576. - pInstance->SetData(EVENT_MAEXXNA, NOT_STARTED);
  577. - if (pInstance->GetData(EVENT_FAERLINA) == DONE)
  578. + if (pInstance->GetData(BOSS_FAERLINA) == DONE)
  579. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE)))
  580. go->SetGoState(GO_STATE_ACTIVE);
  581. }
  582. @@ -112,6 +112,7 @@ public:
  584. void EnterCombat(Unit *who)
  585. {
  586. + BossAI::EnterCombat(who);
  587. me->SetInCombatWithZone();
  588. events.ScheduleEvent(EVENT_WEB_WRAP, 20000);
  589. events.ScheduleEvent(EVENT_SPELL_WEB_SPRAY, 40000);
  590. @@ -122,18 +123,11 @@ public:
  592. if (pInstance)
  593. {
  594. - pInstance->SetData(EVENT_MAEXXNA, IN_PROGRESS);
  595. if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE)))
  596. go->SetGoState(GO_STATE_READY);
  597. }
  598. }
  600. - void JustDied(Unit* Killer)
  601. - {
  602. - if (pInstance)
  603. - pInstance->SetData(EVENT_MAEXXNA, DONE);
  604. - }
  605. -
  606. void JustSummoned(Creature* cr)
  607. {
  608. if (cr->GetEntry() == NPC_MAEXXNA_SPIDERLING)
  609. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
  610. index b6fd4475..f6e31d00 100644
  611. --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
  612. +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
  613. @@ -86,9 +86,9 @@ public:
  614. return new boss_nothAI (pCreature);
  615. }
  617. - struct boss_nothAI : public ScriptedAI
  618. + struct boss_nothAI : public BossAI
  619. {
  620. - boss_nothAI(Creature *c) : ScriptedAI(c), summons(me)
  621. + boss_nothAI(Creature *c) : BossAI(c, BOSS_NOTH), summons(me)
  622. {
  623. pInstance = me->GetInstanceScript();
  624. }
  625. @@ -142,14 +142,12 @@ public:
  627. void Reset()
  628. {
  629. + BossAI::Reset();
  630. events.Reset();
  631. summons.DespawnAll();
  632. me->SetControlled(false, UNIT_STATE_ROOT);
  633. me->SetReactState(REACT_AGGRESSIVE);
  634. totalPhase = 0;
  635. -
  636. - if (pInstance)
  637. - pInstance->SetData(EVENT_NOTH, NOT_STARTED);
  638. }
  640. void EnterEvadeMode()
  641. @@ -160,10 +158,8 @@ public:
  643. void EnterCombat(Unit *who)
  644. {
  645. + BossAI::EnterCombat(who);
  646. Talk(SAY_AGGRO);
  647. - if (pInstance)
  648. - pInstance->SetData(EVENT_NOTH, IN_PROGRESS);
  649. -
  650. StartGroundPhase();
  651. }
  653. @@ -173,11 +169,10 @@ public:
  654. summon->SetInCombatWithZone();
  655. }
  657. - void JustDied(Unit* Killer)
  658. + void JustDied(Unit* killer)
  659. {
  660. + BossAI::JustDied(killer);
  661. Talk(SAY_DEATH);
  662. - if (pInstance)
  663. - pInstance->SetData(EVENT_NOTH, DONE);
  664. }
  666. void KilledUnit(Unit* who)
  667. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
  668. index 472e617a..785725c9 100644
  669. --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
  670. +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
  671. @@ -60,9 +60,9 @@ public:
  672. return new boss_patchwerkAI (pCreature);
  673. }
  675. - struct boss_patchwerkAI : public ScriptedAI
  676. + struct boss_patchwerkAI : public BossAI
  677. {
  678. - boss_patchwerkAI(Creature *c) : ScriptedAI(c)
  679. + boss_patchwerkAI(Creature *c) : BossAI(c, BOSS_PATCHWERK)
  680. {
  681. pInstance = me->GetInstanceScript();
  682. }
  683. @@ -72,9 +72,8 @@ public:
  685. void Reset()
  686. {
  687. + BossAI::Reset();
  688. events.Reset();
  689. - if (pInstance)
  690. - pInstance->SetData(EVENT_PATCHWERK, NOT_STARTED);
  691. }
  693. void KilledUnit(Unit* who)
  694. @@ -89,15 +88,15 @@ public:
  695. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  696. }
  698. - void JustDied(Unit* Killer)
  699. + void JustDied(Unit* killer)
  700. {
  701. + BossAI::JustDied(killer);
  702. Talk(SAY_DEATH);
  703. - if (pInstance)
  704. - pInstance->SetData(EVENT_PATCHWERK, DONE);
  705. }
  707. void EnterCombat(Unit *who)
  708. {
  709. + BossAI::EnterCombat(who);
  710. Talk(SAY_AGGRO);
  712. me->SetInCombatWithZone();
  713. @@ -108,7 +107,6 @@ public:
  714. if (pInstance)
  715. {
  716. pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
  717. - pInstance->SetData(EVENT_PATCHWERK, IN_PROGRESS);
  718. }
  719. }
  721. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
  722. index e4de4a28..3553c63c 100644
  723. --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
  724. +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
  725. @@ -73,9 +73,9 @@ public:
  726. return new boss_razuviousAI (pCreature);
  727. }
  729. - struct boss_razuviousAI : public ScriptedAI
  730. + struct boss_razuviousAI : public BossAI
  731. {
  732. - boss_razuviousAI(Creature *c) : ScriptedAI(c), summons(me)
  733. + boss_razuviousAI(Creature *c) : BossAI(c, BOSS_RAZUVIOUS), summons(me)
  734. {
  735. pInstance = me->GetInstanceScript();
  736. }
  737. @@ -99,11 +99,10 @@ public:
  739. void Reset()
  740. {
  741. + BossAI::Reset();
  742. summons.DespawnAll();
  743. events.Reset();
  744. SpawnHelpers();
  745. - if (pInstance)
  746. - pInstance->SetData(EVENT_RAZUVIOUS, NOT_STARTED);
  747. }
  749. void KilledUnit(Unit* who)
  750. @@ -130,16 +129,16 @@ public:
  752. void JustDied(Unit* killer)
  753. {
  754. + BossAI::JustDied(killer);
  755. DoPlaySoundToSet(me, SOUND_DEATH);
  756. me->Yell("An honorable... death...", LANG_UNIVERSAL);
  758. me->CastSpell(me, SPELL_HOPELESS, true);
  759. - if (pInstance)
  760. - pInstance->SetData(EVENT_RAZUVIOUS, DONE);
  761. }
  763. void EnterCombat(Unit *who)
  764. {
  765. + BossAI::EnterCombat(who);
  766. switch (urand(0,2))
  767. {
  768. case 0:
  769. @@ -160,8 +159,6 @@ public:
  770. events.ScheduleEvent(EVENT_SPELL_DISRUPTING_SHOUT, 25000);
  771. events.ScheduleEvent(EVENT_SPELL_JAGGED_KNIFE, 15000);
  772. events.ScheduleEvent(EVENT_PLAY_COMMAND, 40000);
  773. - if (pInstance)
  774. - pInstance->SetData(EVENT_RAZUVIOUS, IN_PROGRESS);
  776. summons.DoZoneInCombat();
  777. }
  778. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
  779. index de7fea9e..9eac7a89 100644
  780. --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
  781. +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
  782. @@ -90,9 +90,9 @@ public:
  783. return new boss_sapphironAI (pCreature);
  784. }
  786. - struct boss_sapphironAI : public ScriptedAI
  787. + struct boss_sapphironAI : public BossAI
  788. {
  789. - boss_sapphironAI(Creature* c) : ScriptedAI(c)
  790. + boss_sapphironAI(Creature* c) : BossAI(c, BOSS_SAPPHIRON)
  791. {
  792. pInstance = me->GetInstanceScript();
  793. }
  794. @@ -126,6 +126,7 @@ public:
  796. void Reset()
  797. {
  798. + BossAI::Reset();
  799. if (me->IsVisible())
  800. me->SetReactState(REACT_AGGRESSIVE);
  802. @@ -134,9 +135,6 @@ public:
  803. spawnTimer = 0;
  804. currentTarget = 0;
  805. blockList.clear();
  806. -
  807. - if (pInstance)
  808. - pInstance->SetData(EVENT_SAPPHIRON, NOT_STARTED);
  809. }
  811. void EnterCombatSelfFunction()
  812. @@ -162,6 +160,7 @@ public:
  814. void EnterCombat(Unit *who)
  815. {
  816. + BossAI::EnterCombat(who);
  817. EnterCombatSelfFunction();
  818. me->CastSpell(me, RAID_MODE(SPELL_FROST_AURA_10, SPELL_FROST_AURA_25), true);
  820. @@ -172,16 +171,12 @@ public:
  821. events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 21000);
  822. events.ScheduleEvent(EVENT_FLIGHT_START, 45000);
  823. events.ScheduleEvent(EVENT_HUNDRED_CLUB, 5000);
  824. -
  825. - if (pInstance)
  826. - pInstance->SetData(EVENT_SAPPHIRON, IN_PROGRESS);
  827. }
  829. - void JustDied(Unit* who)
  830. + void JustDied(Unit* killer)
  831. {
  832. + BossAI::JustDied(killer);
  833. me->CastSpell(me, SPELL_SAPPHIRON_DIES, true);
  834. - if (pInstance)
  835. - pInstance->SetData(EVENT_SAPPHIRON, DONE);
  836. }
  838. void DoAction(int32 param)
  839. diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
  840. index d235ec75..a261bae7 100644
  841. --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
  842. +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
  843. @@ -107,9 +107,9 @@ public:
  844. return new boss_thaddiusAI (pCreature);
  845. }
  847. - struct boss_thaddiusAI : public ScriptedAI
  848. + struct boss_thaddiusAI : public BossAI
  849. {
  850. - boss_thaddiusAI(Creature *c) : ScriptedAI(c), summons(me)
  851. + boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS), summons(me)
  852. {
  853. pInstance = me->GetInstanceScript();
  854. }
  855. @@ -154,6 +154,7 @@ public:
  857. void Reset()
  858. {
  859. + BossAI::Reset();
  860. events.Reset();
  861. summons.DespawnAll();
  862. me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
  863. @@ -162,9 +163,6 @@ public:
  864. resetTimer = 1;
  865. me->SetPosition(me->GetHomePosition());
  867. - if (pInstance)
  868. - pInstance->SetData(EVENT_THADDIUS, NOT_STARTED);
  869. -
  870. me->SummonCreature(NPC_STALAGG, 3450.45f, -2931.42f, 312.091f, 5.49779f);
  871. me->SummonCreature(NPC_FEUGEN, 3508.14f, -2988.65f, 312.092f, 2.37365f);
  872. if (Creature* cr = me->SummonCreature(NPC_TESLA_COIL, 3527.34f, -2951.56f, 318.75f, 0.0f))
  873. @@ -195,12 +193,12 @@ public:
  874. pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
  875. }
  877. - void JustDied(Unit* Killer)
  878. - {
  879. + void JustDied(Unit* killer)
  880. + {
  881. + BossAI::JustDied(killer);
  882. Talk(SAY_DEATH);
  883. if (pInstance)
  884. {
  885. - pInstance->SetData(EVENT_THADDIUS, DONE);
  886. pInstance->DoRemoveAurasDueToSpellOnPlayers(28059);
  887. pInstance->DoRemoveAurasDueToSpellOnPlayers(28084);
  888. }
  889. @@ -210,12 +208,10 @@ public:
  891. void EnterCombat(Unit *who)
  892. {
  893. + BossAI::EnterCombat(who);
  894. me->SetInCombatWithZone();
  895. summons.DoZoneInCombat(NPC_FEUGEN);
  896. summons.DoZoneInCombat(NPC_STALAGG);
  897. -
  898. - if (pInstance)
  899. - pInstance->SetData(EVENT_THADDIUS, IN_PROGRESS);
  900. }
  902. void UpdateAI(uint32 diff)
  903. diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
  904. index 4329ba32..1837149a 100644
  905. --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
  906. +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
  907. @@ -62,7 +62,7 @@ public:
  908. {
  909. instance_naxxramas_InstanceMapScript(Map* pMap) : InstanceScript(pMap)
  910. {
  911. - memset(&Encounters, 0, sizeof(Encounters));
  912. + SetBossNumber(MAX_ENCOUNTERS);
  913. for (uint8 i = 0; i < 4; ++i)
  914. HeiganEruption[i].clear();
  916. @@ -188,17 +188,17 @@ public:
  917. }
  918. }
  920. - bool IsEncounterInProgress() const
  921. + bool IsEncounterInProgress() const override
  922. {
  923. for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
  924. {
  925. - if (Encounters[i] == IN_PROGRESS)
  926. + if (GetBossState(i) == IN_PROGRESS)
  927. return true;
  928. }
  929. return false;
  930. }
  932. - void OnCreatureCreate(Creature* creature)
  933. + void OnCreatureCreate(Creature* creature) override
  934. {
  935. switch(creature->GetEntry())
  936. {
  937. @@ -235,7 +235,7 @@ public:
  938. }
  939. }
  941. - void OnGameObjectCreate(GameObject* pGo)
  942. + void OnGameObjectCreate(GameObject* pGo) override
  943. {
  944. if (pGo->GetGOInfo()->displayId == 6785 || pGo->GetGOInfo()->displayId == 1287)
  945. {
  946. @@ -247,57 +247,57 @@ public:
  947. {
  948. case GO_PATCHWERK_GATE:
  949. _patchwerkGateGUID = pGo->GetGUID();
  950. - if (Encounters[EVENT_PATCHWERK] == DONE)
  951. + if (GetBossState(BOSS_PATCHWERK) == DONE)
  952. pGo->SetGoState(GO_STATE_ACTIVE);
  953. break;
  954. case GO_GLUTH_GATE:
  955. _gluthGateGUID = pGo->GetGUID();
  956. - if (Encounters[EVENT_GLUTH] == DONE)
  957. + if (GetBossState(BOSS_GLUTH) == DONE)
  958. pGo->SetGoState(GO_STATE_ACTIVE);
  959. break;
  960. case GO_NOTH_GATE:
  961. _nothGateGUID = pGo->GetGUID();
  962. - if (Encounters[EVENT_NOTH] == DONE)
  963. + if (GetBossState(BOSS_NOTH) == DONE)
  964. pGo->SetGoState(GO_STATE_ACTIVE);
  965. break;
  966. case GO_HEIGAN_ENTERANCE_GATE:
  967. _heiganGateGUID = pGo->GetGUID();
  968. - if (Encounters[EVENT_HEIGAN] == DONE || Encounters[EVENT_NOTH] == DONE)
  969. + if (GetBossState(BOSS_HEIGAN) == DONE || GetBossState(BOSS_NOTH) == DONE)
  970. pGo->SetGoState(GO_STATE_ACTIVE);
  971. break;
  972. case GO_HEIGAN_EXIT_GATE:
  973. _heiganGateExitGUID = pGo->GetGUID();
  974. - if (Encounters[EVENT_HEIGAN] == DONE)
  975. + if (GetBossState(BOSS_HEIGAN) == DONE)
  976. pGo->SetGoState(GO_STATE_ACTIVE);
  977. break;
  978. case GO_LOATHEB_GATE:
  979. _loathebGateGUID = pGo->GetGUID();
  980. - if (Encounters[EVENT_LOATHEB] == DONE)
  981. + if (GetBossState(BOSS_LOATHEB) == DONE)
  982. pGo->SetGoState(GO_STATE_ACTIVE);
  983. break;
  984. case GO_ANUB_GATE:
  985. _anubGateGUID = pGo->GetGUID();
  986. - if (Encounters[EVENT_ANUB] == DONE)
  987. + if (GetBossState(BOSS_ANUB) == DONE)
  988. pGo->SetGoState(GO_STATE_ACTIVE);
  989. break;
  990. case GO_ANUB_NEXT_GATE:
  991. _anubNextGateGUID = pGo->GetGUID();
  992. - if (Encounters[EVENT_ANUB] == DONE)
  993. + if (GetBossState(BOSS_ANUB) == DONE)
  994. pGo->SetGoState(GO_STATE_ACTIVE);
  995. break;
  996. case GO_FAERLINA_GATE:
  997. _faerlinaGateGUID = pGo->GetGUID();
  998. - if (Encounters[EVENT_FAERLINA] == DONE)
  999. + if (GetBossState(BOSS_FAERLINA) == DONE)
  1000. pGo->SetGoState(GO_STATE_ACTIVE);
  1001. break;
  1002. case GO_MAEXXNA_GATE:
  1003. _maexxnaGateGUID = pGo->GetGUID();
  1004. - if (Encounters[EVENT_FAERLINA] == DONE) // faerlina is correct
  1005. + if (GetBossState(BOSS_FAERLINA) == DONE) // faerlina is correct
  1006. pGo->SetGoState(GO_STATE_ACTIVE);
  1007. break;
  1008. case GO_THADDIUS_GATE:
  1009. _thaddiusGateGUID = pGo->GetGUID();
  1010. - if (Encounters[EVENT_GLUTH] == DONE) // gluth is correct
  1011. + if (GetBossState(BOSS_GLUTH) == DONE) // gluth is correct
  1012. pGo->SetGoState(GO_STATE_ACTIVE);
  1013. break;
  1014. case GO_GOTHIK_ENTER_GATE:
  1015. @@ -308,12 +308,12 @@ public:
  1016. break;
  1017. case GO_GOTHIK_EXIT_GATE:
  1018. _gothikExitGateGUID = pGo->GetGUID();
  1019. - if (Encounters[EVENT_GOTHIK] == DONE)
  1020. + if (GetBossState(BOSS_GOTHIK) == DONE)
  1021. pGo->SetGoState(GO_STATE_ACTIVE);
  1022. break;
  1023. case GO_HORSEMAN_GATE:
  1024. _horsemanGateGUID = pGo->GetGUID();
  1025. - if (Encounters[EVENT_GOTHIK] == DONE) // correct
  1026. + if (GetBossState(BOSS_GOTHIK) == DONE) // correct
  1027. pGo->SetGoState(GO_STATE_ACTIVE);
  1028. break;
  1029. case GO_KELTHUZAD_FLOOR:
  1030. @@ -323,34 +323,32 @@ public:
  1031. _kelthuzadgateGUID = pGo->GetGUID();
  1032. break;
  1033. case GO_SAPPHIRON_GATE:
  1034. - _sapphironGateGUID = pGo->GetGUID();
  1035. - if (Encounters[EVENT_SAPPHIRON] == DONE && Encounters[EVENT_MAEXXNA] == DONE && Encounters[EVENT_HORSEMAN] == DONE && Encounters[EVENT_LOATHEB] == DONE && Encounters[EVENT_GLUTH] == DONE)
  1036. - pGo->SetGoState(GO_STATE_ACTIVE);
  1037. + _sapphironGateGUID = pGo->GetGUID();
  1038. break;
  1039. case GO_DEATHKNIGHT_WING:
  1040. _loathebPortalGUID = pGo->GetGUID();
  1041. - if (Encounters[EVENT_LOATHEB] == DONE)
  1042. + if (GetBossState(BOSS_LOATHEB) == DONE)
  1043. pGo->SetPhaseMask(1, true);
  1044. break;
  1045. case GO_THADDIUS_PORTAL:
  1046. _thaddiusPortalGUID = pGo->GetGUID();
  1047. - if (Encounters[EVENT_THADDIUS] == DONE)
  1048. + if (GetBossState(BOSS_THADDIUS) == DONE)
  1049. pGo->SetPhaseMask(1, true);
  1050. break;
  1051. case GO_MAEXXNA_PORTAL:
  1052. _maexxnaPortalGUID = pGo->GetGUID();
  1053. - if (Encounters[EVENT_MAEXXNA] == DONE)
  1054. + if (GetBossState(BOSS_MAEXXNA) == DONE)
  1055. pGo->SetPhaseMask(1, true);
  1056. break;
  1057. case GO_HORSEMAN_PORTAL:
  1058. _horsemanPortalGUID = pGo->GetGUID();
  1059. - if (Encounters[EVENT_HORSEMAN] == DONE)
  1060. + if (GetBossState(BOSS_HORSEMAN) == DONE)
  1061. pGo->SetPhaseMask(1, true);
  1062. break;
  1063. }
  1064. }
  1066. - void OnGameObjectRemove(GameObject* pGo)
  1067. + void OnGameObjectRemove(GameObject* pGo) override
  1068. {
  1069. if (pGo->GetGOInfo()->displayId == 6785 || pGo->GetGOInfo()->displayId == 1287)
  1070. {
  1071. @@ -364,7 +362,7 @@ public:
  1072. cr->AI()->DoAction(ACTION_SAPPHIRON_BIRTH);
  1073. }
  1075. - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0)
  1076. + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) override
  1077. {
  1078. switch(criteria_id)
  1079. {
  1080. @@ -408,7 +406,7 @@ public:
  1081. {
  1082. uint8 count = 0;
  1083. for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
  1084. - if (Encounters[i] == NOT_STARTED)
  1085. + if (GetBossState(i) == NOT_STARTED)
  1086. ++count;
  1088. return !count && immortalAchievement;
  1089. @@ -417,57 +415,11 @@ public:
  1090. return false;
  1091. }
  1093. - void SetData(uint32 id, uint32 data)
  1094. + void SetData(uint32 id, uint32 data) override
  1095. {
  1096. // Bosses data
  1097. switch(id)
  1098. {
  1099. - case EVENT_PATCHWERK:
  1100. - case EVENT_GROBBULUS:
  1101. - case EVENT_GLUTH:
  1102. - case EVENT_NOTH:
  1103. - case EVENT_ANUB:
  1104. - case EVENT_MAEXXNA:
  1105. - case EVENT_RAZUVIOUS:
  1106. - case EVENT_GOTHIK:
  1107. - // EVENT_HORSEMAN HANDLED BELOW
  1108. - Encounters[id] = data;
  1109. - break;
  1110. - case EVENT_KELTHUZAD:
  1111. - if (data == NOT_STARTED)
  1112. - abominationsKilled = 0;
  1113. - Encounters[id] = data;
  1114. - break;
  1115. - case EVENT_FAERLINA:
  1116. - if (data == NOT_STARTED)
  1117. - faerlinaAchievement = true;
  1118. - Encounters[id] = data;
  1119. - break;
  1120. - case EVENT_THADDIUS:
  1121. - if (data == NOT_STARTED)
  1122. - thaddiusAchievement = true;
  1123. - Encounters[id] = data;
  1124. - break;
  1125. - case EVENT_LOATHEB:
  1126. - if (data == NOT_STARTED)
  1127. - loathebAchievement = true;
  1128. - Encounters[id] = data;
  1129. - break;
  1130. - case EVENT_HEIGAN:
  1131. - if (data == NOT_STARTED)
  1132. - heiganAchievement = true;
  1133. - Encounters[id] = data;
  1134. - break;
  1135. - case DATA_HEIGAN_ERUPTION:
  1136. - HeiganEruptSections(data);
  1137. - return;
  1138. - case EVENT_SAPPHIRON:
  1139. - Encounters[id] = data;
  1140. - if (data == DONE)
  1141. - _speakTimer = 1;
  1142. - else if (data == NOT_STARTED)
  1143. - sapphironAchievement = true;
  1144. - break;
  1145. case DATA_ABOMINATION_KILLED:
  1146. abominationsKilled++;
  1147. return;
  1148. @@ -490,17 +442,25 @@ public:
  1149. immortalAchievement = 0;
  1150. SaveToDB();
  1151. return;
  1152. + case DATA_HEIGAN_ERUPTION:
  1153. + HeiganEruptSections(data);
  1154. + return;
  1155. }
  1157. + }
  1158. +
  1159. + bool SetBossState(uint32 bossId, EncounterState state) override
  1160. + {
  1161. // Horseman handling
  1162. - if (id == EVENT_HORSEMAN)
  1163. + if (bossId == BOSS_HORSEMAN)
  1164. {
  1165. - if (data == DONE)
  1166. + if (state == DONE)
  1167. {
  1168. _horsemanTimer++;
  1169. _horsemanKilled++;
  1170. - if (_horsemanKilled < 4)
  1171. - return;
  1172. + if (_horsemanKilled < 4) {
  1173. + return false;
  1174. + }
  1176. // All horsemans are killed
  1177. if (Creature* cr = instance->GetCreature(_blaumeuxGUID))
  1178. @@ -508,7 +468,7 @@ public:
  1179. }
  1181. // respawn
  1182. - else if (data == NOT_STARTED && _horsemanKilled > 0)
  1183. + else if (state == NOT_STARTED && _horsemanKilled > 0)
  1184. {
  1185. Creature* cr;
  1186. _horsemanKilled = 0;
  1187. @@ -537,7 +497,7 @@ public:
  1188. cr->Respawn();
  1189. }
  1190. }
  1191. - else if (data == IN_PROGRESS)
  1192. + else if (state == IN_PROGRESS)
  1193. {
  1194. Creature* cr;
  1195. if (cr = instance->GetCreature(_blaumeuxGUID))
  1196. @@ -550,66 +510,98 @@ public:
  1197. cr->SetInCombatWithZone();
  1198. }
  1200. - if (data == NOT_STARTED)
  1201. + if (state == NOT_STARTED)
  1202. _horsemanTimer = 0;
  1203. -
  1204. - Encounters[id] = data;
  1205. }
  1207. + if (!InstanceScript::SetBossState(bossId, state))
  1208. + return false;
  1209. +
  1210. + // Bosses data
  1211. + switch(bossId)
  1212. + {
  1213. + case BOSS_KELTHUZAD:
  1214. + if (state == NOT_STARTED)
  1215. + abominationsKilled = 0;
  1216. + break;
  1217. + case BOSS_FAERLINA:
  1218. + if (state == NOT_STARTED)
  1219. + faerlinaAchievement = true;
  1220. + break;
  1221. + case BOSS_THADDIUS:
  1222. + if (state == NOT_STARTED)
  1223. + thaddiusAchievement = true;
  1224. + break;
  1225. + case BOSS_LOATHEB:
  1226. + if (state == NOT_STARTED)
  1227. + loathebAchievement = true;
  1228. + break;
  1229. + case BOSS_HEIGAN:
  1230. + if (state == NOT_STARTED)
  1231. + heiganAchievement = true;
  1232. + break;
  1233. + case BOSS_SAPPHIRON:
  1234. + if (state == DONE)
  1235. + _speakTimer = 1;
  1236. + else if (state == NOT_STARTED)
  1237. + sapphironAchievement = true;
  1238. + break;
  1239. + }
  1240. +
  1241. // Save instance and open gates
  1242. - if (data == DONE)
  1243. + if (state == DONE)
  1244. {
  1245. SaveToDB();
  1247. - switch (id)
  1248. + switch (bossId)
  1249. {
  1250. - case EVENT_PATCHWERK:
  1251. + case BOSS_PATCHWERK:
  1252. if (GameObject* go = instance->GetGameObject(_patchwerkGateGUID))
  1253. go->SetGoState(GO_STATE_ACTIVE);
  1254. break;
  1255. - case EVENT_GLUTH:
  1256. + case BOSS_GLUTH:
  1257. if (GameObject* go = instance->GetGameObject(_gluthGateGUID))
  1258. go->SetGoState(GO_STATE_ACTIVE);
  1259. if (GameObject* go = instance->GetGameObject(_thaddiusGateGUID))
  1260. go->SetGoState(GO_STATE_ACTIVE);
  1261. break;
  1262. - case EVENT_NOTH:
  1263. + case BOSS_NOTH:
  1264. if (GameObject* go = instance->GetGameObject(_nothGateGUID))
  1265. go->SetGoState(GO_STATE_ACTIVE);
  1266. if (GameObject* go = instance->GetGameObject(_heiganGateGUID))
  1267. go->SetGoState(GO_STATE_ACTIVE);
  1268. break;
  1269. - case EVENT_HEIGAN:
  1270. + case BOSS_HEIGAN:
  1271. if (GameObject* go = instance->GetGameObject(_heiganGateGUID))
  1272. go->SetGoState(GO_STATE_ACTIVE);
  1273. if (GameObject* go = instance->GetGameObject(_heiganGateExitGUID))
  1274. go->SetGoState(GO_STATE_ACTIVE);
  1275. break;
  1276. - case EVENT_LOATHEB:
  1277. + case BOSS_LOATHEB:
  1278. if (GameObject* go = instance->GetGameObject(_loathebGateGUID))
  1279. go->SetGoState(GO_STATE_ACTIVE);
  1280. if (GameObject* go = instance->GetGameObject(_loathebPortalGUID))
  1281. go->SetPhaseMask(1, true);
  1282. break;
  1283. - case EVENT_ANUB:
  1284. + case BOSS_ANUB:
  1285. if (GameObject* go = instance->GetGameObject(_anubGateGUID))
  1286. go->SetGoState(GO_STATE_ACTIVE);
  1287. if (GameObject* go = instance->GetGameObject(_anubNextGateGUID))
  1288. go->SetGoState(GO_STATE_ACTIVE);
  1289. break;
  1290. - case EVENT_FAERLINA:
  1291. + case BOSS_FAERLINA:
  1292. if (GameObject* go = instance->GetGameObject(_faerlinaGateGUID))
  1293. go->SetGoState(GO_STATE_ACTIVE);
  1294. if (GameObject* go = instance->GetGameObject(_maexxnaGateGUID))
  1295. go->SetGoState(GO_STATE_ACTIVE);
  1296. break;
  1297. - case EVENT_MAEXXNA:
  1298. + case BOSS_MAEXXNA:
  1299. if (GameObject* go = instance->GetGameObject(_maexxnaGateGUID))
  1300. go->SetGoState(GO_STATE_ACTIVE);
  1301. if (GameObject* go = instance->GetGameObject(_maexxnaPortalGUID))
  1302. go->SetPhaseMask(1, true);
  1303. break;
  1304. - case EVENT_GOTHIK:
  1305. + case BOSS_GOTHIK:
  1306. if (GameObject* go = instance->GetGameObject(_gothikEnterGateGUID))
  1307. go->SetGoState(GO_STATE_ACTIVE);
  1308. if (GameObject* go = instance->GetGameObject(_gothikExitGateGUID))
  1309. @@ -617,35 +609,27 @@ public:
  1310. if (GameObject* go = instance->GetGameObject(_horsemanGateGUID))
  1311. go->SetGoState(GO_STATE_ACTIVE);
  1312. break;
  1313. - case EVENT_SAPPHIRON:
  1314. + case BOSS_SAPPHIRON:
  1315. if (GameObject* go = instance->GetGameObject(_sapphironGateGUID))
  1316. go->SetGoState(GO_STATE_ACTIVE);
  1317. break;
  1318. - case EVENT_THADDIUS:
  1319. + case BOSS_THADDIUS:
  1320. if (GameObject* go = instance->GetGameObject(_thaddiusPortalGUID))
  1321. go->SetPhaseMask(1, true);
  1322. break;
  1323. - case EVENT_HORSEMAN:
  1324. + case BOSS_HORSEMAN:
  1325. if (GameObject* go = instance->GetGameObject(_horsemanPortalGUID))
  1326. go->SetPhaseMask(1, true);
  1327. break;
  1328. }
  1329. }
  1330. - }
  1332. - uint32 GetData(uint32 identifier) const
  1333. - {
  1334. - switch(identifier)
  1335. - {
  1336. - case EVENT_HORSEMAN:
  1337. - return Encounters[identifier];
  1338. - }
  1339. - return 0;
  1340. + return true;
  1341. }
  1343. - void Update(uint32 diff)
  1344. + void Update(uint32 diff) override
  1345. {
  1346. - if (screamsTimer && Encounters[EVENT_THADDIUS] != DONE)
  1347. + if (screamsTimer && GetBossState(BOSS_THADDIUS) != DONE)
  1348. {
  1349. if (screamsTimer <= diff)
  1350. {
  1351. @@ -696,7 +680,7 @@ public:
  1352. _horsemanTimer += diff;
  1353. }
  1355. - uint64 GetData64(uint32 id) const
  1356. + uint64 GetData64(uint32 id) const override
  1357. {
  1358. switch (id)
  1359. {
  1360. @@ -733,21 +717,18 @@ public:
  1361. return 0;
  1362. }
  1364. - std::string GetSaveData()
  1365. + std::string GetSaveData() override
  1366. {
  1367. OUT_SAVE_INST_DATA;
  1369. std::ostringstream saveStream;
  1370. - saveStream << "N X X " << Encounters[0] << ' ' << Encounters[1] << ' ' << Encounters[2] << ' ' << Encounters[3]
  1371. - << ' ' << Encounters[4] << ' ' << Encounters[5] << ' ' << Encounters[6] << ' ' << Encounters[7]
  1372. - << ' ' << Encounters[8] << ' ' << Encounters[9] << ' ' << Encounters[10] << ' ' << Encounters[11]
  1373. - << ' ' << Encounters[12] << ' ' << Encounters[13] << ' ' << Encounters[14] << ' ' << immortalAchievement;
  1374. + saveStream << "N X X " << GetBossSaveData() << ' ' << immortalAchievement;
  1376. OUT_SAVE_INST_DATA_COMPLETE;
  1377. return saveStream.str();
  1378. }
  1380. - void Load(const char* in)
  1381. + void Load(const char* in) override
  1382. {
  1383. if (!in)
  1384. {
  1385. @@ -765,9 +746,12 @@ public:
  1386. {
  1387. for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
  1388. {
  1389. - loadStream >> Encounters[i];
  1390. - if (Encounters[i] == IN_PROGRESS)
  1391. - Encounters[i] = NOT_STARTED;
  1392. + uint32 tmpState;
  1393. + loadStream >> tmpState;
  1394. + if (tmpState == IN_PROGRESS)
  1395. + tmpState = NOT_STARTED;
  1396. +
  1397. + SetBossState(i, EncounterState(tmpState));
  1398. }
  1399. loadStream >> immortalAchievement;
  1401. @@ -779,6 +763,7 @@ public:
  1403. };
  1404. };
  1405. +
  1406. class boss_naxxramas_misc : public CreatureScript
  1407. {
  1408. public:
  1409. @@ -838,8 +823,66 @@ public:
  1410. };
  1411. };
  1413. +class at_naxxramas_frostwyrm_wing : public AreaTriggerScript
  1414. +{
  1415. +public:
  1416. + at_naxxramas_frostwyrm_wing() : AreaTriggerScript("at_naxxramas_frostwyrm_wing") { }
  1417. +
  1418. + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
  1419. + {
  1420. + if (player->IsInCombat())
  1421. + return true;
  1422. +
  1423. + if (InstanceScript* instance = player->GetInstanceScript())
  1424. + for (uint32 i = BOSS_PATCHWERK; i < BOSS_SAPPHIRON; ++i)
  1425. + if (instance->GetBossState(i) != DONE)
  1426. + return true;
  1427. +
  1428. + return false;
  1429. + }
  1430. +};
  1431. +
  1432. +#define MSG_GOSSIP_TEXT_ORB "Teleportation to Frostwyrm Wing"
  1433. +
  1434. +class go_naxx_orb : public GameObjectScript
  1435. +{
  1436. + public:
  1437. + go_naxx_orb() : GameObjectScript("go_naxx_orb") { }
  1438. +
  1439. + bool OnGossipHello(Player* player, GameObject* go) override
  1440. + {
  1441. + if (InstanceScript* instance = go->GetInstanceScript())
  1442. + {
  1443. + if (instance->GetBossState(BOSS_MAEXXNA) == DONE &&
  1444. + instance->GetBossState(BOSS_THADDIUS) == DONE &&
  1445. + instance->GetBossState(BOSS_LOATHEB) == DONE &&
  1446. + instance->GetBossState(BOSS_HORSEMAN) == DONE)
  1447. + AddGossipItemFor(player, GOSSIP_ICON_VENDOR, MSG_GOSSIP_TEXT_ORB, GOSSIP_SENDER_MAIN, 1);
  1448. + }
  1449. +
  1450. + SendGossipMenuFor(player, DEFAULT_GOSSIP_MESSAGE, go->GetGUID());
  1451. + }
  1452. +
  1453. + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action) override
  1454. + {
  1455. + switch (action)
  1456. + {
  1457. + if (player->IsInCombat())
  1458. + return true;
  1459. +
  1460. + case 1:
  1461. + player->CastSpell(player, SPELL_TELE_SAPPHIRON, true);
  1462. + CloseGossipMenuFor(player);
  1463. + break;
  1464. +
  1465. + }
  1466. + }
  1467. +};
  1468. +
  1469. void AddSC_instance_naxxramas()
  1470. {
  1471. new instance_naxxramas();
  1472. new boss_naxxramas_misc();
  1473. + new go_naxx_orb();
  1474. + new at_naxxramas_frostwyrm_wing();
  1475. }
  1476. diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
  1477. index 7ef0661e..0f06bdc0 100644
  1478. --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h
  1479. +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
  1480. @@ -18,23 +18,23 @@
  1481. #ifndef DEF_NAXXRAMAS_H
  1482. #define DEF_NAXXRAMAS_H
  1484. -enum NXEncounter
  1485. +enum Encouters
  1486. {
  1487. - EVENT_PATCHWERK = 0,
  1488. - EVENT_GROBBULUS = 1,
  1489. - EVENT_GLUTH = 2,
  1490. - EVENT_NOTH = 3,
  1491. - EVENT_HEIGAN = 4,
  1492. - EVENT_LOATHEB = 5,
  1493. - EVENT_ANUB = 6,
  1494. - EVENT_FAERLINA = 7,
  1495. - EVENT_MAEXXNA = 8,
  1496. - EVENT_THADDIUS = 9,
  1497. - EVENT_RAZUVIOUS = 10,
  1498. - EVENT_GOTHIK = 11,
  1499. - EVENT_HORSEMAN = 12,
  1500. - EVENT_SAPPHIRON = 13,
  1501. - EVENT_KELTHUZAD = 14,
  1502. + BOSS_PATCHWERK = 0,
  1503. + BOSS_GROBBULUS = 1,
  1504. + BOSS_GLUTH = 2,
  1505. + BOSS_NOTH = 3,
  1506. + BOSS_HEIGAN = 4,
  1507. + BOSS_LOATHEB = 5,
  1508. + BOSS_ANUB = 6,
  1509. + BOSS_FAERLINA = 7,
  1510. + BOSS_MAEXXNA = 8,
  1511. + BOSS_THADDIUS = 9,
  1512. + BOSS_RAZUVIOUS = 10,
  1513. + BOSS_GOTHIK = 11,
  1514. + BOSS_HORSEMAN = 12,
  1515. + BOSS_SAPPHIRON = 13,
  1516. + BOSS_KELTHUZAD = 14,
  1517. MAX_ENCOUNTERS,
  1518. };
  1520. @@ -93,6 +93,7 @@ enum NXGOs
  1521. GO_THADDIUS_PORTAL = 181576, //Thadius portal
  1522. GO_MAEXXNA_PORTAL = 181575, //Maexxna portal
  1523. GO_HORSEMAN_PORTAL = 181578, //Four Horseman portal
  1524. +// GO_FROSTWYRM_PORTAL = 202278, //Frost Wyrm Wind portal
  1525. };
  1527. enum NXNPCs
  1528. @@ -126,6 +127,7 @@ enum NXMisc
  1529. // Spells
  1530. SPELL_ERUPTION = 29371,
  1531. SPELL_FROGGER_EXPLODE = 28433,
  1532. + SPELL_TELE_SAPPHIRON = 72617, // need spell of teleport add i dont know it ))
  1534. // Actions
  1535. ACTION_SAPPHIRON_BIRTH = 1
  1536. --
  1537. 2.24.1