Added nickname functionality to game screen

utastudents · May 1, 2024 · b29f32c · b29f32c
1 parent 66f1f8e
commit b29f32c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 20 deletions.
diff --git a/html/entryScreen.js b/html/entryScreen.js
@@ -103,13 +103,13 @@ socket.onmessage = function(event) {
                 document.getElementById('lobby').style.display = "none";
                 document.getElementById('gameScreen').style.display = "block";
                 generateGrid(obj.wordBank.grid);
-                generateScoreboard(obj.scoreBoard.scores);
+                generateScoreboard(obj);
                 displayWords(obj.wordBank.wordsPlaced);
             }
             else
             {
               updateGrid(obj.pickedLetters);
-              updateScoreboard(obj.scoreBoard.scores);
+              updateScoreboard(obj);
 
               if (obj.chatBox.messageSent == true) {
                 var messages = obj.chatBox.messages;
@@ -303,25 +303,27 @@ function generateGrid(grid) {
   });
 }
 
-function generateScoreboard(scores) {
+function generateScoreboard(obj) {
+    var scores = obj.scoreBoard.scores;
     var scoreboard = document.getElementById('scoreBoard');
-        scoreboard.innerHTML = ''; // Clear previous scores
-        scores.forEach(function (score, index) {
-            var p = document.createElement('p');
-            p.textContent = "Player " + (index + 1) + ": 0";
-            scoreboard.appendChild(p);
-        });
-    }
+    scoreboard.innerHTML = ''; // Clear previous scores
+    scores.forEach(function (score, index) {
+        var p = document.createElement('p');
+        p.textContent = obj.playerNames[index] + ": 0";
+        scoreboard.appendChild(p);
+    });
+}
 
-    function updateScoreboard(scores) {
-        var scoreboard = document.getElementById('scoreBoard');
-        scoreboard.innerHTML = ''; // Clear existing scores
-        scores.forEach(function (score, index) {
-            var p = document.createElement('p');
-            p.textContent = "Player " + (index + 1) + ": " + score;
-            scoreboard.appendChild(p);
-        });
-    }
+function updateScoreboard(obj) {
+    var scores = obj.scoreBoard.scores;
+    var scoreboard = document.getElementById('scoreBoard');
+    scoreboard.innerHTML = ''; // Clear previous scores
+    scores.forEach(function (score, index) {
+        var p = document.createElement('p');
+        p.textContent = obj.playerNames[index] + ": " + score;
+        scoreboard.appendChild(p);
+    });
+}
 
     function displayWords(words) {
         var listContainer = document.getElementById('wordList');

diff --git a/src/main/java/uta/cse3310/App.java b/src/main/java/uta/cse3310/App.java
@@ -97,24 +97,28 @@ public void onMessage(WebSocket conn, String message) {
       // Add the first player
           G.Players = uta.cse3310.PlayerType.PLAYER1;
           G.playersJoined++;
+          G.playerNames[0] = nickname;
           ActiveGames.add(G);
           System.out.println(" creating a new Game");
         } else if (G.Players == PlayerType.PLAYER1) {
       // join an existing game
           System.out.println(" not a new game");
           G.Players = uta.cse3310.PlayerType.PLAYER2;
           G.playersJoined++;
+          G.playerNames[1] = nickname;
         } else if (G.Players == PlayerType.PLAYER2) {
       // join an existing game
           System.out.println(" not a new game");
           G.Players = uta.cse3310.PlayerType.PLAYER3;
           G.playersJoined++;
+          G.playerNames[2] = nickname;
         }
         else {
       // join an existing game
           System.out.println(" not a new game");
           G.Players = uta.cse3310.PlayerType.PLAYER4;
           G.playersJoined++;
+          G.playerNames[3] = nickname;
         }
 
         System.out.println("G.players is " + G.Players);

diff --git a/src/main/java/uta/cse3310/GameScreen.java b/src/main/java/uta/cse3310/GameScreen.java
@@ -8,6 +8,7 @@
 
 public class GameScreen {
     public PlayerType Players;
+    public String playerNames[];
     public int GameId;
     private ChatBox chatBox;
     private WordBank wordBank;
@@ -27,6 +28,8 @@ public GameScreen()
         // Created by Abubakar Kassim
         this.players = new ArrayList<PlayerType>();
 
+        playerNames = new String[4];
+
         wordBank = new WordBank();
         List<String> wordList = new ArrayList<>();
         wordBank.addWordsFromFile("words.txt", wordList);
@@ -90,6 +93,27 @@ else if (P == PlayerType.PLAYER4)
         return retval;
     }
 
+    public String PlayerToNickname(PlayerType P)
+    {
+        String retval = "UNKNOWN";
+        if (P == PlayerType.PLAYER1) {
+            retval = playerNames[0];
+        } 
+        else if (P == PlayerType.PLAYER2) 
+        {
+            retval = playerNames[1];
+        }
+        else if (P == PlayerType.PLAYER3) 
+        {
+            retval = playerNames[2];
+        }
+        else if (P == PlayerType.PLAYER4) 
+        {
+            retval = playerNames[3];
+        }
+        return retval;
+    }
+
     public void Timer() {
 
         Timer timer = new Timer();
@@ -183,7 +207,7 @@ else if(U.Button == 9)
         {
             if(!U.Msg.isEmpty())
             {
-                chatBox.addMessage(U.PlayerIdx + ": " + U.Msg);
+                chatBox.addMessage(PlayerToNickname(U.PlayerIdx) + ": " + U.Msg);
                 chatBox.setMessageSent(true);
             }
         }