panda review

Author: TimtyG

Framework/Intersect.Framework.Core/Color.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Reflection;
 using Intersect.Framework;
 using Intersect.Localization;
 using MessagePack;
@@ -9,7 +10,17 @@ namespace Intersect;
 [MessagePackObject]
 public partial class Color : IEquatable<Color>
 {
-
+    private static readonly Dictionary<string, Func<Color>> KnownColors;
+    static Color()
+    {
+        KnownColors = typeof(Color)
+            .GetProperties(BindingFlags.Public | BindingFlags.Static)
+            .Where(p => p.PropertyType == typeof(Color) && p.GetMethod != null)
+            .ToDictionary(
+                p => p.Name.ToLowerInvariant(),
+                p => (Func<Color>)(() => p.GetMethod?.Invoke(null, null) as Color ?? Color.White)
+            );
+    }
     public enum ChatColor
     {
 
@@ -289,7 +300,7 @@ public static Color FromRgba(int rgba)
         return new Color(a: a, r: r, g: g, b: b);
     }
 
-    public static Color? FromString(string val, Color? defaultColor = default)
+    public static Color? FromCsv(string val, Color? defaultColor = default)
     {
         if (string.IsNullOrEmpty(val))
         {
@@ -306,7 +317,29 @@ public static Color FromRgba(int rgba)
         return new Color(parts[0], parts[1], parts[2], parts[3]);
     }
 
-    public static implicit operator Color(string colorString) => FromString(colorString);
+    public static Color? FromString(string val, Color? defaultColor = default)
+    {
+        if (string.IsNullOrWhiteSpace(val))
+        {
+            return defaultColor;
+        }
+
+        val = val.Trim().ToLowerInvariant();
+
+        if (KnownColors.TryGetValue(val, out Func<Color>? colorFunc))
+        {
+            return colorFunc();
+        }
+
+        Color? parsedColor = Color.FromHex(val, defaultColor);
+
+        parsedColor ??= Color.FromCsv(val, defaultColor);
+
+        return parsedColor ?? defaultColor;
+    }
+
+
+    public static implicit operator Color(string colorString) => FromCsv(colorString);
 
     public static Color operator *(Color left, Color right) => new Color(
         a: (int)(left.A * right.A / 255f),

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

@@ -177,7 +177,7 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
             _promptLabel.ClearText();
             _writer = new Typewriter(parsedText.ToArray(), (text, color) =>
             {
-                _promptLabel.AddText(text, color, Alignments.Left, _promptTemplateLabel.Font);
+                _promptLabel.AppendText(text, color, Alignments.Left, _promptTemplateLabel.Font);
             });
         }
         Defer(

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

@@ -15,7 +15,7 @@ internal sealed class Typewriter
     private static long TypingSpeed => ClientConfiguration.Instance.TypewriterPartDelay;
 
     private int _offset;
-    private int _segmentIndex = 0;
+    private int _segmentIndex;
     private string? _lastText;
     private long _nextUpdateTime;
 
@@ -63,6 +63,8 @@ public void Write(string? soundName)
                 return;
             }
 
+            emitSound |= _offset % ClientConfiguration.Instance.TypewriterSoundFrequency == 0;
+
             var segment = _segments[_segmentIndex];
 
             if (_offset >= segment.Text.Length)
@@ -73,14 +75,12 @@ public void Write(string? soundName)
                 if (_segmentIndex >= _segments.Length)
                 {
                     End();
-                    return;
+                    continue;
                 }
 
                 segment = _segments[_segmentIndex];
             }
 
-            emitSound |= _offset % ClientConfiguration.Instance.TypewriterSoundFrequency == 0;
-
             string nextText;
             if (char.IsSurrogatePair(segment.Text, _offset))
             {
@@ -144,7 +144,7 @@ public void End()
             var segment = _segments[_segmentIndex];
             if (_offset < segment.Text.Length)
             {
-                _textWrittenHandler(segment.Text.Substring(_offset), segment.Color);
+                _textWrittenHandler(segment.Text[_offset..], segment.Color);
             }
             _segmentIndex++;
             _offset = 0;

Intersect.Client.Core/Utilities/TextColorParser.cs

@@ -5,45 +5,24 @@ namespace Intersect.Client.Utilities
 {
     public static class TextColorParser
     {
-        private static readonly Dictionary<string, Func<Color>> KnownColors = InitializeColorDictionary();
-        private static readonly Regex ColorTagRegex = new(@"\\c{([^}]*)}", RegexOptions.Compiled);
+        private static readonly Regex ColorTagRegex = new(@"(\\c{[^}]*})", RegexOptions.Compiled);
         private static readonly string SplitPattern = @"(\\c{[^}]*})";
 
-        private static Dictionary<string, Func<Color>> InitializeColorDictionary()
-        {
-            return typeof(Color)
-                .GetProperties(BindingFlags.Public | BindingFlags.Static)
-                .Where(p => p.PropertyType == typeof(Color))
-                .ToDictionary(
-                    p => p.Name.ToLowerInvariant(),
-                    p => (Func<Color>)(() => p.GetMethod?.Invoke(null, null) as Color ?? Color.White)
-                );
-        }
-
         public static List<ColorizedText> Parse(string text, Color defaultColor)
         {
-            var output = new List<ColorizedText>();
-            var segments = Regex.Split(text, SplitPattern)
-                .Where(s => !string.IsNullOrWhiteSpace(s));
+            var segments = ColorTagRegex.Split(text)
+                .Where(s => !string.IsNullOrWhiteSpace(s))
+                .ToArray();
 
+            var output = new List<ColorizedText>(segments.Length);
             var currentColor = defaultColor;
 
             foreach (var segment in segments)
             {
-                var match = ColorTagRegex.Match(segment);
-
-                if (match.Success)
+                if (segment.StartsWith("\\c{") && segment.EndsWith("}"))
                 {
-                    string colorCode = match.Groups[1].Value.ToLowerInvariant();
-
-                    if (KnownColors.TryGetValue(colorCode, out Func<Color>? colorFunc))
-                    {
-                        currentColor = colorFunc();
-                    }
-                    else
-                    {
-                        currentColor = Color.FromHex(colorCode, defaultColor) ?? defaultColor;
-                    }
+                    string colorCode = segment[3..^1].ToLowerInvariant();
+                    currentColor = Color.FromString(colorCode, defaultColor) ?? defaultColor;
                 }
                 else
                 {

Intersect.Client.Framework/Gwen/Control/RichLabel.cs

@@ -183,8 +183,8 @@ public void AppendText(string text, Color? color, Alignments alignment, GameFont
             var appendAlignment = alignment;
             var appendFont = font ?? lastTextBlock.Font;
 
-            if (appendAlignment != lastTextBlock.Alignment &&
-                appendColor != lastTextBlock.Color &&
+            if (appendAlignment != lastTextBlock.Alignment ||
+                appendColor != lastTextBlock.Color ||
                 appendFont != lastTextBlock.Font)
             {
                 AddText(text, color, alignment, font);