Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-2/cuujooceevii61
This commit is contained in:
33
web/game.js
33
web/game.js
@@ -53,6 +53,7 @@ let x5;
|
|||||||
let y5;
|
let y5;
|
||||||
let homescreenOn = true;
|
let homescreenOn = true;
|
||||||
let chosen = false;
|
let chosen = false;
|
||||||
|
let finalPhase = false;
|
||||||
|
|
||||||
let bulletAmount = 5;
|
let bulletAmount = 5;
|
||||||
//let myBullet = new bullet();
|
//let myBullet = new bullet();
|
||||||
@@ -100,6 +101,7 @@ function gameOver() {
|
|||||||
bullets = [];
|
bullets = [];
|
||||||
shot = false;
|
shot = false;
|
||||||
chosen = false;
|
chosen = false;
|
||||||
|
finalPhase = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,7 +202,7 @@ async function randPatern() {
|
|||||||
chosen = false;
|
chosen = false;
|
||||||
}
|
}
|
||||||
if (patern == 2) {
|
if (patern == 2) {
|
||||||
await wait(5000);
|
await wait(10000);
|
||||||
chosen = false;
|
chosen = false;
|
||||||
}
|
}
|
||||||
if (patern == 3) {
|
if (patern == 3) {
|
||||||
@@ -237,7 +239,7 @@ function phase() {
|
|||||||
text("phase 1", 10, 50);
|
text("phase 1", 10, 50);
|
||||||
pop();
|
pop();
|
||||||
break;
|
break;
|
||||||
case (time < 40):
|
case (time < 60):
|
||||||
paternArray = [2, 5]
|
paternArray = [2, 5]
|
||||||
push();
|
push();
|
||||||
fill(255, 0, 255);
|
fill(255, 0, 255);
|
||||||
@@ -246,7 +248,7 @@ function phase() {
|
|||||||
text("phase 2", 10, 50);
|
text("phase 2", 10, 50);
|
||||||
pop();
|
pop();
|
||||||
break;
|
break;
|
||||||
case (time < 60):
|
case (time < 90):
|
||||||
paternArray = [3, 4]
|
paternArray = [3, 4]
|
||||||
push();
|
push();
|
||||||
fill(255, 0, 255);
|
fill(255, 0, 255);
|
||||||
@@ -255,7 +257,8 @@ function phase() {
|
|||||||
text("phase 3", 10, 50);
|
text("phase 3", 10, 50);
|
||||||
pop();
|
pop();
|
||||||
break;
|
break;
|
||||||
case (time > 6):
|
case (time >= 90):
|
||||||
|
finalPhase = true;
|
||||||
paternArray = [1, 2, 3, 4, 5]
|
paternArray = [1, 2, 3, 4, 5]
|
||||||
push();
|
push();
|
||||||
fill(255, 0, 255);
|
fill(255, 0, 255);
|
||||||
@@ -348,39 +351,45 @@ function spawnRandomBullet() {
|
|||||||
}
|
}
|
||||||
if (patern == 5) {
|
if (patern == 5) {
|
||||||
let nextAttack = random([1, 2, 3, 4]);
|
let nextAttack = random([1, 2, 3, 4]);
|
||||||
|
bulletAmount = 15;
|
||||||
if (nextAttack == 1) {
|
if (nextAttack == 1) {
|
||||||
for (let i = 0; i < random(3, 15); i++) {
|
for (let i = 0; i < random(8, 15); i++) {
|
||||||
let shotWidth = random(0, width);
|
let shotWidth = random(0, width);
|
||||||
shotPosX = shotWidth;
|
shotPosX = shotWidth;
|
||||||
shotPosY = height;
|
shotPosY = height;
|
||||||
bullets.push(new bullet(shotWidth, 0, radius, shotSpeed / 4, shotPosX, shotPosY, hasMoved, angle));
|
bullets.push(new bullet(shotWidth, 0, radius, shotSpeed / 5, shotPosX, shotPosY, hasMoved, angle));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (nextAttack == 2) {
|
if (nextAttack == 2) {
|
||||||
for (let i = 0; i < random(3, 15); i++) {
|
for (let i = 0; i < random(8, 10); i++) {
|
||||||
let shotWidth = random(0, width);
|
let shotWidth = random(0, width);
|
||||||
shotPosX = shotWidth;
|
shotPosX = shotWidth;
|
||||||
shotPosY = 0;
|
shotPosY = 0;
|
||||||
bullets.push(new bullet(shotWidth, height, radius, shotSpeed / 4, shotPosX, shotPosY, hasMoved, angle));
|
bullets.push(new bullet(shotWidth, height, radius, shotSpeed / 5, shotPosX, shotPosY, hasMoved, angle));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (nextAttack == 3) {
|
if (nextAttack == 3) {
|
||||||
for (let i = 0; i < random(3, 15); i++) {
|
for (let i = 0; i < random(8, 10); i++) {
|
||||||
let shotHeight = random(0, width);
|
let shotHeight = random(0, width);
|
||||||
shotPosX = 0;
|
shotPosX = 0;
|
||||||
shotPosY = shotHeight;
|
shotPosY = shotHeight;
|
||||||
bullets.push(new bullet(width, shotHeight, radius, shotSpeed / 4, shotPosX, shotPosY, hasMoved, angle));
|
bullets.push(new bullet(width, shotHeight, radius, shotSpeed / 5, shotPosX, shotPosY, hasMoved, angle));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (nextAttack == 4) {
|
if (nextAttack == 4) {
|
||||||
for (let i = 0; i < random(3, 15); i++) {
|
for (let i = 0; i < random(8, 10); i++) {
|
||||||
let shotHeight = random(0, width);
|
let shotHeight = random(0, width);
|
||||||
shotPosX = width;
|
shotPosX = width;
|
||||||
shotPosY = shotHeight;
|
shotPosY = shotHeight;
|
||||||
bullets.push(new bullet(0, shotHeight, radius, shotSpeed / 4, shotPosX, shotPosY, hasMoved, angle));
|
bullets.push(new bullet(0, shotHeight, radius, shotSpeed / 5, shotPosX, shotPosY, hasMoved, angle));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
bulletAmount = 5;
|
||||||
|
if (finalPhase == true) {
|
||||||
|
bulletAmount = 10;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user