Merge branch 'main' of https://github.com/utastudents/cse3310_sp24_gr…

…oup27 into main
utastudents · Apr 30, 2024 · 653256e · 653256e
2 parents 4bd4e5c + f5dffc8
commit 653256e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/html/index.html b/html/index.html
@@ -297,6 +297,17 @@ <h1>The Word Search Game</h1>
         connection.onmessage = function (event) {
             var message = JSON.parse(event.data);
 
+            if ('YouAre' in message) {
+              if (message.YouAre == "PLAYERONE") {
+                  PlayerIdx = 0;
+              }
+              else {
+                  PlayerIdx = 1;
+              }
+
+              gameid = message.GameId;
+            }
+
             if (message.type === "wordCoordinates"){
                 console.log("[" + message.coordinates[0] + "] [" + message.coordinates[1] +"]");
                 console.log("Start idx: " + getIdx(message.coordinates[0]) + " End idx: " + getIdx(message.coordinates[1]));
@@ -359,9 +370,6 @@ <h1>The Word Search Game</h1>
           }
         }
 
-        function gridStart(){
-
-        }
       </script>
     </div>
 

diff --git a/html/tttsample.html b/html/tttsample.html
@@ -89,19 +89,19 @@
             if (gameid == obj.GameId) {
                 // button state to display values
 
-                document.getElementById("b1").value = ButtonStateToDisplay.get(obj.Button[0]);
-                document.getElementById("b2").value = ButtonStateToDisplay.get(obj.Button[1]);
-                document.getElementById("b3").value = ButtonStateToDisplay.get(obj.Button[2]);
-                document.getElementById("b4").value = ButtonStateToDisplay.get(obj.Button[3]);
-                document.getElementById("b5").value = ButtonStateToDisplay.get(obj.Button[4]);
-                document.getElementById("b6").value = ButtonStateToDisplay.get(obj.Button[5]);
-                document.getElementById("b7").value = ButtonStateToDisplay.get(obj.Button[6]);
-                document.getElementById("b8").value = ButtonStateToDisplay.get(obj.Button[7]);
-                document.getElementById("b9").value = ButtonStateToDisplay.get(obj.Button[8]);
+                // document.getElementById("b1").value = ButtonStateToDisplay.get(obj.Button[0]);
+                // document.getElementById("b2").value = ButtonStateToDisplay.get(obj.Button[1]);
+                // document.getElementById("b3").value = ButtonStateToDisplay.get(obj.Button[2]);
+                // document.getElementById("b4").value = ButtonStateToDisplay.get(obj.Button[3]);
+                // document.getElementById("b5").value = ButtonStateToDisplay.get(obj.Button[4]);
+                // document.getElementById("b6").value = ButtonStateToDisplay.get(obj.Button[5]);
+                // document.getElementById("b7").value = ButtonStateToDisplay.get(obj.Button[6]);
+                // document.getElementById("b8").value = ButtonStateToDisplay.get(obj.Button[7]);
+                // document.getElementById("b9").value = ButtonStateToDisplay.get(obj.Button[8]);
 
 
                 // the message line
-                document.getElementById("topMessage").innerHTML = obj.Msg[idx];
+                // document.getElementById("topMessage").innerHTML = obj.Msg[idx];
             }
         }
     }

diff --git a/src/main/java/uta/cse3310/App.java b/src/main/java/uta/cse3310/App.java
@@ -67,7 +67,7 @@ public class App extends WebSocketServer {
   // the vector ActiveGames
   private Vector<Game> ActiveGames = new Vector<Game>();
 
-  private int GameId = 1;
+  private int GameId = 0;
 
   private int connectionId = 0;
 
@@ -100,7 +100,9 @@ public void onOpen(WebSocket conn, ClientHandshake handshake) {
 
     // search for a game needing a player
     Game G = null;
+    System.err.println("ActiveGames size: " + ActiveGames.size());
     for (Game i : ActiveGames) {
+      System.err.println("for loop for active games fired.");
       if (i.Players == uta.cse3310.PlayerType.PLAYERONE ||
           i.Players == uta.cse3310.PlayerType.PLAYERTWO ||
           i.Players == uta.cse3310.PlayerType.PLAYERTHREE) {
@@ -111,12 +113,13 @@ public void onOpen(WebSocket conn, ClientHandshake handshake) {
 
     // No matches ? Create a new Game.
      // No matches ? Create a new Game.
-    if (G == null) {
+    if (G == null || GameId % 2 == 1) {
       G = new Game(stats);
       G.GameId = GameId;
       GameId++;
       // Add the first player
-      G.Players = PlayerType.PLAYERONE;
+      G.Players = uta.cse3310.PlayerType.PLAYERONE;
+      // G.Players = PlayerType.PLAYERONE;
       ActiveGames.add(G);
       System.out.println("creating a new Game");