chore: refactor event window (#2365)

AscensionGameDev · Aug 2, 2024 · fb934f2 · fb934f2
1 parent 143d1b3
commit fb934f2
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 310 deletions.
diff --git a/Intersect (Core)/Enums/EventResponseType.cs b/Intersect (Core)/Enums/EventResponseType.cs
@@ -0,0 +1,12 @@
+namespace Intersect.Enums;
+
+public enum EventResponseType
+{
+    OneOption = 1,
+
+    TwoOption,
+
+    ThreeOption,
+
+    FourOption,
+ }
diff --git a/Intersect.Client/Core/Input.cs b/Intersect.Client/Core/Input.cs
@@ -11,6 +11,7 @@
 using Intersect.Client.Maps;
 using Intersect.Client.Networking;
 using Intersect.Configuration;
+using Intersect.Enums;
 using Intersect.Utilities;
 
 namespace Intersect.Client.Core;
@@ -97,7 +98,7 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                         var eventWindow = (EventWindow)Interface.Interface.InputBlockingElements[i];
                         if (eventWindow != null && !eventWindow.IsHidden && Globals.EventDialogs.Count > 0)
                         {
-                            eventWindow.EventResponse1_Clicked(null, null);
+                            eventWindow.CloseEventResponse(EventResponseType.OneOption);
                             canFocusChat = false;
 
                             break;

diff --git a/Intersect.Client/Entities/Events/Dialog.cs b/Intersect.Client/Entities/Events/Dialog.cs
@@ -4,17 +4,17 @@ public partial class Dialog
 {
     public Guid EventId;
 
-    public string Face = "";
+    public string Face = string.Empty;
 
-    public string Opt1 = "";
+    public string Opt1 = string.Empty;
 
-    public string Opt2 = "";
+    public string Opt2 = string.Empty;
 
-    public string Opt3 = "";
+    public string Opt3 = string.Empty;
 
-    public string Opt4 = "";
+    public string Opt4 = string.Empty;
 
-    public string Prompt = "";
+    public string Prompt = string.Empty;
 
     public int ResponseSent;