fix: don't initialize TypeWriter if it's disabled

Author: pandinocoder

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

@@ -2,11 +2,13 @@
 using Intersect.Client.Core.Controls;
 using Intersect.Client.Entities.Events;
 using Intersect.Client.Framework.Content;
+using Intersect.Client.Framework.Database;
 using Intersect.Client.Framework.File_Management;
 using Intersect.Client.Framework.Gwen.Control;
 using Intersect.Client.General;
 using Intersect.Client.Interface.Game.Typewriting;
 using Intersect.Client.Localization;
+using Intersect.Client.MonoGame.Database;
 using Intersect.Client.Networking;
 using Intersect.Configuration;
 using Intersect.Enums;
@@ -28,7 +30,7 @@ public partial class EventWindow : ImagePanel
     private readonly Button _buttonEventResponse3;
     private readonly Button _buttonEventResponse4;
 
-    private readonly Typewriter _writer;
+    private readonly Typewriter? _writer;
     private bool _isTypewriting = false;
     private readonly long _typewriterResponseDelay = ClientConfiguration.Instance.TypewriterResponseDelay;
 
@@ -62,7 +64,7 @@ public EventWindow(Canvas gameCanvas) : base(gameCanvas, nameof(EventWindow))
         _buttonEventResponse4 = new Button(this, "Response4Button");
         _buttonEventResponse4.Clicked += (s, e) => CloseEventResponse(EventResponseType.FourOption);
 
-        _writer = new Typewriter();
+        _writer = Globals.Database.TypewriterBehavior == TypewriterBehavior.Off ? default : new Typewriter();
 
         Clicked += (s, e) => SkipTypewriting();
         Hide();
@@ -93,15 +95,15 @@ public void Update()
             var voiceIdx = Randomization.Next(0, ClientConfiguration.Instance.TypewriterSounds.Count);
 
             // Always show option 1 ("continue" if options empty)
-            _buttonEventResponse1.IsHidden = !_writer.IsDone;
-            _buttonEventResponse2.IsHidden = !_writer.IsDone || string.IsNullOrEmpty(CurrentDialog.Opt2);
-            _buttonEventResponse3.IsHidden = !_writer.IsDone || string.IsNullOrEmpty(CurrentDialog.Opt3);
-            _buttonEventResponse4.IsHidden = !_writer.IsDone || string.IsNullOrEmpty(CurrentDialog.Opt4);
+            _buttonEventResponse1.IsHidden = !(_writer?.IsDone ?? true);
+            _buttonEventResponse2.IsHidden = !(_writer?.IsDone ?? true) || string.IsNullOrEmpty(CurrentDialog.Opt2);
+            _buttonEventResponse3.IsHidden = !(_writer?.IsDone ?? true) || string.IsNullOrEmpty(CurrentDialog.Opt3);
+            _buttonEventResponse4.IsHidden = !(_writer?.IsDone ?? true) || string.IsNullOrEmpty(CurrentDialog.Opt4);
 
-            _writer.Write(ClientConfiguration.Instance.TypewriterSounds.ElementAtOrDefault(voiceIdx));
-            if (_writer.IsDone)
+            _writer?.Write(ClientConfiguration.Instance.TypewriterSounds.ElementAtOrDefault(voiceIdx));
+            if (_writer?.IsDone ?? true)
             {
-                var disableResponse = Timing.Global.MillisecondsUtc - _writer.DoneAtMilliseconds < _typewriterResponseDelay;
+                var disableResponse = _writer != default && Timing.Global.MillisecondsUtc - _writer.DoneAtMilliseconds < _typewriterResponseDelay;
                 _buttonEventResponse1.IsDisabled = disableResponse;
                 _buttonEventResponse2.IsDisabled = disableResponse;
                 _buttonEventResponse3.IsDisabled = disableResponse;
@@ -205,7 +207,7 @@ private void ShowDialog(RichLabel dialogLabel, Label dialogLabelTemplate, Scroll
         // Do this _after_ sizing so we have lines broken up
         if (_isTypewriting)
         {
-            _writer.Initialize(dialogLabel.FormattedLabels);
+            _writer?.Initialize(dialogLabel.FormattedLabels);
             _buttonEventResponse1.Hide();
             _buttonEventResponse2.Hide();
             _buttonEventResponse3.Hide();
@@ -217,7 +219,7 @@ private void ShowDialog(RichLabel dialogLabel, Label dialogLabelTemplate, Scroll
 
     public void CloseEventResponse(EventResponseType response)
     {
-        if (!_writer.IsDone)
+        if (!(_writer?.IsDone ?? true))
         {
             SkipTypewriting();
             return;

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

@@ -29,8 +29,10 @@ public void Initialize(List<Label> labels)
         _nextUpdateTime = Timing.Global.MillisecondsUtc;
         _labels = labels;
         _lines = _labels.Select(l => l.Text).ToArray();
-        _labels.ForEach(l =>
-            l.SetText(string.Empty)); // Clear the text from the labels. The writer is the captain now
+        foreach (var label in _labels)
+        {
+            label.SetText(string.Empty);
+        }
         _lineIndex = 0;
         _charIndex = 0;
         _lastChar = null;
@@ -58,7 +60,7 @@ public void Write(string? voice)
             return;
         }
 
-        if (_lineIndex >= _lineCount || _labels[_lineIndex] == null)
+        if (_lineIndex != Math.Clamp(_lineIndex, 0, Math.Min(_lineCount, _labels.Count)))
         {
             End();
             return;
@@ -86,7 +88,7 @@ public void Write(string? voice)
         }
 
         _lastChar = currentLine[_charIndex - 1];
-        var written = currentLine.Substring(0, _charIndex);
+        var written = currentLine[.._charIndex];
         _labels[_lineIndex].SetText(written);
 
         _nextUpdateTime = Timing.Global.MillisecondsUtc + GetTypingDelayFor(currentLine[_charIndex], _lastChar);

Intersect.Client.Framework/Database/GameDatabase.cs

@@ -58,11 +58,13 @@ public abstract partial class GameDatabase
     public bool ShowHealthAsPercentage { get; set; }
 
     public bool ShowManaAsPercentage { get; set; }
-    
+
     public bool SimplifiedEscapeMenu { get; set; }
 
     public TypewriterBehavior TypewriterBehavior { get; set; }
 
+    public bool TypewriterEnabled => TypewriterBehavior != TypewriterBehavior.Off;
+
     public float UIScale { get; set; } = 1.0f;
 
     public float WorldZoom { get; set; } = 1.0f;