diff --git a/frontend/game.ts b/frontend/game.ts index 2dafa32..3b88d6a 100644 --- a/frontend/game.ts +++ b/frontend/game.ts @@ -12,7 +12,7 @@ function setup() { backgroundImage = loadImage(backgroundImagePath); createCanvas(1000, 1000); - obstacleOffset = width / 4; + obstacleOffset = width / 3; raspberry = new Raspberry(); raspberry.image = raspberryImagePath; @@ -32,31 +32,30 @@ function setup() { new Pipe(width + obstacleOffset * 2, obstacleWidth, height), pipeImagePath )); - obstacles.push(new Obstacle( - new Pipe(width + obstacleOffset * 3, obstacleWidth, height), - new Pipe(width + obstacleOffset * 3, obstacleWidth, height), - pipeImagePath - )); obstacles.forEach((obstacle) => obstacle.resetPosition(false)); } function draw() { background(backgroundImage) - raspberry.draw(); raspberry.update(); + raspberry.draw(); obstacles.forEach((obstacle) => { - obstacle.draw(); obstacle.update(); + obstacle.draw(); if(obstacle.position.x < -obstacleWidth) { obstacle.resetPosition(true); } + + }); } -// -// function keyPressed() { -// -// } \ No newline at end of file +function keyPressed() { + if (key == "K" || key == "k") { + raspberry.boost(); + console.log("BOOOST") + } +} \ No newline at end of file diff --git a/frontend/models/Obstacle.ts b/frontend/models/Obstacle.ts index b75be4a..0407678 100644 --- a/frontend/models/Obstacle.ts +++ b/frontend/models/Obstacle.ts @@ -3,7 +3,7 @@ class Obstacle extends Entity { private pipeBottom: Pipe; private readonly distanceBetweenPipes: number; private readonly padding: number = 300; - private readonly speed: number = 8; + private readonly speed: number = 3; private static startX: number; diff --git a/frontend/models/Raspberry.ts b/frontend/models/Raspberry.ts index c9d0d18..2d6b8a3 100644 --- a/frontend/models/Raspberry.ts +++ b/frontend/models/Raspberry.ts @@ -1,9 +1,9 @@ class Raspberry extends Entity { - private readonly lift: number = -10; - private readonly gravity: number = 1; + private readonly lift: number = -20; + private readonly gravity: number = 1.314159265358979323846264338; private _velocity: number = 0; private _image: any; - private static readonly maxVelocity: number = 5; + private static readonly maxVelocity: number = 100; //region Getter & Setter @@ -13,7 +13,7 @@ class Raspberry extends Entity { } set velocity(value: number) { - this._velocity = (this.velocity > Raspberry.maxVelocity) ? Raspberry.maxVelocity : value; + this._velocity = (Math.abs(this.velocity) > Raspberry.maxVelocity) ? Raspberry.maxVelocity : value; } get image(): any { @@ -37,11 +37,12 @@ class Raspberry extends Entity { private applyGravity(): void { this.velocity += this.gravity; + this.position.y += this.velocity; } private forceBoundaries(): void { - if (this.position.y > height) { - this.position.y = height; + if (this.position.y+this.height > height) { + this.position.y = height-this.height; this.velocity = 0; }