Skip to content

Added left enemy and lives and fixed dying #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tanrajsd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added left enemy and lives and fixed dying #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c01ce14
Added left enemy and lives and fixed dying
May 2, 2022
026a563
change lives to 3
May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions js/kittens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ var RIGHT_ARROW_CODE = 39;
var MOVE_LEFT = 'left';
var MOVE_RIGHT = 'right';

var lives = 3

// Preload game images
var images = {};
['enemy.png', 'stars.png', 'player.png'].forEach(imgName => {
Expand All @@ -27,10 +29,14 @@ var images = {};





class Enemy {
class Entity{
render(ctx) {
ctx.drawImage(this.sprite, this.x, this.y);
}
}
class Enemy extends Entity {
constructor(xPos) {
super()
this.x = xPos;
this.y = -ENEMY_HEIGHT;
this.sprite = images['enemy.png'];
Expand All @@ -44,12 +50,13 @@ class Enemy {
}

render(ctx) {
ctx.drawImage(this.sprite, this.x, this.y);
super.render(ctx)
}
}

class Player {
class Player extends Entity {
constructor() {
super()
this.x = 2 * PLAYER_WIDTH;
this.y = GAME_HEIGHT - PLAYER_HEIGHT - 10;
this.sprite = images['player.png'];
Expand All @@ -66,7 +73,7 @@ class Player {
}

render(ctx) {
ctx.drawImage(this.sprite, this.x, this.y);
super.render(ctx)
}
}

Expand Down Expand Up @@ -119,10 +126,9 @@ class Engine {

var enemySpot;
// Keep looping until we find a free enemy spot at random
while (!enemySpot || this.enemies[enemySpot]) {
while (enemySpot === undefined || this.enemies[enemySpot]) {
enemySpot = Math.floor(Math.random() * enemySpots);
}

this.enemies[enemySpot] = new Enemy(enemySpot * ENEMY_WIDTH);
}

Expand Down Expand Up @@ -198,7 +204,17 @@ class Engine {
}

isPlayerDead() {
// TODO: fix this function!
const enemySpot = Math.floor(this.player?.x / ENEMY_WIDTH)
const overlappingEnemy = this.enemies[enemySpot]

const yPosOverlaps = overlappingEnemy?.y - this.player?.y >= 54
if((this.player.x === overlappingEnemy?.x) && yPosOverlaps) {
if(lives === 0) {
return true
} else {
lives--
}
}
return false;
}
}
Expand Down