diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index 06f2d9a41..99cb9c12f 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -221,12 +221,13 @@ "7510": 0.1, "7511": 0.1, "7513": 0.6, - "7514": 0.6, + "7514": 0.1, "7517": 0.6, "7518": 0.6, "7519": 0.6, "7520": 0.6, "7521": 0.6, + "7523": 0.6, "7524": 0.1, "7525": 0.6, "7526": 0.6, @@ -351,6 +352,7 @@ "16525": 0.1, "16526": 0.6, "16527": 0.6, + "16530": 0.6, "16531": 0.6, "16532": 0.6, "16533": 0.1, diff --git a/RotationSolver/SpeechHelper.cs b/RotationSolver/SpeechHelper.cs index 006c2d29c..6f176f59e 100644 --- a/RotationSolver/SpeechHelper.cs +++ b/RotationSolver/SpeechHelper.cs @@ -1,4 +1,6 @@ -using Dalamud.Logging; +using Dalamud.Game.Text.SeStringHandling; +using Dalamud.Game.Text.SeStringHandling.Payloads; +using Dalamud.Logging; using Dalamud.Plugin; using ECommons.DalamudServices; using ECommons.Reflection; @@ -13,6 +15,7 @@ internal static class SpeechHelper static object _manager = null; static MethodInfo _stop = null; static bool _showed = false; + internal static void Speak(string text) { if(_textToTalk == null) @@ -33,11 +36,18 @@ internal static void Speak(string text) try { _stop?.Invoke(_manager, Array.Empty()); - _say?.Invoke(_textToTalk, new object[] { null, text, 1 }); + try + { + _say?.Invoke(_textToTalk, new object[] { null, text, 1 }); + } + catch + { + _say?.Invoke(_textToTalk, new object[] { null, new SeString(new TextPayload("Rotation Solver")) , text, 1 }); + } } catch (Exception ex) { - PluginLog.Warning(ex, "something wrong with TTT"); + PluginLog.Warning(ex, "Something wrong with TTT."); } } } \ No newline at end of file