Add colorized segments to typewriter

Author: TimtyG

Intersect.Client.Core/Interface/Game/EventWindow.cs

@@ -175,9 +175,11 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         if (_typewriting)
         {
             _promptLabel.ClearText();
-            _writer = new Typewriter(_dialog.Prompt ?? string.Empty, text => _promptLabel.AppendText(text, _promptTemplateLabel));
+            _writer = new Typewriter(parsedText.ToArray(), (text, color) =>
+            {
+                _promptLabel.AddText(text, color, Alignments.Left, _promptTemplateLabel.Font);
+            });
         }
-
         Defer(
             () =>
             {

Intersect.Client.Core/Interface/Game/Typewriting/Typewriter.cs

@@ -1,38 +1,38 @@
 using Intersect.Client.Core;
+using Intersect.Client.Utilities;
 using Intersect.Configuration;
 using Intersect.Utilities;
 
 namespace Intersect.Client.Interface.Game.Typewriting;
 
 internal sealed class Typewriter
 {
-    public delegate void TextWrittenHandler(string text);
-
+    public delegate void TextWrittenHandler(string text, Color color);
     private static HashSet<string> FullStops => ClientConfiguration.Instance.TypewriterFullStops;
     private static long FullStopSpeed => ClientConfiguration.Instance.TypewriterFullStopDelay;
     private static HashSet<string> PartialStops => ClientConfiguration.Instance.TypewriterPauses;
     private static long PartialStopSpeed => ClientConfiguration.Instance.TypewriterPauseDelay;
     private static long TypingSpeed => ClientConfiguration.Instance.TypewriterPartDelay;
 
     private int _offset;
+    private int _segmentIndex = 0;
     private string? _lastText;
     private long _nextUpdateTime;
 
     private readonly TextWrittenHandler _textWrittenHandler;
-    private readonly string _text;
+    private readonly ColorizedText[] _segments;
 
     public bool IsDone { get; private set; }
     public long DoneAtMilliseconds { get; private set; }
 
-    public Typewriter(string text, TextWrittenHandler textWrittenHandler)
+    public Typewriter(ColorizedText[] segments, TextWrittenHandler textWrittenHandler)
     {
-        _text = text.ReplaceLineEndings("\n");
+        _segments = segments;
         _textWrittenHandler = textWrittenHandler;
         _nextUpdateTime = Timing.Global.MillisecondsUtc;
-
+        _segmentIndex = 0;
         _offset = 0;
         _lastText = null;
-
         IsDone = false;
     }
 
@@ -43,7 +43,7 @@ public void Write(string? soundName)
             return;
         }
 
-        if (_offset >= _text.Length)
+        if (_segmentIndex >= _segments.Length)
         {
             End();
             return;
@@ -57,28 +57,44 @@ public void Write(string? soundName)
         var emitSound = false;
         while (_nextUpdateTime <= Timing.Global.MillisecondsUtc)
         {
-            if (_offset >= _text.Length)
+            if (_segmentIndex >= _segments.Length)
             {
                 End();
-                break;
+                return;
+            }
+
+            var segment = _segments[_segmentIndex];
+
+            if (_offset >= segment.Text.Length)
+            {
+                _offset = 0;
+                _segmentIndex++;
+
+                if (_segmentIndex >= _segments.Length)
+                {
+                    End();
+                    return;
+                }
+
+                segment = _segments[_segmentIndex];
             }
 
             emitSound |= _offset % ClientConfiguration.Instance.TypewriterSoundFrequency == 0;
 
             string nextText;
-            if (char.IsSurrogatePair(_text, _offset))
+            if (char.IsSurrogatePair(segment.Text, _offset))
             {
-                nextText = _text[_offset..(_offset + 2)];
+                nextText = segment.Text[_offset..(_offset + 2)];
                 _offset += 2;
             }
             else
             {
-                nextText = _text[_offset..(_offset + 1)];
+                nextText = segment.Text[_offset..(_offset + 1)];
                 ++_offset;
             }
 
             _nextUpdateTime += GetTypingDelayFor(nextText, _lastText);
-            _textWrittenHandler(nextText);
+            _textWrittenHandler(nextText, segment.Color);
             _lastText = nextText;
         }
 
@@ -118,14 +134,20 @@ private static long GetTypingDelayFor(string next, string? last)
 
     public void End()
     {
-        if (IsDone || _text.Length < 1)
+        if (IsDone)
         {
             return;
         }
 
-        if (_offset < _text.Length)
+        while (_segmentIndex < _segments.Length)
         {
-            _textWrittenHandler(_text[_offset..]);
+            var segment = _segments[_segmentIndex];
+            if (_offset < segment.Text.Length)
+            {
+                _textWrittenHandler(segment.Text.Substring(_offset), segment.Color);
+            }
+            _segmentIndex++;
+            _offset = 0;
         }
 
         IsDone = true;