From cb7448380ef351f545df359625cf19de32266114 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 6 Dec 2023 13:22:42 +0100 Subject: [PATCH 1/3] added wait function + delay between random patern --- web/game.js | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/web/game.js b/web/game.js index ceef14d..288f91e 100644 --- a/web/game.js +++ b/web/game.js @@ -45,6 +45,7 @@ let x4; let y4; let x5; let y5; +let chosen = false; let bulletAmount = 10; @@ -84,6 +85,7 @@ function life() { hasMoved = false; bullets = []; shot = false; + chosen = false; } } @@ -95,7 +97,7 @@ function movementCheck() { } } -function keyPressed() { +async function keyPressed() { if (keyIsDown(LEFT_ARROW) && playerPosX > 0 + radius) { playerPosX -= playerSpeed; } @@ -108,23 +110,15 @@ function keyPressed() { if (keyIsDown(DOWN_ARROW) && playerPosY < height - radius) { playerPosY += playerSpeed; } - if (key == 'e') { - // adding a quick movement button that moves you further in the direction your already moving - playerSpeed += 2; - wait(2); - } else { - playerSpeed = 4; - } } - -function wait(waitTime){ - startTime = time; - if (startTime + waitTime > time){ - return true; - } +function wait(waitTime) { + return new Promise(resolve => { + setTimeout(() => { + resolve(true); + }, waitTime); + }); } - async function Movementloop() { window.addEventListener('booleanArrayUpdated', function (event) { // event.detail contains the booleanArray @@ -205,6 +199,19 @@ function draw() { bullets = bullets.filter(bullet => !bullet.hit); } } +async function randPatern () { + patern = random([1,2]); + chosen = true; + if (patern == 1) { + await wait(3000); + chosen = false; + } + if (patern == 2) { + await wait(5000); + chosen = false; + } + +} function randomAttackPattern() { if (shot == false || hit == true) { @@ -215,8 +222,10 @@ function randomAttackPattern() { } function spawnRandomBullet() { + if (chosen == false) { + randPatern(); + } - patern = random([1,2]); if (patern == 1) { nextAttack = random([1, 2, 3, 4, 5]); //text(nextAttack, 30, 50); From 3d49c6e9158c3b5542da59226828451eabf3c922 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 6 Dec 2023 13:25:27 +0100 Subject: [PATCH 2/3] added --- docs/documentatie/presentatie.md | 5 ++++- web/index.html | 1 + web/js/homescreen.js | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 web/js/homescreen.js diff --git a/docs/documentatie/presentatie.md b/docs/documentatie/presentatie.md index 62838ff..b88fb65 100644 --- a/docs/documentatie/presentatie.md +++ b/docs/documentatie/presentatie.md @@ -1 +1,4 @@ -# Presentie \ No newline at end of file +# Presentie + +De presentatie ging goed, we waren wel een aantal dingen vergeten zoals de feedback van mensen over de wireflow opnemen in de presentatie. We moesten ook beter onderzoek doen over de doelgroep en dat meer laten zien in de presentatie. + diff --git a/web/index.html b/web/index.html index c2f686e..438fd4d 100644 --- a/web/index.html +++ b/web/index.html @@ -10,6 +10,7 @@ + diff --git a/web/js/homescreen.js b/web/js/homescreen.js new file mode 100644 index 0000000..39f1137 --- /dev/null +++ b/web/js/homescreen.js @@ -0,0 +1,23 @@ +class Startscreen { + constructor(width, height) { + this.width = width; + this.height = height; + + } + + setup() { + createCanvas(this.width, this.height); + + } + + + draw() { + circle(100, 100, 100) + } + + update() { + + } + + +} \ No newline at end of file From ada61191276b95ac29c035a814f57ad134e142cb Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Wed, 6 Dec 2023 13:26:53 +0100 Subject: [PATCH 3/3] deleted double randpatern --- web/game.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/web/game.js b/web/game.js index 5b1f1eb..f114d35 100644 --- a/web/game.js +++ b/web/game.js @@ -226,19 +226,7 @@ function draw() { homescreen(); } } -async function randPatern () { - patern = random([1,2]); - chosen = true; - if (patern == 1) { - await wait(3000); - chosen = false; - } - if (patern == 2) { - await wait(5000); - chosen = false; - } -} async function randPatern () { patern = random([1,2]); chosen = true;