Merge branch 'develop' of https://github.com/Timmlion/KJ2024 into dev…

…elop
Timmlion · Jan 28, 2024 · bb393aa · bb393aa
2 parents 4d0d3ee + c3b3d4b
commit bb393aa
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 4 deletions.
diff --git a/backend/MemeBE/Program.cs b/backend/MemeBE/Program.cs
@@ -13,7 +13,7 @@
 {
     options.AddPolicy("MyCorsPolicy", builder =>
     {
-        builder.WithOrigins("https://nice-water-0ee9aa403.4.azurestaticapps.net", "http://localhost:63342", "https://memethegathering.wielki.ch") // URL innego serwera
+        builder.WithOrigins("https://nice-water-0ee9aa403.4.azurestaticapps.net", "http://localhost:63342", "https://memethegathering.wielki.ch", "https://mtg.wielki.ch/") // URL innego serwera
             .AllowAnyMethod()
             .AllowAnyHeader()
             .AllowCredentials(); // Ważne dla SignalR

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
@@ -317,9 +317,12 @@ await Clients.Group(room.RoomId)
 
     public async Task MakeGrumpy(Room room, int value, string? targetNick = null)
     {
+        Console.WriteLine("MakeGrumpy - invoke");
         int grumpyValue = room.ActivePlayer.PrepareGrumpy(value, out List<int?> cardsToDelete);
+        Console.WriteLine("Grumpy Value: " + grumpyValue);
         if (string.IsNullOrEmpty(targetNick)) // all players
         {
+            Console.WriteLine("MakeGrumpy - To All");
             foreach (var player in room.Players.Values)
             {
                 player.ReceiveGrumpy(grumpyValue);
@@ -336,6 +339,7 @@ await Clients.Group(room.RoomId)
         }
         else // Single player
         { 
+            Console.WriteLine("MakeGrumpy - To target");
             var targetPlayer = room.GetPlayerByNick(targetNick);
             targetPlayer.ReceiveGrumpy(grumpyValue);
             // emit

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
@@ -12,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();