diff --git a/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs b/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs index 9e73186dc1..32e44fba81 100644 --- a/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs +++ b/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs @@ -90,6 +90,8 @@ public static ClientConfiguration LoadAndSave(string? filePath = default) => public static List DefaultTypewriterSounds => ["octave-beep-tapped.wav"]; + private const bool DefaultDimmedEventWindowBackground = true; + #endregion #region Static Properties and Methods @@ -258,6 +260,11 @@ public void Validate() public List TypewriterSounds { get; set; } = DefaultTypewriterSounds; + /// + /// Adds dimmed background to EventWindow. + /// + public bool DimmedEventWindowBackground { get; set; } = DefaultDimmedEventWindowBackground; + #region Hidden Properties [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] diff --git a/Intersect.Client.Core/Interface/Game/EventWindow.cs b/Intersect.Client.Core/Interface/Game/EventWindow.cs index ef353637e1..4df848d273 100644 --- a/Intersect.Client.Core/Interface/Game/EventWindow.cs +++ b/Intersect.Client.Core/Interface/Game/EventWindow.cs @@ -1,3 +1,4 @@ +using Intersect.Client.Core; using Intersect.Client.Core.Controls; using Intersect.Client.Entities.Events; using Intersect.Client.Framework.Content; @@ -24,22 +25,18 @@ namespace Intersect.Client.Interface.Game; public partial class EventWindow : Panel { private readonly IFont? _defaultFont; - private readonly Panel _promptPanel; - private readonly ImagePanel _faceImage; private readonly ScrollControl _promptScroller; private readonly Label _promptTemplateLabel; private readonly RichLabel _promptLabel; - - private readonly Panel _optionsPanel; - private readonly Button[] _optionButtons = new Button[4]; - - private readonly bool _typewriting; + private readonly ScrollControl _optionsScroller; + private readonly List