diff --git a/css/game.css b/css/game.css index 503e339..4ef0970 100644 --- a/css/game.css +++ b/css/game.css @@ -4,8 +4,8 @@ body, html { } canvas { - width: 960px; - height: 540px; + width: auto; + height: 90%; image-rendering: pixelated; diff --git a/img/exclaimation.png b/img/exclaimation.png new file mode 100644 index 0000000..41c93fa Binary files /dev/null and b/img/exclaimation.png differ diff --git a/img/pip.png b/img/pip.png index 6a9ffb2..389bc52 100644 Binary files a/img/pip.png and b/img/pip.png differ diff --git a/img/pip_down.png b/img/pip_down.png index d8c1531..07d2b43 100644 Binary files a/img/pip_down.png and b/img/pip_down.png differ diff --git a/img/pip_left.png b/img/pip_left.png index 12a67ac..2473da2 100644 Binary files a/img/pip_left.png and b/img/pip_left.png differ diff --git a/img/pip_right.png b/img/pip_right.png index 495d546..c704c6b 100755 Binary files a/img/pip_right.png and b/img/pip_right.png differ diff --git a/img/pip_up.png b/img/pip_up.png index b13b954..b86d7e1 100644 Binary files a/img/pip_up.png and b/img/pip_up.png differ diff --git a/img/zombie_left.png b/img/zombie_left.png new file mode 100644 index 0000000..665a349 Binary files /dev/null and b/img/zombie_left.png differ diff --git a/img/zombie_right.png b/img/zombie_right.png new file mode 100644 index 0000000..8f5d67d Binary files /dev/null and b/img/zombie_right.png differ diff --git a/index.html b/index.html index a354348..2a933f2 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@ Halloween Game! + @@ -12,6 +13,8 @@ + + @@ -25,5 +28,8 @@ + + + \ No newline at end of file diff --git a/js/game.js b/js/game.js index b2efaf3..7c1ca9a 100644 --- a/js/game.js +++ b/js/game.js @@ -11,15 +11,17 @@ var pHeight = 30; var ghostS = 20; +var drawHitboxes = true; + function startGame() { - pip = new player(pWidth, pHeight, 0 + pWidth*2, canvasHeight - pHeight); - ghost = new enemy(ghostS, ghostS, 50, 50, pip, "ghost"); + pip = new player(pWidth, pHeight, 0 + pWidth*2, canvasHeight - pHeight-30); + ghost = new fairy(ghostS, ghostS, 50, 50, pip); + enemies.push( new zombie(30, 30, 100, 100) ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, pip, "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[0], "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[1], "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[2], "ghost") ); //enemies.push( new enemy(ghostS, ghostS, 50, 50, enemies[3], "ghost") ); - pip.gravity = 1; overlay = new interface(pip); @@ -29,6 +31,7 @@ function startGame() { heal = new sound("sfx/pip_heal.wav"); duck = new sound("sfx/pip_duck.wav"); squeak = new sound("sfx/ghost_squeak.wav"); + death = new sound("sfx/death.wav"); game.start(); } @@ -44,13 +47,33 @@ var game = { this.frameNo = 0; this.interval = setInterval(updateGame, 20); - window.addEventListener('keydown', function (e) { + this.keydown = function (e) { game.keys = (game.keys || []); game.keys[e.keyCode] = true; - }) - window.addEventListener('keyup', function (e) { + }; + this.keyup = function (e) { game.keys[e.keyCode] = false; - }) + }; + window.addEventListener('keydown', this.keydown); + window.addEventListener('keyup', this.keyup); + }, + end : function() { + //this.clear(); + window.clearInterval(this.interval); + death.play(); + + let deathMessage = "YOU DIED"; + ctx.font = "24px serif"; + ctx.textAlign = "center"; + + ctx.fillStyle = 'black'; + let padding = 20; + let width = ctx.measureText(deathMessage).width+padding*2; + let height = ctx.measureText(deathMessage).height; + ctx.fillRect(game.canvas.width/2-width/2, game.canvas.height/2-(24+padding/2), width, parseInt(ctx.font, padding)); + + ctx.fillStyle = "orange"; + ctx.fillText(deathMessage, this.canvas.width/2, this.canvas.height/2); }, clear : function() { this.context.clearRect(0, 0, this.canvas.width, this.canvas.height); @@ -59,7 +82,8 @@ var game = { function player(width, height, x, y) { this.hearts = 3; - this.strength = 12; + this.speed = 12; + this.iframes = 80; this.ducking = false; this.score = 0; this.width = width; @@ -68,22 +92,40 @@ function player(width, height, x, y) { this.speedY = 0; this.x = x; this.y = y; - this.gravity = 0; + this.gravity = 1; this.update = function() { ctx = game.context; let img = document.getElementById("player"); - if(this.speedY >= -(this.strength/2) && this.speedY < 0) { + if(this.speedY >= -(this.speed/2) && this.speedY < 0) { img = document.getElementById("up_player"); - }else if(this.speedY <= this.strength && this.speedY > (this.strength/2)) { + }else if(this.speedY <= this.speed && this.speedY > (this.speed/2)) { img = document.getElementById("down_player"); }else if(this.speedX < 0) { img = document.getElementById("left_player"); } else if (this.speedX > 0) { img = document.getElementById("right_player"); } + // Check if taking damage + // Decay iframes + if(this.iframes > 0) { + if(game.frameNo % 5) { + ctx.globalAlpha = 0.4; + } + this.iframes -= 1; + } + + if(drawHitboxes) { + // T R B L + // 0 1 2 3 + let hitbox = this.hitbox(); + ctx.fillStyle = 'blue'; + ctx.fillRect(hitbox[3], hitbox[0], hitbox[1]-this.x, hitbox[2]-this.y); + } + ctx.drawImage(img, this.x, this.y, this.width, this.height); + ctx.globalAlpha = 1; } this.move = function() { @@ -93,7 +135,7 @@ function player(width, height, x, y) { // Jump if (game.keys && game.keys[38]) { if(pip.y >= bottom) { - this.speedY = -this.strength; + this.speedY = -this.speed; jump.play(); } } @@ -101,7 +143,7 @@ function player(width, height, x, y) { // Duck if (game.keys && game.keys[40] || this.ducking) { if(pip.y < bottom) { - pip.speedY = this.strength; + pip.speedY = this.speed; } else { if (pip.height != pHeight / 2) { duck.play(); @@ -117,25 +159,33 @@ function player(width, height, x, y) { // Right if (game.keys && game.keys[39]) { - pip.speedX = this.strength / 2; + pip.speedX = this.speed / 2; } else { // Slow Down if(pip.speedX > 0) { - pip.speedX -= this.strength/8; + pip.speedX -= this.speed/8; } } // Left if (game.keys && game.keys[37]) { - pip.speedX = 0 - this.strength / 2; + pip.speedX = 0 - this.speed / 2; } else { // Slow Down if(pip.speedX < 0) { - pip.speedX += this.strength/8; + pip.speedX += this.speed/8; } } } + this.hitbox = function() { + let top = this.y + this.height * .45; + let right = this.x + this.width; + let bottom = this.y + this.height * .55; + let left = this.x; + return [top, right, bottom, left]; + } + this.newPos = function() { // Calc Y this.speedY += this.gravity; @@ -153,9 +203,18 @@ function player(width, height, x, y) { } } this.hurt = function() { - // Detect if ya hit sometin - this.hearts -= 1; - hurt.play(); + // Do the hurt player things + // Check if immune + if(this.iframes > 0) { + return; + } + this.iframes = 40; + if(this.hearts > 0) { + this.hearts -= 1; + hurt.play(); + return; + } + game.end(); } this.heal = function() { // Detect if ya hit sometin @@ -166,9 +225,8 @@ function player(width, height, x, y) { } } -function enemy(width, height, x, y, target, type) { - this.hearts = 3; - this.strength = 4; +function fairy(width, height, x, y, target) { + this.speed = 4; this.width = width; this.height = height; this.speedX = 0; @@ -176,8 +234,8 @@ function enemy(width, height, x, y, target, type) { this.x = x; this.y = y; this.target = target; - this.type = type; this.hiding = false; + this.scared = 0; this.gravity = 0; this.update = function() { @@ -186,36 +244,37 @@ function enemy(width, height, x, y, target, type) { // Control the transition point between animations let animateDist = .5; - let img = document.getElementById(`${this.type}`); + let img = document.getElementById(`ghost`); if(this.speedY > animateDist && (this.speedX > -animateDist && this.speedX < animateDist)) { - img = document.getElementById(`down_${this.type}`); + img = document.getElementById(`down_ghost`); }else if(this.speedY < -animateDist && (this.speedX > -animateDist && this.speedX < animateDist)) { - img = document.getElementById(`up_${this.type}`); + img = document.getElementById(`up_ghost`); }else if(this.speedX < -animateDist) { - img = document.getElementById(`left_${this.type}`); + img = document.getElementById(`left_ghost`); } else if (this.speedX > animateDist) { - img = document.getElementById(`right_${this.type}`); + img = document.getElementById(`right_ghost`); } ctx.drawImage(img, this.x, this.y, this.width, this.height); + + if(this.scared > 0) { + let img = document.getElementById(`exclaimation`); + let topCenterX = this.x+this.width/2.5; + let topCenterY = this.y-this.height/2; + ctx.drawImage(img, topCenterX, topCenterY, this.width/3, this.height/3); + this.scared -= 1; + } } this.move = function() { - //var distX = this.speedX = (pip.x - this.x) - //var distY = this.speedY = (pip.y - this.y) - - // move at a percentage of strength based on distance - //this.speedX = ((distX) / 100) * this.strength; - //this.speedY = ((distY) / 100) * this.strength; - // if the ghost is hiding, only move after player gets a certain distance away var distance = Math.sqrt(Math.pow(this.x - this.target.x, 2) + Math.pow(this.y - this.target.y, 2)); - console.log(distance); - if(distance < 1) { + if(distance < 2) { this.hiding = true; return; } else if(distance > 100 && this.hiding) { this.hiding = false; + this.scared = 20; squeak.play(); } @@ -224,32 +283,106 @@ function enemy(width, height, x, y, target, type) { this.speedY = 0; } else { // Determine where the player will be and move there instead - var distX = this.speedX = this.target.x + (this.target.speedX / 100 * this.target.strength) - this.x; - var distY = this.speedY = this.target.y + (this.target.speedY / 100 * this.target.strength) - this.y; + var distX = this.speedX = this.target.x + (this.target.speedX / 100 * this.target.speed) - this.x; + var distY = this.speedY = this.target.y + (this.target.speedY / 100 * this.target.speed) - this.y; - this.speedX = ((distX) / 100) * this.strength; - this.speedY = ((distY) / 100) * this.strength; + this.speedX = ((distX) / 100) * this.speed; + this.speedY = ((distY) / 100) * this.speed; } } this.newPos = function() { // Calc Y - // Add some jiggle - //var jiggle = Math.floor(Math.random() * 2)/2; - //var sign = Math.floor(Math.random() * 2)?1:-1; - - //this.speedY += sign*jiggle; this.y += this.speedY; - // Calc X this.x += this.speedX; } } +function zombie(width, height, x, y) { + this.hearts = 3; + this.speed = 1; + this.width = width; + this.height = height; + this.speedX = 0; + this.speedY = 0; + this.x = x; + this.y = y; + this.gravity = 1; + + this.update = function() { + ctx = game.context; + + let img = document.getElementById(`left_zombie`); + if(this.speedX < 0) { + img = document.getElementById(`left_zombie`); + } else { + img = document.getElementById(`right_zombie`); + } + + if(drawHitboxes) { + // T R B L + let hitbox = this.hitbox(); + ctx.fillStyle = 'green'; + ctx.fillRect(hitbox[3], hitbox[0], hitbox[1]-this.x, hitbox[2]-this.y); + } + + ctx.drawImage(img, this.x, this.y, this.width, this.height); + } + + this.move = function() { + + let bottom = game.canvas.height - this.height; + let direction = 0; + + if(game.frameNo % 40 == 1) { + direction = Math.floor(Math.random() * 2)?-1:1; + } else if(this.x >= game.canvas.width-10) { + // Move Move Left + direction = -1; + } else if(this.x <= 0+10) { + // Move Move Right + direction = 1; + } else { + // Ruin the equation to keep the same state + direction = this.speedX/this.speed; + } + this.speedX = direction * this.speed; + + if(this.y < bottom) { + this.speedY += this.gravity; + } + this.hitBottom(); + + } + + this.hitBottom = function() { + var bottom = game.canvas.height - this.height; + if(this.y > bottom){ + this.y = bottom; + this.speedY = 0; + } + } + + this.hitbox = function() { + let top = this.y + this.height * .1; + let right = this.x + this.width*.8; + let bottom = this.y + this.height * .9; + let left = this.x + this.width*.2; + return [top, right, bottom, left]; + } + + this.newPos = function() { + // Calc X + this.x += this.speedX; + this.y += this.speedY; + } +} + function interface(pip) { this.hearts = pip.hearts; - this.width = 30; - this.height = 30; + this.width = 15; + this.height = 15; this.padding = 5; this.x = canvasWidth; this.y = 0; @@ -278,6 +411,9 @@ function updateGame() { enemies[i].move(); enemies[i].newPos(); enemies[i].update(); + if(collision.collide(pip.hitbox(), enemies[i].hitbox()) || collision.inside(pip.hitbox(), enemies[i].hitbox())) { + pip.hurt(); + } } ghost.move(); @@ -291,7 +427,6 @@ function updateGame() { overlay.update(); } - function sound(src) { this.sound = document.createElement("audio"); this.sound.src = src; @@ -305,4 +440,24 @@ function sound(src) { this.stop = function(){ this.sound.pause(); } -} \ No newline at end of file +} + +var collision = { + collide: function (el1, el2) { + return !( + el1[0] > el2[2] || + el1[1] < el2[3] || + el1[2] < el2[0] || + el1[3] > el2[1] + ); + }, + + inside: function (el1, el2) { + return ( + ((el2[0] <= el1[0]) && (el1[0] <= el2[2])) && + ((el2[0] <= el1[2]) && (el1[2] <= el2[2])) && + ((el2[3] <= el1[3]) && (el1[3] <= el2[1])) && + ((el2[3] <= el1[1]) && (el1[1] <= el2[1])) + ); + } +}; \ No newline at end of file diff --git a/sfx/death.wav b/sfx/death.wav new file mode 100644 index 0000000..a718bec Binary files /dev/null and b/sfx/death.wav differ