diff --git a/web/game.js b/web/game.js index b54be8a..a49a542 100644 --- a/web/game.js +++ b/web/game.js @@ -1,77 +1,3 @@ -//--------------------Game-------------------- -// Game variables -const width = window.innerWidth; -const height = window.innerHeight; -let requesteddata = []; -let buttonWidth = width / 6 -let buttonHeight = buttonWidth / 5 -// Menu variables -let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); -let currentIndex = [0, 0, 0]; -let nameHS = ''; -let pressed = false; - -// Player variables -const playerSize = 10; -let radius = playerSize / 2; -let playerPosX = 500 -let playerPosY = 300; -let playerSpeed = 4; -let lives = 1; -let isDead = false; -let bossPosX = width / 2; -let bossPosY = height / 6; -let bossVelX = 5; -let bossVelY = 5; -let shotSpeed = 12; -let shotSpeedAdj; -let projectile; -let projSize = 5; -let shot = false; -let hit = false; -let shotPosX; -let shotPosY; - -let initialPlayerPosX = playerPosX; -let initialPlayerPosY = playerPosY; -let bullets = []; -let direction; -let framerate = 120; -let hasMoved = false; -let time = 0; -let shotPoint = 0; -let angle = 0; - -let patern; -let paternArray = []; -let suroundX = 300; -let suroundY = 300; -let x2; -let y2; -let x3; -let y3; -let x4; -let y4; -let x5; -let y5; -let homescreenOn = true; -let pausescreenOn = false; -let chosen = false; -let finalPhase = false; -let nextWave = []; -let iIndex = 0; -let buttonSelectDead = 0; -let buttonSelectHome = 0; -let buttonSelectPause = 0; -let entered = false; -let submitted = false; -let keyReleasedFlag = true; -let escaped = false; - -let bulletAmount = 5; - -let phases = [false, false, false, false, false]; - // the function setup() is called once when the page is loaded function setup() { // create a canvas element and append it to the body @@ -608,16 +534,16 @@ function bouncing() { bossPosY += bossVelY; // Check for bounce if (bossPosX > width - 25) { - bossVelX = random([-4, -5, -6]); + bossVelX = random([-4, -5, -6, -7]); } if (bossPosX < 25) { - bossVelX = random([4, 5, 6]); + bossVelX = random([4, 5, 6, 7]); } if (bossPosY > height - 25) { - bossVelY = random([-4, -5, -6]); + bossVelY = random([-4, -5, -6, -7]); } if (bossPosY < 25) { - bossVelY = random([4, 5, 6]); + bossVelY = random([4, 5, 6, 7]); } // Draw the boss diff --git a/web/index.html b/web/index.html index a9fbacf..da84d87 100644 --- a/web/index.html +++ b/web/index.html @@ -15,6 +15,7 @@ + diff --git a/web/js/variables.js b/web/js/variables.js new file mode 100644 index 0000000..1c19737 --- /dev/null +++ b/web/js/variables.js @@ -0,0 +1,73 @@ +//--------------------Game-------------------- +// Game variables +const width = window.innerWidth; +const height = window.innerHeight; +let requesteddata = []; +let buttonWidth = width / 6 +let buttonHeight = buttonWidth / 5 +// Menu variables +let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); +let currentIndex = [0, 0, 0]; +let nameHS = ''; +let pressed = false; + +// Player variables +const playerSize = 10; +let radius = playerSize / 2; +let playerPosX = 500 +let playerPosY = 300; +let playerSpeed = 4; +let lives = 1; +let isDead = false; +let bossPosX = width / 2; +let bossPosY = height / 6; +let bossVelX = 5; +let bossVelY = 5; +let shotSpeed = 12; +let shotSpeedAdj; +let projectile; +let projSize = 5; +let shot = false; +let hit = false; +let shotPosX; +let shotPosY; + +let initialPlayerPosX = playerPosX; +let initialPlayerPosY = playerPosY; +let bullets = []; +let direction; +let framerate = 120; +let hasMoved = false; +let time = 0; +let shotPoint = 0; +let angle = 0; + +let patern; +let paternArray = []; +let suroundX = 300; +let suroundY = 300; +let x2; +let y2; +let x3; +let y3; +let x4; +let y4; +let x5; +let y5; +let homescreenOn = true; +let pausescreenOn = false; +let chosen = false; +let finalPhase = false; +let nextWave = []; +let iIndex = 0; +let buttonSelectDead = 0; +let buttonSelectHome = 0; +let buttonSelectPause = 0; +let entered = false; +let submitted = false; +let keyReleasedFlag = true; +let escaped = false; + +let bulletAmount = 5; + +let phases = [false, false, false, false, false];