Main menu animation and minor networking changes

SokyranTheDragon · Sep 19, 2021 · 7413c8c · 7413c8c
1 parent 60fca9f
commit 7413c8c
Show file tree

Hide file tree

Showing 11 changed files with 401 additions and 51 deletions.
diff --git a/Source/Client/MpSettings.cs b/Source/Client/MpSettings.cs
@@ -31,6 +31,7 @@ public class MpSettings : ModSettings
         public KeyCode? jumpToPingButton = KeyCode.Mouse3;
         public Rect chatRect;
         public Vector2 resolutionForChat;
+        public bool showMainMenuAnim = true;
 
         public ServerSettings serverSettings = new();
 
@@ -54,6 +55,7 @@ public override void ExposeData()
             Scribe_Values.Look(ref jumpToPingButton, "jumpToPingButton", KeyCode.Mouse3);
             Scribe_Custom.LookRect(ref chatRect, "chatRect");
             Scribe_Values.Look(ref resolutionForChat, "resolutionForChat");
+            Scribe_Values.Look(ref showMainMenuAnim, "showMainMenuAnim", true);
 
             Scribe_Deep.Look(ref serverSettings, "serverSettings");
 
@@ -79,6 +81,7 @@ public void DoSettingsWindowContents(Rect inRect)
             listing.CheckboxLabeled("MpAppendNameToAutosave".Translate(), ref appendNameToAutosave);
             listing.CheckboxLabeled("MpShowModCompat".Translate(), ref showModCompatibility, "MpShowModCompatDesc".Translate());
             listing.CheckboxLabeled("MpEnablePingsSetting".Translate(), ref enablePings);
+            listing.CheckboxLabeled("Show main menu animation", ref showMainMenuAnim);
 
             const string buttonOff = "Off";
 

diff --git a/Source/Client/MultiplayerStatic.cs b/Source/Client/MultiplayerStatic.cs
@@ -50,6 +50,7 @@ public static class MultiplayerStatic
         public static readonly Texture2D PingPin = ContentFinder<Texture2D>.Get("Multiplayer/PingPin");
         public static readonly Texture2D WebsiteIcon = ContentFinder<Texture2D>.Get("Multiplayer/Website");
         public static readonly Texture2D DiscordIcon = ContentFinder<Texture2D>.Get("Multiplayer/Discord");
+        public static readonly Texture2D Pulse = ContentFinder<Texture2D>.Get("Multiplayer/Pulse");
 
         static MultiplayerStatic()
         {

diff --git a/Source/Client/Networking/State/ClientJoiningState.cs b/Source/Client/Networking/State/ClientJoiningState.cs
@@ -30,10 +30,16 @@ public ClientJoiningState(ConnectionBase connection) : base(connection)
 
         public override void StartState()
         {
-            connection.Send(Packets.Client_Username, MpVersion.Protocol, Multiplayer.username);
+            connection.Send(Packets.Client_Protocol, MpVersion.Protocol);
             ConnectionStatusListeners.TryNotifyAll_Connected();
         }
 
+        [PacketHandler(Packets.Server_ProtocolOk)]
+        public void HandleProtocolOk(ByteReader data)
+        {
+            connection.Send(Packets.Client_Username, Multiplayer.username);
+        }
+
         [PacketHandler(Packets.Server_UsernameOk)]
         public void HandleUsernameOk(ByteReader data)
         {