Attempt to fix interruptions by adding more sass

setup/randomizer.app.iss

@@ -4,7 +4,7 @@
 #include "CodeDependencies.iss"
 
 #define MyAppName "SMZ3 Cas' Randomizer"
-#define MyAppVersion "4.2.0"
+#define MyAppVersion "4.2.1"
 #define MyAppPublisher "Vivelin"
 #define MyAppURL "https://github.com/Vivelin/SMZ3Randomizer"
 #define MyAppExeName "Randomizer.App.exe"

src/Randomizer.App/Randomizer.App.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>chozo20.ico</ApplicationIcon>
-    <Version>4.2.0</Version>
+    <Version>4.2.1</Version>
     <Title>SMZ3 Cas' Randomizer</Title>
     <AssemblyTitle>SMZ3 Cas' Randomizer</AssemblyTitle>
     <Authors>Vivelin</Authors>

src/Randomizer.SMZ3.Tracking/Configuration/ResponseConfig.cs

@@ -607,6 +607,11 @@ public class ResponseConfig
         /// </summary>
         public SchrodingersString? Interrupted { get; init; }
 
+        /// <summary>
+        /// Gets the phrases to respond with when Tracker has been interrupted too many times.
+        /// </summary>
+        public SchrodingersString? InterruptedTooManyTimes { get; init; }
+
         /// <summary>
         /// Gets a dictionary that contains the phrases to respond with when no
         /// voice commands have been issued after a certain period of time, as

src/Randomizer.SMZ3.Tracking/Tracker.cs

@@ -1883,16 +1883,32 @@ public void StopPegWorldMode(float? confidence = null)
 
         internal void HandleInterruption()
         {
+            _interruptions++;
+            _logger.LogDebug("Tracker has been interrupted {Interruptions} time(s)", _interruptions);
+
             if (Options.InterruptionTolerance < 0
-                || (++_interruptions % Options.InterruptionTolerance) != 0)
+                || (_interruptions % Options.InterruptionTolerance) != 0)
             {
+                _logger.LogDebug("Tracker is tolerating the interruptions (Tolerance: {Tolerance})", Options.InterruptionTolerance);
                 return;
             }
 
-            if (Responses.Interrupted != null)
+            if (_interruptions >= Options.InterruptionLimit
+                && Responses.InterruptedTooManyTimes != null)
+            {
+                _interruptions = 0;
+                _tts.SpeakAsyncCancelAll();
+                _speechQueue.Clear();
+                _logger.LogDebug("Tracker has had enough and reach her interruption limit of {Limit}", Options.InterruptionLimit);
+
+                Say(x => x.InterruptedTooManyTimes);
+            }
+            else if (Responses.Interrupted != null)
             {
                 var remainingSpeech = _speechQueue.ToList();
                 _tts.SpeakAsyncCancelAll();
+                _speechQueue.Clear();
+                _logger.LogDebug("Tracker doesn't like being interrupted. Still has {QueueCount} items on the TTS queue.", remainingSpeech.Count);
 
                 Say(x => x.Interrupted);
 

src/Randomizer.SMZ3.Tracking/TrackerOptions.cs

@@ -66,5 +66,11 @@ public record TrackerOptions
         /// interrupted before speaking up.
         /// </summary>
         public int InterruptionTolerance { get; set; } = 2;
+
+        /// <summary>
+        /// Gets or sets the number of times Tracker will tolerate being
+        /// interrupted before quitting.
+        /// </summary>
+        public int InterruptionLimit { get; set; } = 5;
     }
 }

src/Randomizer.SMZ3.Tracking/tracker.json

@@ -1272,6 +1272,12 @@
       "Do you mind? <break strength='weak'/> Anyway...",
       "It's not polite to talk over other people, you know. <break strength='weak'/> As I was saying..."
     ],
+    "InterruptedTooManyTimes": [
+      "Shut up already.",
+      "Fine, I'll shut up. <break time='60s'/>",
+      "I've had enough of this. I'm taking a break. <break time='60s'/>",
+      "That's it. I'm taking a break. <break time='60s'/>"
+    ],
     "TrackedItem": [
       "Toggling {0} on.",
       "Toggled {0} on.",
@@ -1973,6 +1979,15 @@
       "Response": [
         "<break time='2s'/> Pfft."
       ]
+    },
+    {
+      "Phrases": [ "I'm sorry", "I apologize" ],
+      "Response": [
+        "Oh, fine.",
+        "You better.",
+        "Whatever.",
+        "Say it like you mean it."
+      ]
     }
   ]
 }