Name

README.md

@@ -12,7 +12,6 @@ A game of Snake built using C# in the MonoGame framework, themed around everyone
 - [ ] Caden: Map generation
 - [ ] Caden: Spice generation when we spawn
 - [ ] Caden: Periodic spice generation throughout the game
-- [ ] Menu Screen to let player name themselves (probably similar to how control selection screen will work) - Satchel
 - [ ] Max: Grow the worm on eating food.
 
 ## Items to Develop

src/Client/ClientMain.cs

@@ -9,6 +9,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Media;
 using System.Collections.Generic;
+using System.Text;
 using Client.Components;
 using Client.Systems;
 using Shared.Components;
@@ -29,14 +30,15 @@ public class ClientMain : Game
         private GameModel m_gameModel;
         private Controls m_controls;
         private ControlsPersistence m_ControlsPersistence;
+        private StringBuilder playerName = new StringBuilder();
 
         public ClientMain()
         {
             m_graphics = new GraphicsDeviceManager(this);
             Content.RootDirectory = "Content";
             m_menuKeyboardInput = new MenuKeyboardInput();
             IsMouseVisible = true;
-            m_gameModel = new GameModel();
+            m_gameModel = new GameModel(playerName);
             m_controls = new Controls();
             m_ControlsPersistence = new ControlsPersistence();
         }
@@ -58,12 +60,12 @@ protected override void Initialize()
             m_states = new Dictionary<MenuStateEnum, IGameState>
             {
                 { MenuStateEnum.MainMenu, new MainMenuView() },
-                { MenuStateEnum.GamePlay, new GamePlayView(m_controls) }, 
+                { MenuStateEnum.GamePlay, new GamePlayView(m_controls, playerName) }, 
                 { MenuStateEnum.HighScores, new HighScoresView() },
                 { MenuStateEnum.Controls, new ControlSettingsView(m_controls) },
                 { MenuStateEnum.Help, new HelpView() },
                 { MenuStateEnum.Credits, new AboutView() },
-                { MenuStateEnum.ChooseName, new ChooseNameView() },
+                { MenuStateEnum.ChooseName, new ChooseNameView(playerName)},
                 { MenuStateEnum.HowToPlay, new HowToPlayView() }
             };
 

src/Client/GameModel.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text;
 using System.Text.RegularExpressions;
 using Client.Components;
 using Shared.Components;
@@ -28,6 +29,12 @@ public class GameModel
     private GraphicsDeviceManager m_graphics;
     private SpriteFont m_font;
     private Texture2D m_sand;
+    private String m_playerName;
+
+    public GameModel(StringBuilder playerName)
+    {
+        m_playerName = playerName.ToString();
+    }
 
     /// <summary>
     /// This is where everything performs its update.
