From 63e958cb9763d23e76511de8b0d1ef98990436ef Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 14:08:12 +0100 Subject: [PATCH 1/6] added multiple letters --- web/game.js | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/web/game.js b/web/game.js index c4b09ae..e84baa6 100644 --- a/web/game.js +++ b/web/game.js @@ -5,7 +5,7 @@ const height = 620; // Menu variables let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); -let currentIndex = 0; +let currentIndex = [0, 0, 0]; let name = ''; let pressed = false; @@ -55,6 +55,7 @@ let homescreenOn = true; let chosen = false; let finalPhase = false; let nextWave = []; +let iIndex; let bulletAmount = 5; //let myBullet = new bullet(); @@ -89,7 +90,9 @@ function gameOver() { push(); fill(255, 255, 255) textSize(32); - text(letters[currentIndex], width / 2, height / 2); + text(letters[currentIndex[0]], width / 2 - 25, height / 2); + text(letters[currentIndex[1]], width / 2, height / 2); + text(letters[currentIndex[2]], width / 2 + 25, height / 2); pop(); if (key == ' ') { @@ -133,26 +136,44 @@ async function keyPressed() { } } if (isDead && keyReleasedFlag) { + if (!(iIndex < 3 || iIndex > 0)) { + if (keyCode == LEFT_ARROW) { + iIndex -= 1; + keyReleasedFlag = false; + } + if (keyCode == RIGHT_ARROW) { + iIndex += 1; + keyReleasedFlag = false; + } + } if (keyCode == UP_ARROW) { - currentIndex = (currentIndex + 1) % letters.length; + currentIndex[iIndex] = (currentIndex[iIndex] + 1) % letters.length; keyReleasedFlag = false; } if (keyCode == DOWN_ARROW) { - currentIndex = (currentIndex - 1 + letters.length) % letters.length; + currentIndex[iIndex] = (currentIndex[iIndex] - 1 + letters.length) % letters.length; keyReleasedFlag = false; } if (keyCode == ENTER) { - name += letters[currentIndex]; + name += letters[currentIndex[iIndex]]; console.log(name); keyReleasedFlag = false; } + } } + function keyReleased() { keyReleasedFlag = true; // Set the flag to true when a key is released } +// function currentCurrentIndex() { +// let currentCurrentIndex = [0,0,0]; +// if keyCode == LEFT_ARROW { + +// } + function wait(waitTime) { return new Promise(resolve => { setTimeout(() => { From 420439dead2beed9bcd85b3955d23c9b30d3a141 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 15:18:57 +0100 Subject: [PATCH 2/6] multiple letters can be changed and stored --- web/game.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/web/game.js b/web/game.js index e84baa6..38e98fb 100644 --- a/web/game.js +++ b/web/game.js @@ -6,7 +6,7 @@ const height = 620; // Menu variables let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); let currentIndex = [0, 0, 0]; -let name = ''; +let nameHS = ''; let pressed = false; // Player variables @@ -55,7 +55,7 @@ let homescreenOn = true; let chosen = false; let finalPhase = false; let nextWave = []; -let iIndex; +let iIndex = 0; let bulletAmount = 5; //let myBullet = new bullet(); @@ -93,6 +93,7 @@ function gameOver() { text(letters[currentIndex[0]], width / 2 - 25, height / 2); text(letters[currentIndex[1]], width / 2, height / 2); text(letters[currentIndex[2]], width / 2 + 25, height / 2); + text(iIndex, width / 2 + 50, height / 2); pop(); if (key == ' ') { @@ -136,7 +137,7 @@ async function keyPressed() { } } if (isDead && keyReleasedFlag) { - if (!(iIndex < 3 || iIndex > 0)) { + if ((iIndex < 2) || (iIndex > 0)) { if (keyCode == LEFT_ARROW) { iIndex -= 1; keyReleasedFlag = false; @@ -155,8 +156,10 @@ async function keyPressed() { keyReleasedFlag = false; } if (keyCode == ENTER) { - name += letters[currentIndex[iIndex]]; - console.log(name); + nameHS += letters[currentIndex[0]]; + nameHS += letters[currentIndex[1]]; + nameHS += letters[currentIndex[2]]; + console.log(nameHS); keyReleasedFlag = false; } @@ -168,12 +171,6 @@ function keyReleased() { keyReleasedFlag = true; // Set the flag to true when a key is released } -// function currentCurrentIndex() { -// let currentCurrentIndex = [0,0,0]; -// if keyCode == LEFT_ARROW { - -// } - function wait(waitTime) { return new Promise(resolve => { setTimeout(() => { From 2019e194b4eb62c7de8d971c86a79d5d74517ca3 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 15:25:57 +0100 Subject: [PATCH 3/6] added constarin to iInput --- web/game.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/game.js b/web/game.js index 38e98fb..ceedf81 100644 --- a/web/game.js +++ b/web/game.js @@ -80,6 +80,7 @@ function score() { function gameOver() { if (lives == 0) { //game over screen + iIndex = constrain(iIndex, 0, 2); isDead = true; push(); fill(255, 0, 0); @@ -137,7 +138,7 @@ async function keyPressed() { } } if (isDead && keyReleasedFlag) { - if ((iIndex < 2) || (iIndex > 0)) { + if ((!(iIndex > 2)) || (!(iIndex < 0))) { if (keyCode == LEFT_ARROW) { iIndex -= 1; keyReleasedFlag = false; From 26cadcf1aa50498054f6026b5ac9284a2d9f17ec Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 15:31:06 +0100 Subject: [PATCH 4/6] textAlign(center) added --- web/game.js | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/web/game.js b/web/game.js index ceedf81..ec00c0e 100644 --- a/web/game.js +++ b/web/game.js @@ -91,10 +91,10 @@ function gameOver() { push(); fill(255, 255, 255) textSize(32); + textAlign(CENTER); text(letters[currentIndex[0]], width / 2 - 25, height / 2); text(letters[currentIndex[1]], width / 2, height / 2); text(letters[currentIndex[2]], width / 2 + 25, height / 2); - text(iIndex, width / 2 + 50, height / 2); pop(); if (key == ' ') { @@ -418,24 +418,7 @@ function spawnRandomBullet() { function homescreen() { - // push() - // fill(0, 0, 0, 200) - // square(0, 0, 1600) - // pop() - - // push() - // fill(255, 0, 0) - // let buttonHeight = height/2 - // rect(width/2-90, buttonHeight, 200, 40 , 20, 20, 20, 20) - // textSize(25) - // fill(0,0,0) - // text("Start Game", width/2+10, buttonHeight+30) - // if (mouseX > width/2-90 && mouseX < width/2+110 && mouseY > height/2 && mouseY < buttonHeight+40) { - // if (mouseIsPressed) { - // homescreenOn = false; - // } - // } - // pop() + textAlign(CENTER); button(0, 0, 0, width / 2 - 90, height / 2, 200, 40, "Start Game") button(0, 0, 0, width / 2 - 90, height / 2 + 50, 200, 40, "Scores") From e97eaf5804b3dfc5f2e573668c18739cdafb13d8 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 15:40:54 +0100 Subject: [PATCH 5/6] added square around selected letter space --- web/game.js | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/web/game.js b/web/game.js index ec00c0e..6eb52bd 100644 --- a/web/game.js +++ b/web/game.js @@ -92,9 +92,9 @@ function gameOver() { fill(255, 255, 255) textSize(32); textAlign(CENTER); - text(letters[currentIndex[0]], width / 2 - 25, height / 2); + text(letters[currentIndex[0]], width / 2 - 30, height / 2); text(letters[currentIndex[1]], width / 2, height / 2); - text(letters[currentIndex[2]], width / 2 + 25, height / 2); + text(letters[currentIndex[2]], width / 2 + 30, height / 2); pop(); if (key == ' ') { @@ -161,10 +161,9 @@ async function keyPressed() { nameHS += letters[currentIndex[1]]; nameHS += letters[currentIndex[2]]; console.log(nameHS); + nameHS = ''; keyReleasedFlag = false; } - - } } @@ -214,9 +213,35 @@ function draw() { if (homescreenOn == false) { game(); } - // keyIsDown(); -} + if (isDead == true) { + if (iIndex == 0) { + push() + stroke(205, 205, 205) + strokeWeight(2) + fill(0, 0, 0, 0) + rect(width / 2 - 45, height / 2 - 30, 30, 40) + pop() + } + if (iIndex == 1) { + push() + stroke(205, 205, 205) + strokeWeight(2) + fill(0, 0, 0, 0) + rect(width / 2 - 15, height / 2 - 30, 30, 40) + pop() + } + if (iIndex == 2) { + push() + stroke(205, 205, 205) + strokeWeight(2) + fill(0, 0, 0, 0) + rect(width / 2 + 15, height / 2 - 30, 30, 40) + pop() + } + // keyIsDown(); + } +} async function randPatern() { patern = random(paternArray); chosen = true; From b32e0a4a5d5a92e6b181c895fdf78c5aa29e5b72 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 13 Dec 2023 15:53:09 +0100 Subject: [PATCH 6/6] added score to console(log) --- web/game.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/game.js b/web/game.js index 6eb52bd..e09b8d8 100644 --- a/web/game.js +++ b/web/game.js @@ -160,7 +160,7 @@ async function keyPressed() { nameHS += letters[currentIndex[0]]; nameHS += letters[currentIndex[1]]; nameHS += letters[currentIndex[2]]; - console.log(nameHS); + console.log(nameHS + ": " + int(time)); nameHS = ''; keyReleasedFlag = false; }