From c75a16e3670d1cfec4920fc8303ade547dcdd301 Mon Sep 17 00:00:00 2001
From: Mees Roelofsz <mees.roelofsz@hva.nl>
Date: Sat, 6 Jan 2024 15:20:22 +0100
Subject: [PATCH] made it possible to change name without sending both to db

---
 web/game.js | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/web/game.js b/web/game.js
index ab09fc0..ce3e37e 100644
--- a/web/game.js
+++ b/web/game.js
@@ -59,6 +59,7 @@ let nextWave = [];
 let iIndex = 0;
 let buttonSelect = 0;
 let entered = false;
+let submitted = false;
 
 let bulletAmount = 5;
 
@@ -156,9 +157,6 @@ async function keyPressed() {
             nameHS += letters[currentIndex[0]];
             nameHS += letters[currentIndex[1]];
             nameHS += letters[currentIndex[2]];
-            Senddata(nameHS, int(time));
-            console.log(nameHS + ": " + int(time));
-            nameHS = '';
             entered = true;
             keyReleasedFlag = false;
         }
@@ -172,6 +170,17 @@ async function keyPressed() {
             buttonSelect += 1;
             keyReleasedFlag = false;
         }
+        if (buttonSelect == 0) {
+            if (keyCode == RIGHT_ARROW && !submitted) {
+                entered = false;
+                nameHS = '';
+                keyReleasedFlag = false;
+            }
+            if (keyCode == ENTER) {
+                submit();
+                keyReleasedFlag = false;   
+            }
+        }
         if (buttonSelect == 1) {
             if (keyCode == ENTER) {
                 //reset all the variables so the game can be played again
@@ -189,6 +198,7 @@ async function keyPressed() {
                 isDead = false;
                 entered = false;
                 buttonSelect = 0;
+                submitted = false;
             }
         }
         if (buttonSelect == 2) {
@@ -209,11 +219,21 @@ async function keyPressed() {
                 isDead = false;
                 entered = false;
                 buttonSelect = 0;
+                submitted = false;
             }
         }
     }
 }
 
+function submit() {
+    if (entered == true) {
+        Senddata(nameHS, int(time));
+        console.log(nameHS + ": " + int(time));
+        nameHS = '';
+        submitted = true;
+    }
+}
+
 function keyReleased() {
     keyReleasedFlag = true; // Set the flag to true when a key is released
 }
@@ -257,7 +277,6 @@ function draw() {
         homescreen();
     }
     if (homescreenOn == false) {
-        phase();
         game();
     }
     if (isDead == true) {
@@ -590,6 +609,7 @@ function button(r, g, b, buttonX, buttonY, buttonWidth, buttonHeight, buttonText
 function game() {
     if (!(lives == 0)) {
         // draw player
+        phase();
         push();
         fill(0, 255, 255)
         circle(constrain(playerPosX, 0 + radius, width - radius), constrain(playerPosY, 0 + radius, height - radius), playerSize);