Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-2/cuujooceevii61

web/game.js

@@ -20,7 +20,9 @@ let playerSpeed = 4;
 let lives = 1;
 let isDead = false;
 let bossPosX = width / 2;
-let bossPosY = 100;
+let bossPosY = height / 6;
+let bossVelX = 5;
+let bossVelY = 5;
 let shotSpeed = 12;
 let shotSpeedAdj;
 let projectile;
@@ -87,8 +89,6 @@ function score() {
 function reset() {
     lives = 1;
     time = 0;
-    bounceX = bossPosX;
-    bounceY = bossPosY;
     initialPlayerPosX = playerPosX;
     initialPlayerPosY = playerPosY;
     hasMoved = false;
@@ -451,7 +451,7 @@ function phase() {
     switch (true) {
         case (time < 20):
             phases[0] = true;
-            paternArray = [1];
+            paternArray = [5];
             shotSpeedAdj = 2;
             push();
             fill(255, 0, 255);
@@ -461,7 +461,7 @@ function phase() {
             pop();
             break;
         case (time < 60):
-            shotSpeedAdj = 5;
+            shotSpeedAdj = 3;
             paternArray = [5];
             phases[0] = false;
             phases[1] = true;
@@ -559,10 +559,6 @@ function spawnRandomBullet() {
         }
         bullets.push(new bullet(playerPosX, playerPosY, radius, shotSpeed, shotPosX, shotPosY, hasMoved, 0));
     }
-    if (!(patern == 2)) {
-        bossPosX = width / 2;
-        bossPosY = 100;
-    }
     if (patern == 3) {
         shotPosX = bossPosX;
         shotPosY = bossPosY;
@@ -629,6 +625,28 @@ function spawnRandomBullet() {
         bulletAmount = 5;
     }
 }
+// function bouncing() {
+//     // Update position
+//     bossPosX += bossVelX;
+//     bossPosY += bossVelY;
+//     // Check for bounce
+//     if (bossPosX > width - 25) {
+//         bossVelX = random([-4,-5,-6])
+//     }
+//     if (bossPosX < 25) {
+//         bossVelX = random([4,5,6])
+//     }
+//     if (bossPosY > height - 25) {
+//         bossVelY = random([-4,-5,-6])
+//     }
+//     if (bossPosY < 25) {
+//         bossVelY = random([4,5,6])
+//     }
+
+//     // Draw the boss
+//     circle(bossPosX, bossPosY, 50);
+// }
+
 function game() {
     if (!(lives == 0)) {
         // draw player
@@ -637,11 +655,12 @@ function game() {
         fill(0, 255, 255)
         circle(constrain(playerPosX, 0 + radius, width - radius), constrain(playerPosY, 0 + radius, height - radius), playerSize);
         pop();
-        movementCheck()
-        // draw boss
+        movementCheck();
+        //bouncing();
+
         push();
         fill(255, 165, 0)
-        circle(x2, y2, 50);
+
         pop();
         if (hasMoved == true) {
             push();