1. diff --git a/doc/script_commands.txt b/doc/script_commands.txt
  2. index b006040..e7fd382 100644
  3. --- a/doc/script_commands.txt
  4. +++ b/doc/script_commands.txt
  5. @@ -296,9 +296,9 @@ Where "A -> B" means that the command is executed from A with B as target.
  6. * !(data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL): terminate when condition is true
  7. data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL: terminate when condition is false
  9. -35 SCRIPT_COMMAND_SEND_AI_EVENT_AROUND * resultingSource = Creature, resultingTarget = Unit
  10. +35 SCRIPT_COMMAND_SEND_AI_EVENT * resultingSource = Creature, resultingTarget = Unit
  11. * datalong = AIEventType - limited only to EventAI supported events
  12. - * datalong2 = radius
  13. + * datalong2 = radius. If radius isn't provided and the target is a creature, then send AIEvent to target
  15. 36 SCRIPT_COMMAND_SET_FACING Turn resultingSource towards resultingTarget
  16. * resultingSource = Creature, resultingTarget WorldObject
  17. @@ -319,3 +319,9 @@ Where "A -> B" means that the command is executed from A with B as target.
  18. * datalong = mailTemplateId
  19. * datalong2: AlternativeSenderEntry. Use as sender-Entry of the sent mail
  20. * dataint1: Delay (>= 0) in Seconds
  21. +
  22. +39 SCRIPT_COMMAND_SET_FLY * resultingSource = Creature
  23. + * datalong = bool 0=off, 1=on
  24. + * data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL set UNIT_STAT_IGNORE_PATHFINDING
  25. +
  26. +40 SCRIPT_COMMAND_DESPAWN_GO * resultingTarget = GameObject
  27. diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
  28. index 9bbb2df..9bf88ed 100644
  29. --- a/src/game/CreatureAI.h
  30. +++ b/src/game/CreatureAI.h
  31. @@ -70,10 +70,14 @@ enum AIEventType
  32. AI_EVENT_CUSTOM_EVENTAI_A = 5, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  33. AI_EVENT_CUSTOM_EVENTAI_B = 6, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  34. AI_EVENT_GOT_CCED = 7, // Sender = CCed Npc, Invoker = Caster that CCed
  35. - MAXIMAL_AI_EVENT_EVENTAI = 8,
  36. + AI_EVENT_CUSTOM_EVENTAI_C = 8, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  37. + AI_EVENT_CUSTOM_EVENTAI_D = 9, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  38. + AI_EVENT_CUSTOM_EVENTAI_E = 10, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  39. + AI_EVENT_CUSTOM_EVENTAI_F = 11, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  40. + MAXIMAL_AI_EVENT_EVENTAI = 12,
  42. // Internal Use
  43. - AI_EVENT_CALL_ASSISTANCE = 10, // Sender = Attacked Npc, Invoker = Enemy
  44. + AI_EVENT_CALL_ASSISTANCE = 13, // Sender = Attacked Npc, Invoker = Enemy
  46. // Predefined for SD2
  47. AI_EVENT_START_ESCORT = 100, // Invoker = Escorting Player
  48. diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
  49. index 32cf3e2..a1c9269 100644
  50. --- a/src/game/ScriptMgr.cpp
  51. +++ b/src/game/ScriptMgr.cpp
  52. @@ -691,7 +691,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
  53. }
  54. break;
  55. }
  56. - case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND: // 35
  57. + case SCRIPT_COMMAND_SEND_AI_EVENT: // 35
  58. {
  59. if (tmp.sendAIEvent.eventType >= MAXIMAL_AI_EVENT_EVENTAI)
  60. {
  61. @@ -725,6 +725,9 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
  62. }
  63. break;
  64. }
  65. + case SCRIPT_COMMAND_SET_FLY: // 39
  66. + case SCRIPT_COMMAND_DESPAWN_GO: // 40
  67. + break;
  68. default:
  69. {
  70. sLog.outErrorDb("Table `%s` unknown command %u, skipping.", tablename, tmp.command);
  71. @@ -1864,14 +1867,19 @@ bool ScriptAction::HandleScriptStep()
  72. }
  73. return terminateResult;
  74. }
  75. - case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND: // 35
  76. + case SCRIPT_COMMAND_SEND_AI_EVENT: // 35
  77. {
  78. if (LogIfNotCreature(pSource))
  79. return false;
  80. if (LogIfNotUnit(pTarget))
  81. break;
  83. - ((Creature*)pSource)->AI()->SendAIEventAround(AIEventType(m_script->sendAIEvent.eventType), (Unit*)pTarget, 0, float(m_script->sendAIEvent.radius));
  84. + // if radius is provided send AI event around
  85. + if (m_script->sendAIEvent.radius)
  86. + ((Creature*)pSource)->AI()->SendAIEventAround(AIEventType(m_script->sendAIEvent.eventType), (Unit*)pTarget, 0, float(m_script->sendAIEvent.radius));
  87. + // else if no radius and target is creature send AI event to target
  88. + else if (pTarget->GetTypeId() == TYPEID_UNIT)
  89. + ((Creature*)pSource)->AI()->SendAIEvent(AIEventType(m_script->sendAIEvent.eventType), NULL, (Creature*)pTarget);
  90. break;
  91. }
  92. case SCRIPT_COMMAND_SET_FACING: // 36
  93. @@ -1952,6 +1960,38 @@ bool ScriptAction::HandleScriptStep()
  94. MailDraft(m_script->sendMail.mailTemplateId).SendMailTo(static_cast<Player*>(pTarget), sender, MAIL_CHECK_MASK_HAS_BODY, deliverDelay);
  95. break;
  96. }
  97. + case SCRIPT_COMMAND_SET_FLY: // 39
  98. + {
  99. + if (LogIfNotCreature(pSource))
  100. + break;
  101. +
  102. + // sometimes we need to ignore pathfinding for flying creatures
  103. + if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
  104. + {
  105. + if (m_script->fly.fly)
  106. + ((Creature*)pSource)->addUnitState(UNIT_STAT_IGNORE_PATHFINDING);
  107. + else
  108. + ((Creature*)pSource)->clearUnitState(UNIT_STAT_IGNORE_PATHFINDING);
  109. + }
  110. +
  111. + // enable / disable the fly anim flag
  112. + if (m_script->fly.fly)
  113. + pSource->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
  114. + else
  115. + pSource->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_FLY_ANIM);
  116. +
  117. + ((Creature*)pSource)->SetLevitate(m_script->fly.fly);
  118. + break;
  119. + }
  120. + case SCRIPT_COMMAND_DESPAWN_GO: // 40
  121. + {
  122. + if (LogIfNotGameObject(pTarget))
  123. + break;
  124. +
  125. + // ToDo: Change this to pGo->ForcedDespawn() when function is implemented!
  126. + ((GameObject*)pTarget)->SetLootState(GO_JUST_DEACTIVATED);
  127. + break;
  128. + }
  129. default:
  130. sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
  131. break;
  132. diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
  133. index 9b5069c..31e4f29 100644
  134. --- a/src/game/ScriptMgr.h
  135. +++ b/src/game/ScriptMgr.h
  136. @@ -101,7 +101,7 @@ enum ScriptCommand // resSource, resTar
  137. SCRIPT_COMMAND_XP_USER = 33, // source or target with Player, datalong = bool (0=off, 1=on)
  138. SCRIPT_COMMAND_TERMINATE_COND = 34, // datalong = condition_id, datalong2 = if != 0 then quest_id of quest that will be failed for player's group if the script is terminated
  139. // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL terminate when condition is false ELSE terminate when condition is true
  140. - SCRIPT_COMMAND_SEND_AI_EVENT_AROUND = 35, // resSource = Creature, resTarget = Unit
  141. + SCRIPT_COMMAND_SEND_AI_EVENT = 35, // resSource = Creature, resTarget = Unit
  142. // datalong = AIEventType
  143. // datalong2 = radius
  144. SCRIPT_COMMAND_SET_FACING = 36, // resSource = Creature, resTarget WorldObject. Turn resSource towards Taget
  145. @@ -117,6 +117,10 @@ enum ScriptCommand // resSource, resTar
  146. // datalong: Send mailTemplateId from resSource (if provided) to player resTarget
  147. // datalong2: AlternativeSenderEntry. Use as sender-Entry
  148. // dataint1: Delay (>= 0) in Seconds
  149. + SCRIPT_COMMAND_SET_FLY = 39, // resSource = Creature
  150. + // datalong = bool 0=off, 1=on
  151. + // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL set UNIT_STAT_IGNORE_PATHFINDING
  152. + SCRIPT_COMMAND_DESPAWN_GO = 40, // resTarget = GameObject
  153. };
  155. #define MAX_TEXT_ID 4 // used for SCRIPT_COMMAND_TALK, SCRIPT_COMMAND_EMOTE, SCRIPT_COMMAND_CAST_SPELL, SCRIPT_COMMAND_TERMINATE_SCRIPT
  156. @@ -364,6 +368,14 @@ struct ScriptInfo
  157. uint32 altSender; // datalong2;
  158. } sendMail;
  160. + struct // SCRIPT_COMMAND_SET_FLY (39)
  161. + {
  162. + uint32 fly; // datalong
  163. + uint32 empty; // datalong2
  164. + } fly;
  165. +
  166. + // datalong unsed // SCRIPT_COMMAND_DESPAWN_GO (40)
  167. +
  168. struct
  169. {
  170. uint32 data[2];
  171. @@ -406,6 +418,7 @@ struct ScriptInfo
  172. case SCRIPT_COMMAND_CLOSE_DOOR:
  173. case SCRIPT_COMMAND_ACTIVATE_OBJECT:
  174. case SCRIPT_COMMAND_GO_LOCK_STATE:
  175. + case SCRIPT_COMMAND_DESPAWN_GO:
  176. return false;
  177. default:
  178. return true;
  179. @@ -427,6 +440,7 @@ struct ScriptInfo
  180. case SCRIPT_COMMAND_TERMINATE_COND:
  181. case SCRIPT_COMMAND_SET_FACING:
  182. case SCRIPT_COMMAND_MOVE_DYNAMIC:
  183. + case SCRIPT_COMMAND_SET_FLY:
  184. return true;
  185. default:
  186. return false;