diff --git a/client/static/jpg/SaladCat.png b/client/static/jpg/SaladCat.png new file mode 100644 index 0000000..7e84cb8 Binary files /dev/null and b/client/static/jpg/SaladCat.png differ diff --git a/client/static/jpg/Satisfaction.png b/client/static/jpg/Satisfaction.png new file mode 100644 index 0000000..9fb9e13 Binary files /dev/null and b/client/static/jpg/Satisfaction.png differ diff --git a/client/static/jpg/ScumbagSteve.png b/client/static/jpg/ScumbagSteve.png new file mode 100644 index 0000000..a65053d Binary files /dev/null and b/client/static/jpg/ScumbagSteve.png differ diff --git a/client/static/jpg/SpanishLaughingGuy.png b/client/static/jpg/SpanishLaughingGuy.png new file mode 100644 index 0000000..2ec634e Binary files /dev/null and b/client/static/jpg/SpanishLaughingGuy.png differ diff --git a/client/static/jpg/SpiderMan.png b/client/static/jpg/SpiderMan.png new file mode 100644 index 0000000..aa3bfe7 Binary files /dev/null and b/client/static/jpg/SpiderMan.png differ diff --git a/client/static/jpg/StareDad.png b/client/static/jpg/StareDad.png new file mode 100644 index 0000000..88eb30a Binary files /dev/null and b/client/static/jpg/StareDad.png differ diff --git a/client/static/jpg/SuccessBaby.png b/client/static/jpg/SuccessBaby.png new file mode 100644 index 0000000..926513c Binary files /dev/null and b/client/static/jpg/SuccessBaby.png differ diff --git a/client/static/jpg/SurprisedPikachu.png b/client/static/jpg/SurprisedPikachu.png new file mode 100644 index 0000000..e134498 Binary files /dev/null and b/client/static/jpg/SurprisedPikachu.png differ diff --git a/client/static/js/main.js b/client/static/js/main.js index 7e0c418..a42849c 100644 --- 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; });