From b46b724af8add49baa427c07815ad9cd44c726ef Mon Sep 17 00:00:00 2001 From: FAQ Date: Sun, 25 Feb 2018 14:47:31 +0200 Subject: [PATCH] Adding SMART_ACTION_RESPAWN_BY_SPAWNID https://github.com/TrinityCore/TrinityCore/commit/691c67f0be09095a34421043baf245fdf28e5d04 +Rename SMART_ACTION_RESPAWN_TARGET https://github.com/TrinityCore/TrinityCore/commit/0850b5ff39b187d8a1adb032dfd7900d4474cfaf --- CSV/SAI_ActionType.csv | 7 ++++- MainUnit.pas | 61 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/CSV/SAI_ActionType.csv b/CSV/SAI_ActionType.csv index e58fe69..b09bffd 100644 --- a/CSV/SAI_ActionType.csv +++ b/CSV/SAI_ActionType.csv @@ -67,7 +67,7 @@ 67;SMART_ACTION_CREATE_TIMED_EVENT 68;SMART_ACTION_PLAYMOVIE 69;SMART_ACTION_MOVE_TO_POS -70;SMART_ACTION_RESPAWN_TARGET +70;SMART_ACTION_ENABLE_TEMP_GOBJ 71;SMART_ACTION_EQUIP 72;SMART_ACTION_CLOSE_GOSSIP 73;SMART_ACTION_TRIGGER_TIMED_EVENT @@ -126,3 +126,8 @@ 126;SMART_ACTION_REMOVE_ALL_GAMEOBJECTS 127;SMART_ACTION_STOP_MOTION 128;SMART_ACTION_PLAY_ANIMKIT +129;SMART_ACTION_SCENE_PLAY +130;SMART_ACTION_SCENE_CANCEL +131;SMART_ACTION_SPAWN_SPAWNGROUP +132;SMART_ACTION_DESPAWN_SPAWNGROUP +133;SMART_ACTION_RESPAWN_BY_SPAWNID diff --git a/MainUnit.pas b/MainUnit.pas index 66965d9..1973970 100644 --- a/MainUnit.pas +++ b/MainUnit.pas @@ -11773,15 +11773,15 @@ procedure TMainForm.SetSAIAction(t: integer); lbcyaction_type.Hint := 'PointId is called by SMART_EVENT_MOVEMENTINFORM. Continue this action with the TARGET_TYPE column. Use any target_type, and use target_x, target_y, target_z, target_o as the coordinates'; edcyaction_type.Hint := lbcyaction_type.Hint; end; - 70: //SMART_ACTION_RESPAWN_TARGET + 70: //SMART_ACTION_ENABLE_TEMP_GOBJ begin - lbcyaction_param1.Caption := 'only GOs in ms'; + lbcyaction_param1.Caption := 'Despawn timer'; lbcyaction_param2.Caption := ''; lbcyaction_param3.Caption := ''; lbcyaction_param4.Caption := ''; lbcyaction_param5.Caption := ''; lbcyaction_param6.Caption := ''; - lbcyaction_type.Hint := 'Respawntime in seconds for gameobjects (only GOs)'; + lbcyaction_type.Hint := 'DespawnTimer (sec)'; edcyaction_type.Hint := lbcyaction_type.Hint; end; 71: //SMART_ACTION_EQUIP @@ -12426,6 +12426,61 @@ procedure TMainForm.SetSAIAction(t: integer); lbcyaction_type.Hint := 'dont use on 3.3.5a'; edcyaction_type.Hint := lbcyaction_type.Hint; end; + 129: //SMART_ACTION_SCENE_PLAY + begin + lbcyaction_param1.Caption := ''; + lbcyaction_param2.Caption := ''; + lbcyaction_param3.Caption := ''; + lbcyaction_param4.Caption := ''; + lbcyaction_param5.Caption := ''; + lbcyaction_param6.Caption := ''; + lbcyaction_type.Hint := 'dont use on 3.3.5a'; + edcyaction_type.Hint := lbcyaction_type.Hint; + end; + 130: //SMART_ACTION_SCENE_CANCEL + begin + lbcyaction_param1.Caption := ''; + lbcyaction_param2.Caption := ''; + lbcyaction_param3.Caption := ''; + lbcyaction_param4.Caption := ''; + lbcyaction_param5.Caption := ''; + lbcyaction_param6.Caption := ''; + lbcyaction_type.Hint := 'dont use on 3.3.5a'; + edcyaction_type.Hint := lbcyaction_type.Hint; + end; + 131: //SMART_ACTION_SPAWN_SPAWNGROUP + begin + lbcyaction_param1.Caption := 'Group ID'; + lbcyaction_param2.Caption := 'min secs'; + lbcyaction_param3.Caption := 'max secs'; + lbcyaction_param4.Caption := 'spawnflags'; + lbcyaction_param5.Caption := ''; + lbcyaction_param6.Caption := ''; + lbcyaction_type.Hint := ''; + edcyaction_type.Hint := lbcyaction_type.Hint; + end; + 132: //SMART_ACTION_DESPAWN_SPAWNGROUP + begin + lbcyaction_param1.Caption := 'Group ID'; + lbcyaction_param2.Caption := 'min secs'; + lbcyaction_param3.Caption := 'max secs'; + lbcyaction_param4.Caption := 'spawnflags'; + lbcyaction_param5.Caption := ''; + lbcyaction_param6.Caption := ''; + lbcyaction_type.Hint := ''; + edcyaction_type.Hint := lbcyaction_type.Hint; + end; + 133: //SMART_ACTION_RESPAWN_BY_SPAWNID + begin + lbcyaction_param1.Caption := 'spawnType'; + lbcyaction_param2.Caption := 'spawnId'; + lbcyaction_param3.Caption := ''; + lbcyaction_param4.Caption := ''; + lbcyaction_param5.Caption := ''; + lbcyaction_param6.Caption := ''; + lbcyaction_type.Hint := ''; + edcyaction_type.Hint := lbcyaction_type.Hint; + end; end; SAI_Action := t; end;