Guest User

Untitled

a guest
May 19th, 2018
142
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.49 KB | None | 0 0
  1. diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
  2. index 8b6cbf2..7a22825 100644
  3. -- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
  4. ++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
  5. @@ -36,16 +36,16 @@ EndContentData */
  6.  
  7. enum eEnums
  8. {
  9. -   SAY_PROGRESS_1      = -1000264,
  10. -   SAY_PROGRESS_2      = -1000265,
  11. -   SAY_PROGRESS_3      = -1000266,
  12. -   EMOTE_PROGRESS_4    = -1000267,
  13. -  SAY_AGGRO           = -1000268,
  14. -   SAY_PROGRESS_5      = -1000269,
  15. -   SAY_PROGRESS_6      = -1000270,
  16. -   SAY_PROGRESS_7      = -1000271,
  17. -   EMOTE_PROGRESS_8    = -1000272,
  18. -   SAY_PROGRESS_9      = -1000273,
  19. +   SAY_PROGRESS_1      = 0,
  20. +   SAY_PROGRESS_2      = 1,
  21. +   SAY_PROGRESS_3      = 2,
  22. +   EMOTE_PROGRESS_4    = 3,
  23. +   SAY_AGGRO           = 4,
  24. +   SAY_PROGRESS_5      = 5,
  25. +   SAY_PROGRESS_6      = 6,
  26. +   SAY_PROGRESS_7      = 7,
  27. +   EMOTE_PROGRESS_8    = 8,
  28. +   SAY_PROGRESS_9      = 9,
  29.  
  30.     QUEST_SUNKEN_TREASURE   = 665,
  31.     MOB_VENGEFUL_SURGE      = 2776
  32. @@ -73,24 +73,24 @@ class npc_professor_phizzlethorpe : public CreatureScript
  33.  
  34.                 switch (uiPointId)
  35.                 {
  36. -               case 4:DoScriptText(SAY_PROGRESS_2, me, player);break;
  37. -               case 5:DoScriptText(SAY_PROGRESS_3, me, player);break;
  38. -               case 8:DoScriptText(EMOTE_PROGRESS_4, me);break;
  39. +               case 4:Talk(SAY_PROGRESS_2, player);break;
  40. +               case 5:Talk(SAY_PROGRESS_3, player);break;
  41. +               case 8:Talk(EMOTE_PROGRESS_4);break;
  42.                 case 9:
  43.                     {
  44.                     me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
  45.                     me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
  46.                     break;
  47.                     }
  48. -               case 10:DoScriptText(SAY_PROGRESS_5, me, player);break;
  49. +               case 10:Talk(SAY_PROGRESS_5, player);break;
  50.                 case 11:
  51. -                   DoScriptText(SAY_PROGRESS_6, me, player);
  52. +                   Talk(SAY_PROGRESS_6, player);
  53.                     SetRun();
  54.                     break;
  55. -               case 19:DoScriptText(SAY_PROGRESS_7, me, player); break;
  56. +               case 19:Talk(SAY_PROGRESS_7, player); break;
  57.                 case 20:
  58. -                   DoScriptText(EMOTE_PROGRESS_8, me);
  59. -                   DoScriptText(SAY_PROGRESS_9, me, player);
  60. +                   Talk(EMOTE_PROGRESS_8);
  61. +                   Talk(SAY_PROGRESS_9, player);
  62.                     if (player)
  63.                         CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, me);
  64.                     break;
  65. @@ -104,7 +104,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
  66.  
  67.             void EnterCombat(Unit* /*who*/)
  68.             {
  69. -               DoScriptText(SAY_AGGRO, me);
  70. +               Talk(SAY_AGGRO, me);
  71.             }
  72.  
  73.             void UpdateAI(const uint32 diff)
  74. @@ -122,7 +122,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
  75.         {
  76.             if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE)
  77.             {
  78. -               DoScriptText(SAY_PROGRESS_1, creature, player);
  79. +               Talk(SAY_PROGRESS_1, creature, player);
  80.                 if (npc_escortAI* pEscortAI = CAST_AI(npc_professor_phizzlethorpeAI, (creature->AI())))
  81.                     pEscortAI->Start(false, false, player->GetGUID(), quest);
Add Comment
Please, Sign In to add comment