Merge remote-tracking branch 'origin/develop' into develop

Timmlion · Jan 28, 2024 · 4dea0ee · 4dea0ee
2 parents 22fe4dc + 81c7943
commit 4dea0ee
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 15 deletions.
diff --git a/client/static/jpg/SaladCat.png b/client/static/jpg/SaladCat.png
diff --git a/client/static/jpg/Satisfaction.png b/client/static/jpg/Satisfaction.png
diff --git a/client/static/jpg/ScumbagSteve.png b/client/static/jpg/ScumbagSteve.png
diff --git a/client/static/jpg/SpanishLaughingGuy.png b/client/static/jpg/SpanishLaughingGuy.png
diff --git a/client/static/jpg/SpiderMan.png b/client/static/jpg/SpiderMan.png
diff --git a/client/static/jpg/StareDad.png b/client/static/jpg/StareDad.png
diff --git a/client/static/jpg/SuccessBaby.png b/client/static/jpg/SuccessBaby.png
diff --git a/client/static/jpg/SurprisedPikachu.png b/client/static/jpg/SurprisedPikachu.png
diff --git a/client/static/js/main.js b/client/static/js/main.js
@@ -1,6 +1,7 @@
 let connection;
 let playerName = localStorage.getItem('playerName');
 let yourTurn = false;
+let cmdInProgress = false;
 let selectedCard = null;
 let currentRoomID = null;
 
@@ -11,8 +12,8 @@ $(document).ready(function () {
 
 function initServer() {
     connection = new signalR.HubConnectionBuilder()
-        // .withUrl("https://memethegatheringapi.azurewebsites.net/GameHub")
-        .withUrl("https://578d-87-206-130-93.ngrok-free.app/GameHub")
+        .withUrl("https://memethegatheringapi.azurewebsites.net/GameHub")
+        // .withUrl("https://578d-87-206-130-93.ngrok-free.app/GameHub")
         .withAutomaticReconnect()
         .configureLogging(signalR.LogLevel.Information)
         .build();
@@ -112,19 +113,6 @@ function initReceiveMethods() {
         document.querySelector('#playersZones .other.player[data-player-name="' + target + '"] .points').innerHTML = points;
     });
 
-    connection.on("TakeGrumpy", function (points) {
-        $("#playerHP").text(points);
-    });
-
-    connection.on("OtherTookGrumpy", function (target, points) {
-        document.querySelector('#playersZones .other.player[data-player-name="' + target + '"] .points').innerHTML = points;
-    });
-
-    connection.on("GameEnded", function (message) {
-        yourTurn = false;
-        ShowEndGameScreen(message);
-    });
-
     connection.on("TurnStarted", function () {
         yourTurn = true;
     });