From 6d5c9526e3328528a4f0ecb7aa613786e42709c0 Mon Sep 17 00:00:00 2001
From: ThiML10 <157675695+ThiML10@users.noreply.github.com>
Date: Thu, 2 May 2024 02:53:59 +0000
Subject: [PATCH 1/6] cm

---
 html/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/index.html b/html/index.html
index 26c2037..432918c 100644
--- a/html/index.html
+++ b/html/index.html
@@ -18,7 +18,7 @@ <h1>Welcome to The Word Search Game</h1>
         <form id="nickForm">
             <label for="nickInput">Enter your nickname:</label>
             <input type="text" id="nickInput" placeholder="Nickname" required>
-            <button type="submit">Enter Lobby</button>
+            <!--<button type="submit">Enter Lobby</button>-->
             <p id="error" style="color: red; display: none;">Your nick is already taken, please reenter.</p>
         </form>
     </div>

From 3dd48513407ba491ad7ba4ed8021506a3baddc02 Mon Sep 17 00:00:00 2001
From: antmorales1 <122925857+antmorales1@users.noreply.github.com>
Date: Thu, 2 May 2024 02:55:59 +0000
Subject: [PATCH 2/6] no duplicates

---
 src/main/java/uta/cse3310/App.java  |  9 ++++++---
 src/main/java/uta/cse3310/Game.java | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/uta/cse3310/App.java b/src/main/java/uta/cse3310/App.java
