1. diff --git a/doc/script_commands.txt b/doc/script_commands.txt
  2. index b006040..8e8cada 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,11 @@ 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_RESPAWN_SELF * resultingTarget = Creature
  23. +
  24. +40 SCRIPT_COMMAND_SET_FLY * resultingSource = Creature
  25. + * datalong = bool 0=off, 1=on
  26. + * data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL use SetCanFly() instead of SetLevitate() move flag
  27. +
  28. +41 SCRIPT_COMMAND_DESPAWN_GO * resultingTarget = GameObject
  29. diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
  30. index 9bbb2df..9bf88ed 100644
  31. --- a/src/game/CreatureAI.h
  32. +++ b/src/game/CreatureAI.h
  33. @@ -70,10 +70,14 @@ enum AIEventType
  34. AI_EVENT_CUSTOM_EVENTAI_A = 5, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  35. AI_EVENT_CUSTOM_EVENTAI_B = 6, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  36. AI_EVENT_GOT_CCED = 7, // Sender = CCed Npc, Invoker = Caster that CCed
  37. - MAXIMAL_AI_EVENT_EVENTAI = 8,
  38. + AI_EVENT_CUSTOM_EVENTAI_C = 8, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  39. + AI_EVENT_CUSTOM_EVENTAI_D = 9, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  40. + AI_EVENT_CUSTOM_EVENTAI_E = 10, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  41. + AI_EVENT_CUSTOM_EVENTAI_F = 11, // Sender = Npc that throws custom event, Invoker = TARGET_T_ACTION_INVOKER (if exists)
  42. + MAXIMAL_AI_EVENT_EVENTAI = 12,
  44. // Internal Use
  45. - AI_EVENT_CALL_ASSISTANCE = 10, // Sender = Attacked Npc, Invoker = Enemy
  46. + AI_EVENT_CALL_ASSISTANCE = 13, // Sender = Attacked Npc, Invoker = Enemy
  48. // Predefined for SD2
  49. AI_EVENT_START_ESCORT = 100, // Invoker = Escorting Player
  50. diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
  51. index 32cf3e2..c95bbd0 100644
  52. --- a/src/game/ScriptMgr.cpp
  53. +++ b/src/game/ScriptMgr.cpp
  54. @@ -691,7 +691,7 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
  55. }
  56. break;
  57. }
  58. - case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND: // 35
  59. + case SCRIPT_COMMAND_SEND_AI_EVENT: // 35
  60. {
  61. if (tmp.sendAIEvent.eventType >= MAXIMAL_AI_EVENT_EVENTAI)
  62. {
  63. @@ -725,6 +725,10 @@ void ScriptMgr::LoadScripts(ScriptMapMapName& scripts, const char* tablename)
  64. }
  65. break;
  66. }
  67. + case SCRIPT_COMMAND_RESPAWN_SELF: // 39
  68. + case SCRIPT_COMMAND_SET_FLY: // 40
  69. + case SCRIPT_COMMAND_DESPAWN_GO: // 41
  70. + break;
  71. default:
  72. {
  73. sLog.outErrorDb("Table `%s` unknown command %u, skipping.", tablename, tmp.command);
  74. @@ -1864,14 +1868,19 @@ bool ScriptAction::HandleScriptStep()
  75. }
  76. return terminateResult;
  77. }
  78. - case SCRIPT_COMMAND_SEND_AI_EVENT_AROUND: // 35
  79. + case SCRIPT_COMMAND_SEND_AI_EVENT: // 35
  80. {
  81. if (LogIfNotCreature(pSource))
  82. return false;
  83. if (LogIfNotUnit(pTarget))
  84. break;
  86. - ((Creature*)pSource)->AI()->SendAIEventAround(AIEventType(m_script->sendAIEvent.eventType), (Unit*)pTarget, 0, float(m_script->sendAIEvent.radius));
  87. + // if radius is provided send AI event around
  88. + if (m_script->sendAIEvent.radius)
  89. + ((Creature*)pSource)->AI()->SendAIEventAround(AIEventType(m_script->sendAIEvent.eventType), (Unit*)pTarget, 0, float(m_script->sendAIEvent.radius));
  90. + // else if no radius and target is creature send AI event to target
  91. + else if (pTarget->GetTypeId() == TYPEID_UNIT)
  92. + ((Creature*)pSource)->AI()->SendAIEvent(AIEventType(m_script->sendAIEvent.eventType), NULL, (Creature*)pTarget);
  93. break;
  94. }
  95. case SCRIPT_COMMAND_SET_FACING: // 36
  96. @@ -1952,6 +1961,43 @@ bool ScriptAction::HandleScriptStep()
  97. MailDraft(m_script->sendMail.mailTemplateId).SendMailTo(static_cast<Player*>(pTarget), sender, MAIL_CHECK_MASK_HAS_BODY, deliverDelay);
  98. break;
  99. }
  100. + case SCRIPT_COMMAND_RESPAWN_SELF: // 39
  101. + {
  102. + // TODO - Remove this check after a while
  103. + if (pTarget && pTarget->GetTypeId() != TYPEID_UNIT && pSource && pSource->GetTypeId() == TYPEID_UNIT)
  104. + {
  105. + sLog.outErrorDb("DB-SCRIPTS: Process table `%s` id %u, command %u target must be creature, but (only) source is, use data_flags to fix", m_table, m_script->id, m_script->command);
  106. + pTarget = pSource;
  107. + }
  108. +
  109. + if (LogIfNotCreature(pTarget))
  110. + break;
  111. +
  112. + ((Creature*)pTarget)->Respawn();
  113. +
  114. + break;
  115. + }
  116. + case SCRIPT_COMMAND_SET_FLY: // 40
  117. + {
  118. + if (LogIfNotCreature(pSource))
  119. + break;
  120. +
  121. + if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
  122. + ((Creature*)pSource)->SetCanFly(!m_script->fly.fly);
  123. + else
  124. + ((Creature*)pSource)->SetLevitate(!m_script->fly.fly);
  125. +
  126. + break;
  127. + }
  128. + case SCRIPT_COMMAND_DESPAWN_GO: // 41
  129. + {
  130. + if (LogIfNotGameObject(pTarget))
  131. + break;
  132. +
  133. + // ToDo: Change this to pGo->ForcedDespawn() when function is implemented!
  134. + ((GameObject*)pTarget)->SetLootState(GO_JUST_DEACTIVATED);
  135. + break;
  136. + }
  137. default:
  138. sLog.outErrorDb(" DB-SCRIPTS: Process table `%s` id %u, command %u unknown command used.", m_table, m_script->id, m_script->command);
  139. break;
  140. diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
  141. index 9b5069c..a4a4f40 100644
  142. --- a/src/game/ScriptMgr.h
  143. +++ b/src/game/ScriptMgr.h
  144. @@ -101,7 +101,7 @@ enum ScriptCommand // resSource, resTar
  145. SCRIPT_COMMAND_XP_USER = 33, // source or target with Player, datalong = bool (0=off, 1=on)
  146. 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
  147. // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL terminate when condition is false ELSE terminate when condition is true
  148. - SCRIPT_COMMAND_SEND_AI_EVENT_AROUND = 35, // resSource = Creature, resTarget = Unit
  149. + SCRIPT_COMMAND_SEND_AI_EVENT = 35, // resSource = Creature, resTarget = Unit
  150. // datalong = AIEventType
  151. // datalong2 = radius
  152. SCRIPT_COMMAND_SET_FACING = 36, // resSource = Creature, resTarget WorldObject. Turn resSource towards Taget
  153. @@ -117,6 +117,11 @@ enum ScriptCommand // resSource, resTar
  154. // datalong: Send mailTemplateId from resSource (if provided) to player resTarget
  155. // datalong2: AlternativeSenderEntry. Use as sender-Entry
  156. // dataint1: Delay (>= 0) in Seconds
  157. + SCRIPT_COMMAND_RESPAWN_SELF = 39, // resSource = Creature
  158. + SCRIPT_COMMAND_SET_FLY = 40, // resSource = Creature
  159. + // datalong = bool 0=off, 1=on
  160. + // data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL use SetCanFly() instead of SetLevitate() move flag
  161. + SCRIPT_COMMAND_DESPAWN_GO = 41, // resTarget = GameObject
  162. };
  164. #define MAX_TEXT_ID 4 // used for SCRIPT_COMMAND_TALK, SCRIPT_COMMAND_EMOTE, SCRIPT_COMMAND_CAST_SPELL, SCRIPT_COMMAND_TERMINATE_SCRIPT
  165. @@ -364,6 +369,16 @@ struct ScriptInfo
  166. uint32 altSender; // datalong2;
  167. } sendMail;
  169. + // datalong unused // SCRIPT_COMMAND_RESPAWN_SELF (39)
  170. +
  171. + struct // SCRIPT_COMMAND_SET_FLY (40)
  172. + {
  173. + uint32 fly; // datalong
  174. + uint32 empty; // datalong2
  175. + } fly;
  176. +
  177. + // datalong unsed // SCRIPT_COMMAND_DESPAWN_GO (41)
  178. +
  179. struct
  180. {
  181. uint32 data[2];
  182. @@ -406,6 +421,7 @@ struct ScriptInfo
  183. case SCRIPT_COMMAND_CLOSE_DOOR:
  184. case SCRIPT_COMMAND_ACTIVATE_OBJECT:
  185. case SCRIPT_COMMAND_GO_LOCK_STATE:
  186. + case SCRIPT_COMMAND_DESPAWN_GO:
  187. return false;
  188. default:
  189. return true;
  190. @@ -427,6 +443,7 @@ struct ScriptInfo
  191. case SCRIPT_COMMAND_TERMINATE_COND:
  192. case SCRIPT_COMMAND_SET_FACING:
  193. case SCRIPT_COMMAND_MOVE_DYNAMIC:
  194. + case SCRIPT_COMMAND_SET_FLY:
  195. return true;
  196. default:
  197. return false;