Merge pull request #318 from zstenger93/gameFixes

Game Bug Fixes
zstenger93 · Apr 21, 2024 · 40705ca · 40705ca
2 parents a895b83 + 9c85f1b
commit 40705ca
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/frontend/src/pages/Games/Tournament.js b/frontend/src/pages/Games/Tournament.js
@@ -461,6 +461,7 @@ const Tournament = () => {
                 width: "100%",
                 height: "12%",
                 marginBottom: "5%",
+                minHeight: "12%",
                 alignItems: "center",
                 display: "flex",
                 flexDirection: "column",
@@ -498,6 +499,7 @@ const Tournament = () => {
                 width: "100%",
                 height: "12%",
                 marginBottom: "5%",
+                minHeight: "12%",
                 alignItems: "center",
                 display: "flex",
                 flexDirection: "column",
@@ -535,6 +537,7 @@ const Tournament = () => {
                 width: "100%",
                 height: "12%",
                 marginBottom: "5%",
+                minHeight: "12%",
                 alignItems: "center",
                 display: "flex",
                 flexDirection: "column",
@@ -570,6 +573,7 @@ const Tournament = () => {
               style={{
                 width: "100%",
                 height: "12%",
+                minHeight: "12%",
                 marginBottom: "5%",
                 alignItems: "center",
                 display: "flex",
@@ -600,6 +604,7 @@ const Tournament = () => {
               style={{
                 width: "100%",
                 height: "12%",
+                minHeight: "12%",
                 marginBottom: "5%",
                 alignItems: "center",
                 display: "flex",
@@ -908,7 +913,7 @@ const Tournament = () => {
   var ballX = 50;
   var ballY = 50;
   var ballDirX = 1;
-  var ballDirY = 0;
+  var ballDirY = 0.05;
   var scorePlayer1 = 0;
   var scorePlayer2 = 0;
 
@@ -974,7 +979,7 @@ const Tournament = () => {
     const match = tournament.matches[tournament.currentMatch];
     match.winner = scorePlayer1 > scorePlayer2 ? match.player1 : match.player2;
     match.matchId = tournament.currentMatch;
-    if (match.player1.score > match.player2.score) match.player1.score += 1;
+    if (scorePlayer1 > scorePlayer2) match.player1.score += 1;
     else match.player2.score += 1;
     match.scorePlayer1 = scorePlayer1;
     match.scorePlayer2 = scorePlayer2;
@@ -1026,7 +1031,7 @@ const Tournament = () => {
       ballX = canvas.width / 2;
       ballY = canvas.height / 2;
       ballDirX = ballDirX * -1;
-      ballDirY = 0;
+      ballDirY = 0.05;
       ballSpeed = 0.9;
       if (scorePlayer1 >= 2 || scorePlayer2 >= 2) {
         ballSpeed = 0;