index 8e9ea34..fa8aba1 100644
--- a/src/main/java/uta/cse3310/App.java
+++ b/src/main/java/uta/cse3310/App.java
@@ -187,13 +187,16 @@ public void insertInnerMap(UserEvent U,HashMap<String, HashMap<String, ArrayList
     @Override
     public void onError(WebSocket conn, Exception ex) {
         ex.printStackTrace();
+    
         if (conn != null) {
-            // some errors like port binding failed may not be assignable to a specific
-            // websocket
+            conn.close();
+            Connections.remove(conn);
+        } else {
+            System.out.println("An error occurred: " + ex.getMessage());
         }
-        System.out.println("[ERROR] onError()");
     }
 
+
     @Override
     public void onStart() {
         System.out.println("Server has started!");
diff --git a/src/main/java/uta/cse3310/Game.java b/src/main/java/uta/cse3310/Game.java
index 12ef91a..9990551 100644
--- a/src/main/java/uta/cse3310/Game.java
+++ b/src/main/java/uta/cse3310/Game.java
@@ -9,6 +9,7 @@ public class Game // implements Chat, Timer, GridField, LeaderBoard, Wordlist
 {
     private int gameMode;
     private String gameID;
+    private Set<String> usedColors;
     private ArrayList<Player> playersList = new ArrayList<Player>();
     public Player winner = null;
     public boolean gameStatus;
@@ -22,6 +23,7 @@ public Game() {
         this.gameMode = gameMode;
         this.gameID = UUID.randomUUID().toString();
         gameStatus = false;
+        usedColors = new HashSet<>();
     }
 
     public ArrayList<Player> getPlayersList() // I need to add this since Lobby class needs to access the game's player
@@ -182,6 +184,31 @@ public void displayRules() {
 
     }
 
+    public boolean addPlayer(Player newPlayer) {
+        if (isUniquePlayerName(newPlayer.getNick())) {
+            if (isUniquePlayerColor(newPlayer.getColor())) {
+                playersList.add(newPlayer);
+                return true; 
+            } else {
+                System.out.println("Color is already in use.");
+            }
+        } else {
+            System.out.println("Player name is already in use.");
+        }
+        return false; 
+    }
      
+    private boolean isUniquePlayerName(String playerName) {
+        for (Player player : playersList) {
+            if (player.getNick().equals(playerName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isUniquePlayerColor(String playerColor) {
+        return !usedColors.contains(playerColor);
+    }
 }
  
\ No newline at end of file

From ec714228cbc95c0d8352a25d09b9edc97f83bde1 Mon Sep 17 00:00:00 2001
From: ThiML10 <157675695+ThiML10@users.noreply.github.com>
Date: Thu, 2 May 2024 03:22:36 +0000
Subject: [PATCH 3/6] cm

---
 html/index.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/html/index.html b/html/index.html
index 432918c..55d37d4 100644
--- a/html/index.html
+++ b/html/index.html
@@ -39,6 +39,14 @@ <h2>Timer: <span id="timer">30</span> seconds</h2>
     <div id="lobbyContainer">
         <div id="userInputSection">
             <button id="helpButton">HELP</button>
+            
+
+            <div id="helpModal" style="display:none; position: fixed; left: 50%; top: 50%; transform: translate(-50%, -50%); background: white; padding: 20px; z-index: 100; border: 1px solid black;">
+                <h2>Help Instructions</h2>
+                <p>Find and circle all the hidden words within the grid. Words may be placed horizontally, vertically, diagonally, forward, or backward.</p>
+                <button onclick="toggleHelp()">Close</button>
+            </div>
+            
             <button id="standbyButton">PUT ON STANDBY</button>
         
             <!--
@@ -539,5 +547,19 @@ <h2>Leaderboard</h2>
     socket.send(JSON.stringify(data));
     
 }
+
+function toggleHelp() {
+    var helpModal = document.getElementById('helpModal');
+    if (helpModal.style.display === "none") {
+        helpModal.style.display = "block";
+    } else {
+        helpModal.style.display = "none";
+    }
+}
+
+document.getElementById('helpButton').addEventListener('click', function() {
+    toggleHelp();
+});
+
 </script>
 

From d5eec7048c0fdde5b2dc33568e9a4fa557b4071c Mon Sep 17 00:00:00 2001
From: antmorales1 <122925857+antmorales1@users.noreply.github.com>
Date: Thu, 2 May 2024 03:26:39 +0000
Subject: [PATCH 4/6] error checking

---
 src/main/java/uta/cse3310/Player.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/uta/cse3310/Player.java b/src/main/java/uta/cse3310/Player.java
index 9eefb6c..d559f22 100644
--- a/src/main/java/uta/cse3310/Player.java
+++ b/src/main/java/uta/cse3310/Player.java
@@ -57,10 +57,14 @@ public int getScore()
     }
 
     // Method to increase player score
-    public void increaseScore(int points) 
+    public void increaseScore(int points)
     {
-        this.score += points;
-        this.totalPoints += points; // Assuming totalPoints accumulates all points ever scored
+        if (points >= 0) {
+            this.score += points;
+            this.totalPoints += points;
+        } else {
+            throw new IllegalArgumentException("Points must be non-negative.");
+        }
     }
 
     // Getter for player status
@@ -91,9 +95,8 @@ public void addGameWin()
     @Override
     public String toString() 
     {
-        
         return "Player{" +
-               "nick=" + nick  +
+               "nick='" + nick + '\'' +
                ", score=" + score +
                ", status=" + status +
                ", totalPoints=" + totalPoints +

From d3304dbde1a6f93f6324dd6c22efbd221dedfca5 Mon Sep 17 00:00:00 2001
From: ThiML10 <157675695+ThiML10@users.noreply.github.com>
Date: Thu, 2 May 2024 03:39:24 +0000
Subject: [PATCH 5/6] back

---
 html/index.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/index.html b/html/index.html
index 55d37d4..e48e3e4 100644
--- a/html/index.html
+++ b/html/index.html
@@ -40,13 +40,13 @@ <h2>Timer: <span id="timer">30</span> seconds</h2>
         <div id="userInputSection">
             <button id="helpButton">HELP</button>
             
-
+           <!-- 
             <div id="helpModal" style="display:none; position: fixed; left: 50%; top: 50%; transform: translate(-50%, -50%); background: white; padding: 20px; z-index: 100; border: 1px solid black;">
                 <h2>Help Instructions</h2>
                 <p>Find and circle all the hidden words within the grid. Words may be placed horizontally, vertically, diagonally, forward, or backward.</p>
                 <button onclick="toggleHelp()">Close</button>
             </div>
-            
+            -->
             <button id="standbyButton">PUT ON STANDBY</button>
         
             <!--
@@ -548,6 +548,7 @@ <h2>Leaderboard</h2>
     
 }
 
+/*
 function toggleHelp() {
     var helpModal = document.getElementById('helpModal');
     if (helpModal.style.display === "none") {
@@ -560,6 +561,6 @@ <h2>Leaderboard</h2>
 document.getElementById('helpButton').addEventListener('click', function() {
     toggleHelp();
 });
-
+*/
 </script>
 

From 8d0fd97581e8d1ca33a672923b6dc9153af4dfea Mon Sep 17 00:00:00 2001
From: ThiML10 <157675695+ThiML10@users.noreply.github.com>
Date: Thu, 2 May 2024 04:01:52 +0000
Subject: [PATCH 6/6] back

---
 html/index.html | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/html/index.html b/html/index.html
index e48e3e4..432931d 100644
--- a/html/index.html
+++ b/html/index.html
@@ -18,7 +18,7 @@ <h1>Welcome to The Word Search Game</h1>
         <form id="nickForm">
             <label for="nickInput">Enter your nickname:</label>
             <input type="text" id="nickInput" placeholder="Nickname" required>
-            <!--<button type="submit">Enter Lobby</button>-->
+            <button type="submit">Enter Lobby</button>
             <p id="error" style="color: red; display: none;">Your nick is already taken, please reenter.</p>
         </form>
     </div>
@@ -39,14 +39,6 @@ <h2>Timer: <span id="timer">30</span> seconds</h2>
     <div id="lobbyContainer">
         <div id="userInputSection">
             <button id="helpButton">HELP</button>
-            
-           <!-- 
-            <div id="helpModal" style="display:none; position: fixed; left: 50%; top: 50%; transform: translate(-50%, -50%); background: white; padding: 20px; z-index: 100; border: 1px solid black;">
-                <h2>Help Instructions</h2>
-                <p>Find and circle all the hidden words within the grid. Words may be placed horizontally, vertically, diagonally, forward, or backward.</p>
-                <button onclick="toggleHelp()">Close</button>
-            </div>
-            -->
             <button id="standbyButton">PUT ON STANDBY</button>
         
             <!--
@@ -548,19 +540,5 @@ <h2>Leaderboard</h2>
     
 }
 
-/*
-function toggleHelp() {
-    var helpModal = document.getElementById('helpModal');
-    if (helpModal.style.display === "none") {
-        helpModal.style.display = "block";
-    } else {
-        helpModal.style.display = "none";
-    }
-}
-
-document.getElementById('helpButton').addEventListener('click', function() {
-    toggleHelp();
-});
-*/
 </script>