@@ -69,7 +76,7 @@ public bool initialize(ContentManager contentManager, Controls controls, Graphic
         m_renderer = new Systems.Renderer(m_systemCamera, graphics, m_font, m_sand);
         m_systemCollisionHandler = new Shared.Systems.CollisionHandler();
         m_systemWormMovement = new Shared.Systems.WormMovement();
-        m_systemNetwork = new Systems.Network();
+        m_systemNetwork = new Systems.Network(m_playerName);
 
         m_systemNetwork.registerNewEntityHandler(handleNewEntity);
         m_systemNetwork.registerRemoveEntityHandler(handleRemoveEntity);

src/Client/Menu/ChooseNameView.cs

@@ -10,35 +10,37 @@ namespace Client.Menu
 {
     public class ChooseNameView : GameStateView
     {
-        private StringBuilder playerName = new StringBuilder();
+        private StringBuilder playerName;
         private SpriteFont font;
         private KeyboardState oldState;
         private GameModel m_gameModel;
 
+        public ChooseNameView(StringBuilder name)
+        {
+            this.playerName = name;
+            oldState = Keyboard.GetState();
+        }
+
         public override void loadContent(ContentManager contentManager)
         {
             font = contentManager.Load<SpriteFont>("Fonts/menu"); 
         }
 
         public override MenuStateEnum processInput(GameTime gameTime)
         {
+
             KeyboardState newState = Keyboard.GetState(); // Get the new state
-
 
-
             // Simple example for input handling
             foreach (var key in newState.GetPressedKeys())
             {
-
-
                 // Check for Escape key press to return to MainMenu
                 if (newState.IsKeyDown(Keys.Escape))
                 {
-                    playerName.Clear();
+                    playerName.Clear(); // Clear the player name when Escape is pressed
                     return MenuStateEnum.MainMenu; // Immediately return to MainMenu when Escape is pressed
                 }
-
-
+
                 if (!oldState.IsKeyDown(key)) // Only take action if the key was not pressed before
                 {
                     if (key == Keys.Back && playerName.Length > 0) // Handle backspace
@@ -47,10 +49,7 @@ public override MenuStateEnum processInput(GameTime gameTime)
                     }
                     else if (key == Keys.Enter && playerName.Length > 0) // Confirm with Enter key
                     {
-
-
-                        // TODO SET PLAYER NAME
-
+
                         // Transition to the next state (e.g., HowToPlay)
                         return MenuStateEnum.HowToPlay;
                     }

src/Client/Menu/GamePlayView.cs

@@ -6,6 +6,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Client.IO;
 using System.Runtime.Serialization;
+using System.Text;
 using Client.Components;
 using Microsoft.Xna.Framework.Input;
 using Shared.Components;
@@ -21,15 +22,17 @@ public class GamePlayView : GameStateView
         private GameModel m_gameModel;
         private TimeSpan m_connectToServerTime = TimeSpan.Zero;
         private Controls m_controls;
+        private StringBuilder playerName;
 
-        public GamePlayView(Controls controls)
+        public GamePlayView(Controls controls, StringBuilder name)
         {
             m_controls = controls;
+            playerName = name;
         }
 
         public override void initialize()
         {
-            m_gameModel = new GameModel();
+            m_gameModel = new GameModel(playerName);
             m_gameModel.initialize(m_contentManager, m_controls, m_graphics);
             m_isSetup = false;
             m_isKeyboardRegistered = false;

src/Client/Systems/Network.cs

@@ -29,13 +29,12 @@ public class Network : Shared.Systems.System
         /// Primary activity in the constructor is to setup the command map
         // that maps from message types to their handlers.
         /// </summary>
-        public Network() :
+        public Network(String playerName) :
             base(typeof(Shared.Components.Position))
         {
-
             registerHandler(Shared.Messages.Type.ConnectAck, (TimeSpan elapsedTime, Message message) =>
             {
-                handleConnectAck(elapsedTime, (ConnectAck)message);
+                handleConnectAck(elapsedTime, (ConnectAck)message, playerName);
             });
 
             registerHandler(Shared.Messages.Type.NewEntity, (TimeSpan elapsedTime, Message message) =>
@@ -153,9 +152,9 @@ public void registerRemoveEntityHandler(RemoveEntityHandler handler)
         /// assigned to it by the server, it also sends a request to the server
         /// to join the game.
         /// </summary>
-        private void handleConnectAck(TimeSpan elapsedTime, ConnectAck message) 
+        private void handleConnectAck(TimeSpan elapsedTime, ConnectAck message, string name) 
         {
-            MessageQueueClient.instance.sendMessage(new Join());
+            MessageQueueClient.instance.sendMessage(new Join(name));
         }
 
         /// <summary>

src/Server/GameModel.cs

@@ -27,7 +27,7 @@
         /// </summary>
         public void update(TimeSpan elapsedTime)
         {
             m_systemNetwork.update(elapsedTime, MessageQueueServer.instance.getMessages());
             m_systemCollisionDetection.update(elapsedTime);
             m_systemCollisionHandler.update(elapsedTime);
             m_systemWormMovement.update(elapsedTime);
@@ -137,7 +137,7 @@
         {
             // Create a default name for the player
             var joinMessage = (Join)message;
-            string name = "Player" + clientId;
+            string name = joinMessage.name;
             // Step 1: Tell the newly connected player about all other entities
             reportAllEntities(clientId);
 

src/Shared/Messages/Join.cs

@@ -11,7 +11,7 @@
             this.hasName = true;
         }
 
         public Join() : base(Type.Join)
         {
             this.hasName = false;
         }
@@ -27,11 +27,7 @@
         {
             List<byte> data = new List<byte>();
             data.AddRange(base.serialize());
-            data.AddRange(BitConverter.GetBytes(hasName));
-            if (hasName)
-            {
-                data.AddRange(Encoding.UTF8.GetBytes(name));
-            }
+            serializeName(data);
             return data.ToArray();
         }
 
@@ -42,16 +38,36 @@
         public override int parse(byte[] data)
         {
             int offset = base.parse(data);
+            offset = parseName(data, offset);
+            return offset;
+        }
+
+        private void serializeName(List<byte> data)
+        {
+            data.AddRange(BitConverter.GetBytes(hasName));
+            if (hasName)
+            {
+                data.AddRange(Encoding.UTF8.GetBytes(name));
+            }
+        }
+
+        private int parseName(byte[] data, int offset)
+        {
             this.hasName = BitConverter.ToBoolean(data, offset);
             offset += sizeof(bool);
             if (hasName)
             {
-                int nameSize = BitConverter.ToInt32(data, offset);
-                offset += sizeof(Int32);
+                // int nameSize = BitConverter.ToInt32(data, offset);
+                // offset += sizeof(Int32);
+                int nameSize = data.Length - offset;
                 this.name = Encoding.UTF8.GetString(data, offset, nameSize);
                 offset += nameSize;
             }
             return offset;
         }
+
+
     }
+
+
 }