Skip to content

Commit abecf46

Browse files
committed
Fixed Pig hitbox
Pigs arent stuck in ground with their feet anymore
1 parent 86d0d86 commit abecf46

File tree

7 files changed

+19
-66
lines changed

7 files changed

+19
-66
lines changed

src/app/classes/entitiy/gizmo/gizmo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export abstract class Gizmo extends Sprite {
1818
bottom: false
1919
}
2020
protected speechBubbles: SpeechBubble[];
21-
protected readonly hitbox;
21+
protected readonly hitbox: Hitbox;
2222
protected pausedMovement = true;
2323
protected lastDirection: Direction = Direction.RIGHT;
2424
private readonly SPEED = 100;

src/app/classes/entitiy/gizmo/pig.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import {Gizmo} from "./gizmo";
22
import {Position} from "../position";
33
import {GameAudio} from "../../audio/audio";
4+
import {Hitbox} from "../../level/collision/hitbox";
5+
import {publish} from "rxjs";
46

57
export class Pig extends Gizmo {
68

@@ -35,13 +37,13 @@ export class Pig extends Gizmo {
3537
}
3638
}, 11);
3739

38-
this.getScale().setScale(1)
3940

4041

4142
}
4243

4344
public override update(context: CanvasRenderingContext2D, delta: number) {
4445
super.update(context, delta);
46+
this.getHitbox().draw(context);
4547
if (this.shouldSpeak) {
4648
this.speechBubbles[this.currentBubble].show(context, delta);
4749
return;
@@ -65,9 +67,14 @@ export class Pig extends Gizmo {
6567
this.speechBubbles[this.currentBubble].show(context, delta);
6668
}
6769

70+
public override updateHitbox(offsetX: number, offsetY: number) {
71+
super.updateHitbox(6, 8);
72+
}
73+
6874

6975
}
7076

77+
7178
export class KingPig extends Gizmo {
7279

7380

src/app/classes/entitiy/sides.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/app/classes/entitiy/sprite.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export class Sprite {
1414
protected readonly position: Position;
1515
protected image: HTMLImageElement;
1616
private readonly imageSrc: string;
17-
private isSpriteSheet: boolean = false;
1817
private width: number = 0;
1918
private height: number = 0;
2019
private readonly scale: Scale;

src/app/classes/level/collision/hitbox.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import {Position} from "../../entitiy/position";
2+
import {Scale} from "../../entitiy/scale";
23

34
export class Hitbox {
45
private position: Position;
56
private width: number;
67
private height: number;
78

8-
constructor(position: Position, width: number, height: number) {
9+
constructor(position: Position, width: number, height: number, scale: Scale = new Scale(1)) {
910
this.position = new Position(position.getX(), position.getY());
1011
this.width = width;
1112
this.height = height;

src/app/classes/shaders/flashlight.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export class FlashlightShader {
1818
}
1919
}
2020

21+
//Lightning depending on Radius brighter or darker
2122
public draw(context: CanvasRenderingContext2D, delta: number): void {
2223
this.updateCooldown(delta)
2324

src/app/components/game/game.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class GameComponent implements AfterViewInit {
6161
}
6262

6363
public static levelChange(): void {
64-
const levels = [level1, level2, level3, level4];
64+
const levels = [level1, level4, level3, level2];
6565
const index = levels.indexOf(GameComponent.getCurrentLevel());
6666
GameComponent.setCurrentLevel(levels[(index + 1) % levels.length]);
6767

@@ -207,9 +207,7 @@ export class GameComponent implements AfterViewInit {
207207

208208
//Draw Shader
209209
if (GameComponent.isFlashLightShaderOn) {
210-
211-
if (GameComponent.getCurrentLevel().isLoaded)
212-
this.flashLightShader.draw(this.context!, delta);
210+
if (GameComponent.getCurrentLevel().isLoaded) this.flashLightShader.draw(this.context!, delta);
213211
}
214212

215213

@@ -219,7 +217,11 @@ export class GameComponent implements AfterViewInit {
219217

220218
this.moveCamera();
221219
if(GameComponent.hasInteracted) {
222-
if(GameComponent.isMobile) this.cameraCanvas?.nativeElement.requestFullscreen().then()
220+
if(GameComponent.isMobile) {
221+
if(this.cameraCanvas?.nativeElement.requestFullscreen)
222+
this.cameraCanvas?.nativeElement.requestFullscreen().then()
223+
224+
}
223225

224226
}
225227

0 commit comments

Comments
 (0)