diff --git a/web/game.js b/web/game.js index 1ed35f1..cd0468f 100644 --- a/web/game.js +++ b/web/game.js @@ -60,11 +60,8 @@ let iIndex = 0; let bulletAmount = 5; -let phase1 = false; -let phase2 = false; -let phase3 = false; -let phase4 = false; -let phase5 = false; +let phases = [false, false, false, false, false]; + //let myBullet = new bullet(); // the function setup() is called once when the page is loaded function setup() { @@ -269,7 +266,7 @@ async function randPatern() { chosen = false; } if (patern == 5) { - if (phase1 == true) { + if (phases[0] == true) { nextWave = random([1, 2, 3, 4]); } await wait(3000); @@ -289,9 +286,9 @@ function randomAttackPattern() { function phase() { switch (true) { case (time < 20): - phase1 = true; + phases[0] = true; paternArray = [5]; - shotSpeedAdj = 3; + shotSpeedAdj = 2; push(); fill(255, 0, 255); textSize(10); @@ -302,8 +299,8 @@ function phase() { case (time < 60): shotSpeedAdj = 5; paternArray = [5]; - phase1 = false; - phase2 = true; + phases[0] = false; + phases[1] = true; push(); fill(255, 0, 255); textSize(10); @@ -312,8 +309,8 @@ function phase() { pop(); break; case (time < 90): - phase2 = false; - phase3 = true; + phases[1] = false; + phases[2] = true; paternArray = [2]; push(); fill(255, 0, 255); @@ -323,8 +320,8 @@ function phase() { pop(); break; case (time < 120): - phase3 = false; - phase4 = true; + phases[2] = false; + phases[3] = true; paternArray = [3, 4]; push(); fill(255, 0, 255); @@ -334,8 +331,8 @@ function phase() { pop(); break; case (time >= 120): - phase4 = false; - phase5 = false; + phases[3] = false; + phases[4] = false; finalPhase = true; paternArray = [1, 2, 3, 4, 5]; push(); @@ -428,7 +425,7 @@ function spawnRandomBullet() { angle = 0; } if (patern == 5) { - if (phase1 == false) { + if (phases[0] == false) { nextWave = random([1, 2, 3, 4]); bulletAmount = 10; }