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

Timmlion · Jan 28, 2024 · 008c311 · 008c311
2 parents 484b27c + 2df2b2a
commit 008c311
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 4 deletions.
diff --git a/backend/MemeBE/cards.csv b/backend/MemeBE/cards.csv
@@ -27,4 +27,14 @@
 27;SurprisedPikachu;/static/jpg/SurprisedPikachu.png;MakeLaugh,1;1
 28;SurprisedKirk;/static/jpg/SurprisedKirk.png;MakeLaugh,2;0
 29;Takemymoney;/static/jpg/Takemymoney.png;MakeLaugh,2;1
-30;RollSafeThink;/static/jpg/OhGodNo.png;Shield,1;2
+30;RollSafeThink;/static/jpg/OhGodNo.png;Shield,1;2
+31;Thatsnoneofmybuisness;/static/jpg/Thatsnoneofmybuisness.png;MakeLaugh,1;1
+32;TheWhat;/static/jpg/TheWhat.png;MakeLaugh,2;1
+33;Thisisfine;/static/jpg/Thisisfine.png;MakeLaugh,1;1
+34;TrollFace;/static/jpg/TrollFace.png;MakeGrumpy,1;0
+35;TrueStory;/static/jpg/TrueStory.png;MakeGrumpy,1;0
+36;WakingUp;/static/jpg/WakingUp.png;MakeLaugh,3;0
+37;Watlady;/static/jpg/Watlady.png;MakeGrumpy,1;1
+38;WeedGuy;/static/jpg/WeedGuy.png;MakeLaugh,1;1
+39;WillyWonka;/static/jpg/WillyWonka.png;MakeLaugh,1;1
+40;Duckface;/static/jpg/Duckface.png;MakeGrumpy,1;1
diff --git a/backend/MemeBE/hubs/GameHub.cs b/backend/MemeBE/hubs/GameHub.cs
@@ -206,8 +206,8 @@ public async Task EndTurn(Room room)
     {
         Console.WriteLine("End turn - start");
         await Clients.Client(room.ActivePlayer.ConnectionID).SendAsync("TurnEnd");
-        await Clients.Group(room.RoomId)
-            .SendAsync("ReceiveServerRoomMessage", room.ActivePlayer.Nick + " - turn Ended");
+//         await Clients.Group(room.RoomId)
+//             .SendAsync("ReceiveServerRoomMessage", room.ActivePlayer.Nick + " - turn Ended");
 
         if (room.GameStarted)
         {

diff --git a/client/static/css/style.css b/client/static/css/style.css
@@ -210,6 +210,7 @@ body {
     border-radius: 6px;
     display: inline-block;
     flex: 0 0 auto;
+    cursor: pointer;
 
 }
 

diff --git a/client/static/jpg/Duckface.png b/client/static/jpg/Duckface.png
diff --git a/client/static/jpg/Thatsnoneofmybuisness.png b/client/static/jpg/Thatsnoneofmybuisness.png
diff --git a/client/static/jpg/TheWhat.png b/client/static/jpg/TheWhat.png
diff --git a/client/static/jpg/Thisisfine.png b/client/static/jpg/Thisisfine.png
diff --git a/client/static/jpg/TrollFace.png b/client/static/jpg/TrollFace.png
diff --git a/client/static/jpg/TrueStory.png b/client/static/jpg/TrueStory.png
diff --git a/client/static/jpg/WakingUp.png b/client/static/jpg/WakingUp.png
diff --git a/client/static/jpg/Watlady.png b/client/static/jpg/Watlady.png
diff --git a/client/static/jpg/WeedGuy.png b/client/static/jpg/WeedGuy.png
diff --git a/client/static/jpg/WillyWonka.png b/client/static/jpg/WillyWonka.png
diff --git a/client/static/js/main.js b/client/static/js/main.js
@@ -73,7 +73,7 @@ function initReceiveMethods() {
             $("#startGameButton").show();
         }
         $("#playerName").text(playerName);
-        $("#playerPersistentCards").data('player-name', playerName);
+        document.querySelector("#playerPersistentCards").setAttribute('data-player-name', playerName);
         otherPlayers.forEach((playerName) => addPlayerZone(playerName));
     });
 
@@ -113,6 +113,14 @@ 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("TurnStarted", function () {
         yourTurn = true;
     });